diff options
| author | rescobar | 2011-03-09 19:25:51 +0000 |
|---|---|---|
| committer | Ryan D. Brooks | 2011-03-09 19:25:51 +0000 |
| commit | 30ead5bb9ea0cdce5e7c04d334f16319926e85b5 (patch) | |
| tree | e2aa306355265c67f2b42b7be2868614991e8f38 | |
| parent | 6b7c084a21ed930d71acc97d4bea2de8891e0d80 (diff) | |
| download | org.eclipse.osee-30ead5bb9ea0cdce5e7c04d334f16319926e85b5.tar.gz org.eclipse.osee-30ead5bb9ea0cdce5e7c04d334f16319926e85b5.tar.xz org.eclipse.osee-30ead5bb9ea0cdce5e7c04d334f16319926e85b5.zip | |
bug: Fix osee integration test client not shutting down
| -rw-r--r-- | plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml | 1 | ||||
| -rw-r--r-- | releng/org.eclipse.osee.client.releng/testing.properties | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml index ee96592970c..3af3066c86c 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml +++ b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml @@ -91,6 +91,7 @@ <fileset dir="${osee.app.server.home}/plugins" includes="org.eclipse.equinox.launcher_*.jar" /> <pathelement location="${osee.app.server.home}/plugins" /> </classpath> + <jvmarg line=" -Dosgi.noShutdown=true" /> <jvmarg line=" -Dorg.osgi.service.http.port=${osee.app.server.port}" /> <jvmarg line=" -Dosee.db.connection.id=${osee.app.server.connectionId}" /> <jvmarg line=" -Dosee.connection.info.uri=${osee.app.server.connectionFile}" /> diff --git a/releng/org.eclipse.osee.client.releng/testing.properties b/releng/org.eclipse.osee.client.releng/testing.properties index b0f19b04301..fe8ef5888b2 100644 --- a/releng/org.eclipse.osee.client.releng/testing.properties +++ b/releng/org.eclipse.osee.client.releng/testing.properties @@ -12,7 +12,6 @@ extraVMargs= -Xms512m -Xmx1024m -XX:MaxPermSize=256m \ -Dorg.eclipse.swt.browser.XULRunnerPath=/usr/bin/xulrunner \ -Dosgi.bundlefile.limit=100 \ -Dfile.encoding=iso-8859-1 \ --Dosgi.noShutdown=true \ -Dosee.application.server=http://localhost:9101 \ -Dosee.authentication.protocol=demo \ -Dosee.log.default=INFO \ |