etc/eclipse-tools/maven/RHQ | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit 728d659e07e02f5603c7fb349e708db9ff137222
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Apr 29 14:56:20 2010 -0400
eclipse tool to clean test db
diff --git a/etc/eclipse-tools/maven/RHQ Maven Build - DBSetup (TEST DB).launch
b/etc/eclipse-tools/maven/RHQ Maven Build - DBSetup (TEST DB).launch
index 5309e62..84ca310 100644
--- a/etc/eclipse-tools/maven/RHQ Maven Build - DBSetup (TEST DB).launch
+++ b/etc/eclipse-tools/maven/RHQ Maven Build - DBSetup (TEST DB).launch
@@ -6,10 +6,6 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION"
value="${env_var:M2_HOME}/bin/${MAVEN_EXE}"/>
-<<<<<<< HEAD:etc/eclipse-tools/maven/RHQ Maven Build -
DBSetup.launch
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"
value="-o -Dmaven.test.skip=true -Ddbsetup install"/>
-=======
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"
value="-o -Dmaven.test.skip=true -Ddbsetup -Ddb=test install"/>
->>>>>>> master:etc/eclipse-tools/maven/RHQ Maven Build - DBSetup
(TEST DB).launch
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY"
value="${workspace_loc:/rhq/modules/core/dbutils}"/>
</launchConfiguration>
Show replies by date