From 5d898972dde96ca28f0d415dad50a1a95b962265 Mon Sep 17 00:00:00 2001
From: rescobar
Date: Tue, 26 Oct 2010 17:43:04 -0700
Subject: refinement: Enable Client Integration Tests

---
 plugins/org.eclipse.osee.client.integration.tests/test.xml             | 3 ++-
 .../org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins/org.eclipse.osee.client.integration.tests')

diff --git a/plugins/org.eclipse.osee.client.integration.tests/test.xml b/plugins/org.eclipse.osee.client.integration.tests/test.xml
index ac2f35e0486..4da7aa3ec50 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/test.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/test.xml
@@ -39,7 +39,8 @@
 		<property name="testWorkspace" value="${eclipse-home}/testWorkspace" />
 		<delete dir="${testWorkspace}" quiet="true" />
 
-		<ant antfile="${basedir}/testAppServerLaunch.xml" target="run" inheritall="true" inheritrefs="true" />
+	   <dirname property="dependencies.basedir" file="${ant.file}"/>	 
+		<ant antfile="${dependencies.basedir}/testAppServerLaunch.xml" target="run" inheritall="true" inheritrefs="true" />
 
 		<!-- <ant target="swtbot-test" antfile="${library-file}" dir="${eclipse-home}"> -->
 		<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}" inheritall="true" inheritrefs="true">
diff --git a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
index cfc62c1b8a1..410c6adde68 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
@@ -108,7 +108,7 @@
 		<property name="additionalJvmArgs" value=" -Dosee.db.embedded.server=${osee.db.address}:${osee.db.port}" />
 	</target>
 
-	<target name="run" depends="init,writePosgresqlConnectionFile,writeDerbyConnectionFile,launchServer" />
+	<target name="run" depends="init,writeH2ConnectionFile,writePosgresqlConnectionFile,writeDerbyConnectionFile,launchServer" />
 
 	<target name="launchServer">
 		<pathconvert property="launcherJarPath" setonempty="false">
-- 
cgit v1.2.3