Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-11-04 15:39:27 -0400
committerRyan D. Brooks2010-11-04 15:39:27 -0400
commit16cc6cc042b69a458d01052fcad243211edd6d03 (patch)
tree6771c0bb398b98e385c72c96e0ad103b56ba31c0 /plugins/org.eclipse.osee.client.integration.tests
parentb5f3be8d4c62ff00c3fee41f13333f1d8449d1dc (diff)
downloadorg.eclipse.osee-16cc6cc042b69a458d01052fcad243211edd6d03.tar.gz
org.eclipse.osee-16cc6cc042b69a458d01052fcad243211edd6d03.tar.xz
org.eclipse.osee-16cc6cc042b69a458d01052fcad243211edd6d03.zip
refinement: Launch test app server in daemon thread
Diffstat (limited to 'plugins/org.eclipse.osee.client.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml38
1 files changed, 4 insertions, 34 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
index 2d78848f6b..070ddbdade 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
@@ -59,47 +59,17 @@
</target>
<target name="writePosgresqlConnectionFile" depends="init" if="isPostgreSqlLaunch">
- <writeConnectionFile
- dbType="postgresql"
- dbPrefix="jdbc:postgresql"
- dbDriver="postgresql.db.connection"
- dbName="${osee.db.name}"
- dbUser="${osee.db.user}"
- dbPasswd="${osee.db.passwd}"
- dbAddress="${osee.db.address}"
- dbPort="${osee.db.port}"
- connectionFilePath="${osee.app.server.connectionFile}"
- connectionid="${osee.app.server.connectionId}" />
+ <writeConnectionFile dbType="postgresql" dbPrefix="jdbc:postgresql" dbDriver="postgresql.db.connection" dbName="${osee.db.name}" dbUser="${osee.db.user}" dbPasswd="${osee.db.passwd}" dbAddress="${osee.db.address}" dbPort="${osee.db.port}" connectionFilePath="${osee.app.server.connectionFile}" connectionid="${osee.app.server.connectionId}" />
<property name="additionalJvmArgs" value=" " />
</target>
<target name="writeDerbyConnectionFile" depends="init" if="isDerbyLaunch">
- <writeConnectionFile
- dbType="derby"
- dbPrefix="jdbc:derby"
- dbDriver="net.derby.db.connection"
- dbName="${osee.db.name}"
- dbUser="${osee.db.user}"
- dbPasswd="${osee.db.passwd}"
- dbAddress="${osee.db.address}"
- dbPort="${osee.db.port}"
- connectionFilePath="${osee.app.server.connectionFile}"
- connectionid="${osee.app.server.connectionId}" />
+ <writeConnectionFile dbType="derby" dbPrefix="jdbc:derby" dbDriver="net.derby.db.connection" dbName="${osee.db.name}" dbUser="${osee.db.user}" dbPasswd="${osee.db.passwd}" dbAddress="${osee.db.address}" dbPort="${osee.db.port}" connectionFilePath="${osee.app.server.connectionFile}" connectionid="${osee.app.server.connectionId}" />
<property name="additionalJvmArgs" value=" -Dosee.db.embedded.server=${osee.db.address}:${osee.db.port}" />
</target>
<target name="writeH2ConnectionFile" depends="init" if="isH2Launch">
- <writeConnectionFile
- dbType="h2"
- dbPrefix="jdbc:h2"
- dbDriver="h2.db.connection"
- dbName="${osee.db.name}"
- dbUser="${osee.db.user}"
- dbPasswd="${osee.db.passwd}"
- dbAddress="${osee.db.address}"
- dbPort="${osee.db.port}"
- connectionFilePath="${osee.app.server.connectionFile}"
- connectionid="${osee.app.server.connectionId}" />
+ <writeConnectionFile dbType="h2" dbPrefix="jdbc:h2" dbDriver="h2.db.connection" dbName="${osee.db.name}" dbUser="${osee.db.user}" dbPasswd="${osee.db.passwd}" dbAddress="${osee.db.address}" dbPort="${osee.db.port}" connectionFilePath="${osee.app.server.connectionFile}" connectionid="${osee.app.server.connectionId}" />
<property name="additionalJvmArgs" value=" -Dosee.db.embedded.server=${osee.db.address}:${osee.db.port}" />
</target>
@@ -113,7 +83,7 @@
</fileset>
</path>
</pathconvert>
- <forget>
+ <forget daemon="true">
<echo message="Launching Osee Application Server..." />
<java taskname="build" jvm="${JAVA_HOME}/bin/java" failonerror="true" maxmemory="1024m" timeout="10800000" jar="${launcherJarPath}" fork="true">
<classpath>

Back to the top