Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-11-05 17:30:55 -0400
committerRyan D. Brooks2010-11-05 17:30:55 -0400
commit0f2b1982f5848198dca3396f3d5595fc6cbd35e2 (patch)
treea05e6c78d26726c570ec4ac62cc8de864c343671 /plugins/org.eclipse.osee.client.integration.tests
parentacfeea721cfea88982eb178c5e76b01894270cd7 (diff)
downloadorg.eclipse.osee-0f2b1982f5848198dca3396f3d5595fc6cbd35e2.tar.gz
org.eclipse.osee-0f2b1982f5848198dca3396f3d5595fc6cbd35e2.tar.xz
org.eclipse.osee-0f2b1982f5848198dca3396f3d5595fc6cbd35e2.zip
feature: Add application server admin command servlet
Diffstat (limited to 'plugins/org.eclipse.osee.client.integration.tests')
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/test.xml2
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml9
2 files changed, 9 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/test.xml b/plugins/org.eclipse.osee.client.integration.tests/test.xml
index 4da7aa3ec5..643c8acff9 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/test.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/test.xml
@@ -49,6 +49,8 @@
<property name="vmargs" value="${Dflags}" />
<property name="classname" value="${classname}" />
</ant>
+
+ <ant antfile="${dependencies.basedir}/testAppServerLaunch.xml" target="stopServer" inheritall="true" inheritrefs="true" />
</target>
diff --git a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
index 4d12aa1cb0..3b252dd45c 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
@@ -73,9 +73,9 @@
<property name="additionalJvmArgs" value=" -Dosee.db.embedded.server=${osee.db.address}:${osee.db.port}" />
</target>
- <target name="run" depends="init,writeH2ConnectionFile,writePosgresqlConnectionFile,writeDerbyConnectionFile,launchServer" />
+ <target name="run" depends="init,writeH2ConnectionFile,writePosgresqlConnectionFile,writeDerbyConnectionFile,startServer" />
- <target name="launchServer">
+ <target name="startServer">
<pathconvert property="launcherJarPath" setonempty="false">
<path>
<fileset dir="${osee.app.server.home}/plugins">
@@ -105,6 +105,11 @@
</waitfor>
</target>
+ <target name="stopServer" depends="init">
+ <post to="http://127.0.0.1:${osee.app.server.port}/osee/admin?cmd=osee_shutdown" verbose="true" wantresponse="true" property="shutdownOutput" />
+ <echo message="${shutdownOutput}" />
+ </target>
+
<macrodef name="writeConnectionFile">
<attribute name="dbName" />
<attribute name="dbUser" />

Back to the top