diff options
author | Roberto E. Escobar | 2013-09-25 22:31:48 +0000 |
---|---|---|
committer | Roberto E. Escobar | 2013-09-25 22:33:15 +0000 |
commit | 2f78b969483f5a61a7360a472f11d48820b0942f (patch) | |
tree | ccf442c92c8b2fffe9d49d32f9855eda9dc0137a /plugins | |
parent | b0e6a428006fdf34e9100f79c5a7f156e04eeeb1 (diff) | |
download | org.eclipse.osee-2f78b969483f5a61a7360a472f11d48820b0942f.tar.gz org.eclipse.osee-2f78b969483f5a61a7360a472f11d48820b0942f.tar.xz org.eclipse.osee-2f78b969483f5a61a7360a472f11d48820b0942f.zip |
bug: Use OSGI shutdown cmd instead of close
During integration tests, we need to call shutdown
instead of close in order to properly shutdown
test application servers.
Change-Id: Iacb112e815f7ce621e468f94ccacdc62d05fa9a1
Diffstat (limited to 'plugins')
4 files changed, 10 insertions, 10 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/osee-application-server.xml b/plugins/org.eclipse.osee.ats.client.integration.tests/osee-application-server.xml index ec782ae8bc4..982152af296 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/osee-application-server.xml +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/osee-application-server.xml @@ -59,7 +59,7 @@ <mkdir dir="${xserver-data}" /> - <forget> + <forget daemon="false"> <echo message="Launching Osee Application Server..." /> <!-- Test Should Complete in 30 mins (timeout vale) - currently, they only take ~13 mins --> <java taskname="int-test-server" failonerror="true" maxmemory="1024m" timeout="1800000" jar="${launcherJarPath}" fork="true"> @@ -95,7 +95,7 @@ <echo message="Osee Application Server Telnet Port: [${xserver-telnet-port}]" /> <telnet server="localhost" port="${xserver-telnet-port}" initialCR="yes" timeout="1000"> <read>osgi></read> - <write>close</write> + <write>shutdown</write> </telnet> <sleep milliseconds="500" /> diff --git a/plugins/org.eclipse.osee.client.integration.tests/osee-application-server.xml b/plugins/org.eclipse.osee.client.integration.tests/osee-application-server.xml index 0064cd823d2..a619dcc3cf8 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/osee-application-server.xml +++ b/plugins/org.eclipse.osee.client.integration.tests/osee-application-server.xml @@ -59,7 +59,7 @@ <mkdir dir="${xserver-data}" /> - <forget> + <forget daemon="false"> <echo message="Launching Osee Application Server..." /> <!-- Test Should Complete in 30 mins (timeout vale) - currently, they only take ~13 mins --> <java taskname="int-test-server" failonerror="true" maxmemory="1024m" timeout="1800000" jar="${launcherJarPath}" fork="true"> @@ -95,7 +95,7 @@ <echo message="Osee Application Server Telnet Port: [${xserver-telnet-port}]" /> <telnet server="localhost" port="${xserver-telnet-port}" initialCR="yes" timeout="1000"> <read>osgi></read> - <write>close</write> + <write>shutdown</write> </telnet> <sleep milliseconds="500" /> diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/osee-application-server.xml b/plugins/org.eclipse.osee.coverage.integration.tests/osee-application-server.xml index d0f34d5cd1d..8be581a9f90 100644 --- a/plugins/org.eclipse.osee.coverage.integration.tests/osee-application-server.xml +++ b/plugins/org.eclipse.osee.coverage.integration.tests/osee-application-server.xml @@ -59,7 +59,7 @@ <mkdir dir="${xserver-data}" /> - <forget> + <forget daemon="false"> <echo message="Launching Osee Application Server..." /> <!-- Test Should Complete in 30 mins (timeout vale) - currently, they only take ~13 mins --> <java taskname="int-test-server" failonerror="true" maxmemory="1024m" timeout="1800000" jar="${launcherJarPath}" fork="true"> @@ -95,7 +95,7 @@ <echo message="Osee Application Server Telnet Port: [${xserver-telnet-port}]" /> <telnet server="localhost" port="${xserver-telnet-port}" initialCR="yes" timeout="1000"> <read>osgi></read> - <write>close</write> + <write>shutdown</write> </telnet> <sleep milliseconds="500" /> diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/osee-application-server.xml b/plugins/org.eclipse.osee.x.server.integration.tests/osee-application-server.xml index 7c3d53f7b6f..be03de0c16e 100644 --- a/plugins/org.eclipse.osee.x.server.integration.tests/osee-application-server.xml +++ b/plugins/org.eclipse.osee.x.server.integration.tests/osee-application-server.xml @@ -36,7 +36,7 @@ <property name="osee.app.server.connectionFile" value="${xserver-data}/test.osee.performance.db.connection.xml" /> <property name="osee.app.server.connectionId" value="hsql" /> <property name="osee.application.server.data" value="${xserver-project}/target/server/demo/binary_data" /> - + <echo message="Server Connection File: [${osee.app.server.connectionFile}]" /> <echo message="Server Data Directory: [${osee.application.server.data}]" /> @@ -63,10 +63,10 @@ <mkdir dir="${xserver-data}" /> - <forget> + <forget daemon="false"> <echo message="Launching Osee Application Server..." /> <!-- Test Should Complete in 30 mins (timeout vale) - currently, they only take ~13 mins --> - <java taskname="int-test-server" failonerror="true" maxmemory="1024m" timeout="1800000" jar="${launcherJarPath}" fork="true"> + <java taskname="int-test-server" failonerror="true" maxmemory="1024m" timeout="1800000" jar="${launcherJarPath}" fork="yes"> <classpath> <fileset dir="${xserver-home}/plugins" includes="org.eclipse.equinox.launcher_*.jar" /> <pathelement location="${xserver-home}/plugins" /> @@ -98,7 +98,7 @@ <echo message="Osee Application Server Telnet Port: [${xserver-telnet-port}]" /> <telnet server="localhost" port="${xserver-telnet-port}" initialCR="yes" timeout="1000"> <read>osgi></read> - <write>close</write> + <write>shutdown</write> </telnet> <sleep milliseconds="500" /> |