refinement: Enable H2 Osee Client Integration Tests

7 files changed, 78 insertions, 29 deletions

diff --git a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
index 2a8a8a780fe..cfc62c1b8a1 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/testAppServerLaunch.xml
@@ -9,7 +9,7 @@
    $osee.db.passwd=osee.eclipse \
    $osee.db.address=127.0.0.1 \
    $osee.db.port=1623 \
-   $osee.db.is.derby=false \
+   $osee.db.type=H2,PGSQL,DERBY \
 
 	${osee.app.server.home}	
 	${osee.app.server.port}
@@ -27,9 +27,30 @@
 			</sequential>
 		</for>
 
-		<condition property="isDerbyLaunch">
-			<equals arg1="${osee.db.is.derby}" arg2="true" casesensitive="false" />
-		</condition>
+		<var name="isDerbyLaunch" value="false" />
+		<var name="isPostgreSqlLaunch" value="false" />
+		<var name="isH2Launch" value="false" />
+		<if>
+			<equals arg1="${osee.db.type}" arg2="H2" />
+			<then>
+				<var name="isH2Launch" value="true" />
+			</then>
+			<elseif>
+				<equals arg1="${osee.db.type}" arg2="PGSQL" />
+				<then>
+					<var name="isPostgreSqlLaunch" value="true" />
+				</then>
+			</elseif>
+			<elseif>
+				<equals arg1="${osee.db.type}" arg2="DERBY" />
+				<then>
+					<var name="isDerbyLaunch" value="true" />
+				</then>
+			</elseif>
+			<else>
+				<fail message="Osee Db Type Undefined [${osee.db.type}] - [H2,PGSQL,DERBY] are allowed" />
+			</else>
+		</if>
 
 		<property name="osee.app.server.data" value="${osee.app.server.home}/${eclipse-home}/testWorkspace/serverBinData" />
 		<property name="osee.app.server.connectionFile" value="${osee.app.server.home}/test.osee.client.db.connection.xml" />
@@ -37,14 +58,16 @@
 
 		<echo message="Osee Application Server Home: [${osee.app.server.home}]" />
 		<echo message="Osee Application Server Port: [${osee.app.server.port}]" />
+		<echo message="Osee Application Server Is H2: [${isH2Launch}]" />
 		<echo message="Osee Application Server Is Derby: [${isDerbyLaunch}]" />
+		<echo message="Osee Application Server Is Postgresql: [${isPostgreSqlLaunch}]" />
 	</target>
 
-	<target name="writePosgresqlConnectionFile" unless="isDerbyLaunch">
+	<target name="writePosgresqlConnectionFile" if="isPostgreSqlLaunch">
 		<writeConnectionFile 
 			dbType="postgresql" 
 			dbPrefix="jdbc:postgresql" 
-			dbDriver="postgresqlDriver"
+			dbDriver="postgresql.db.connection" 
 			dbName="${osee.db.name}" 
 			dbUser="${osee.db.user}" 
 			dbPasswd="${osee.db.passwd}" 
@@ -57,9 +80,9 @@
 
 	<target name="writeDerbyConnectionFile" if="isDerbyLaunch">
 		<writeConnectionFile 
-			dbType="derby"
+			dbType="derby" 
 			dbPrefix="jdbc:derby" 
-			dbDriver="netDerbyClientDriver" 
+			dbDriver="net.derby.db.connection" 
 			dbName="${osee.db.name}" 
 			dbUser="${osee.db.user}" 
 			dbPasswd="${osee.db.passwd}" 
@@ -67,7 +90,22 @@
 			dbPort="${osee.db.port}" 
 			connectionFilePath="${osee.app.server.connectionFile}" 
 			connectionid="${osee.app.server.connectionId}" />
-		<property name="additionalJvmArgs" value=" -Dosee.derby.server=${osee.db.address}:${osee.db.port}" />
+		<property name="additionalJvmArgs" value=" -Dosee.db.embedded.server=${osee.db.address}:${osee.db.port}" />
+	</target>
+
+	<target name="writeH2ConnectionFile" 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}" />
+		<property name="additionalJvmArgs" value=" -Dosee.db.embedded.server=${osee.db.address}:${osee.db.port}" />
 	</target>
 
 	<target name="run" depends="init,writePosgresqlConnectionFile,writeDerbyConnectionFile,launchServer" />
@@ -114,8 +152,9 @@
 		<attribute name="connectionId" />
 		<attribute name="connectionFilePath" />
 		<sequential>
+			<echo message="Writing [@{dbType}] Db Connection File" />
 			<echo file="@{connectionFilePath}">
-				&lt;DatabaseInfo id=&quot;dbConnectionInfo&quot;&gt;${line.separator}
+				&lt;DatabaseInfo id=&quot;db.connection.info&quot;&gt;${line.separator}
 					&lt;DatabaseHome key=&quot;#DBHOME#&quot; /&gt;${line.separator}
 					&lt;DatabaseName key=&quot;#DBNAME#&quot; value=&quot;@{dbName}&quot; /&gt;${line.separator}
 					&lt;DatabaseType key=&quot;#TYPE#&quot; value=&quot;@{dbType}&quot; /&gt;${line.separator}
@@ -126,12 +165,17 @@
 					&lt;Port key=&quot;#PORT#&quot; value=&quot;@AvailableDbServices.port&quot; /&gt;${line.separator}
 				&lt;/DatabaseInfo&gt;${line.separator}
 				${line.separator}
-				&lt;ConnectionDescription id=&quot;postgresqlDriver&quot;&gt;${line.separator}
+				&lt;ConnectionDescription id=&quot;h2.db.connection&quot;&gt;${line.separator}
+					&lt;Driver&gt;org.h2.Driver&lt;/Driver&gt;${line.separator}
+					&lt;Url&gt;#PREFIX#:tcp://#HOST#:#PORT#/#DBHOME##DBNAME#;IGNORECASE=TRUE;SCHEMA_SEARCH_PATH=OSEE, PUBLIC&lt;/Url&gt;${line.separator}
+				&lt;/ConnectionDescription&gt;${line.separator}
+				${line.separator}				
+				&lt;ConnectionDescription id=&quot;postgresql.db.connection&quot;&gt;${line.separator}
 					&lt;Driver&gt;org.postgresql.Driver&lt;/Driver&gt;${line.separator}
 					&lt;Url&gt;#PREFIX#://#HOST#:#PORT#/#DBHOME##DBNAME#&lt;/Url&gt;${line.separator}
 				&lt;/ConnectionDescription$gt;${line.separator}
 				${line.separator}
-				&lt;ConnectionDescription id=&quot;netDerbyClientDriver&quot;&gt;${line.separator}
+				&lt;ConnectionDescription id=&quot;net.derby.db.connection&quot;&gt;${line.separator}
 					&lt;Driver&gt;org.apache.derby.jdbc.ClientDriver&lt;/Driver&gt;${line.separator}
 					&lt;Url&gt;#PREFIX#://#HOST#:#PORT#/#DBHOME##DBNAME#;&lt;/Url&gt;${line.separator}
 					&lt;UrlAttributes&gt;${line.separator}
@@ -143,9 +187,10 @@
 			<echo file="@{connectionFilePath}" append="true">
 				${line.separator}${line.separator}
 				&lt;AvailableDbServices&gt;${line.separator}
-					&lt;Server id=&quot;@{connectionId}&quot; dbInfo=&quot;dbConnectionInfo&quot; connectsWith=&quot;@{dbDriver}&quot; hostAddress=&quot;@{dbAddress}&quot; port=&quot;@{dbPort}&quot; /&gt;${line.separator}
+					&lt;Server id=&quot;@{connectionId}&quot; dbInfo=&quot;db.connection.info&quot; connectsWith=&quot;@{dbDriver}&quot; hostAddress=&quot;@{dbAddress}&quot; port=&quot;@{dbPort}&quot; /&gt;${line.separator}
 				&lt;/AvailableDbServices&gt;${line.separator}
 			</echo>
 		</sequential>
 	</macrodef>
+
 </project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java
index b918317b941..f9493fc2aa4 100644
--- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java
+++ b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java
@@ -31,7 +31,7 @@ public class DerbyClientConnection implements IConnectionFactory {
 
       if (firstTime) {
          firstTime = false;
-         Pair<String, Integer> addressAndPort = OseeProperties.getDerbyServerAddress();
+         Pair<String, Integer> addressAndPort = OseeProperties.getOseeDbEmbeddedServerAddress();
          if (addressAndPort != null) {
             DerbyDbServer.startServer(addressAndPort.getFirst(), addressAndPort.getSecond());
          }
diff --git a/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2ClientConnection.java b/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2ClientConnection.java
index 0d3d2a629b4..56832bc51f2 100644
--- a/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2ClientConnection.java
+++ b/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2ClientConnection.java
@@ -31,7 +31,7 @@ public class H2ClientConnection implements IConnectionFactory {
 
       if (firstTime) {
          firstTime = false;
-         Pair<String, Integer> addressAndPort = OseeProperties.getDerbyServerAddress();
+         Pair<String, Integer> addressAndPort = OseeProperties.getOseeDbEmbeddedServerAddress();
          if (addressAndPort != null) {
             H2DbServer.startServer(addressAndPort.getFirst(), addressAndPort.getSecond());
          }
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/OseeProperties.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/OseeProperties.java
index b83c2dffb02..f6e0a342cf5 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/OseeProperties.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/OseeProperties.java
@@ -29,7 +29,7 @@ public class OseeProperties {
 
    public static final String OSEE_DB_CONNECTION_ID = "osee.db.connection.id";
    private static final String OSEE_CONNECTION_INFO_URI = "osee.connection.info.uri";
-   private static final String OSEE_DERBY_SERVER = "osee.derby.server";
+   private static final String OSEE_EMBEDDED_DB_SERVER = "osee.db.embedded.server";
    private static final String OSEE_DEFAULT_BROKER_URI = "osee.default.broker.uri";
 
    protected OseeProperties() {
@@ -40,9 +40,9 @@ public class OseeProperties {
       return System.getProperty(OSEE_DEFAULT_BROKER_URI);
    }
 
-   public static Pair<String, Integer> getDerbyServerAddress() {
+   public static Pair<String, Integer> getOseeDbEmbeddedServerAddress() {
       Pair<String, Integer> addressAndPort = null;
-      String serverAddress = System.getProperty(OSEE_DERBY_SERVER, "");
+      String serverAddress = System.getProperty(OSEE_EMBEDDED_DB_SERVER, "");
       if (Strings.isValid(serverAddress)) {
          String[] hostPort = serverAddress.split(":");
          addressAndPort = new Pair<String, Integer>(hostPort[0], Integer.parseInt(hostPort[1]));
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server[h2].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server[h2].launch
index 8c23e16637d..bb475eeb2fa 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server[h2].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server[h2].launch
@@ -18,9 +18,9 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m&#13;&#10;-XX:MaxPermSize=256m&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Declipse.ignoreApp=false&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dequinox.ds.debug=true&#13;&#10;-Dorg.osgi.service.http.port=8089&#13;&#10;-Dosee.db.connection.id=h2&#13;&#10;-Dosee.derby.server=0.0.0.0:1621"/>

 <stringAttribute key="pde.version" value="3.3"/>

 <booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="target_bundles" value="org.junit4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.ant@default:default,org.eclipse.xtext.logging@default:false,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.xtext@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.equinox.p2.engine@default:default,com.google.collect@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.aopalliance@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.core.runtime@default:true,org.apache.commons.lang@default:default,org.eclipse.ant.core@default:default,org.antlr.gen@default:default,org.antlr.runtime@default:default,org.eclipse.core.jobs@default:default,org.eclipse.osgi.services@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.core.resources@default:default,javax.servlet.jsp@default:default,org.eclipse.xtend@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.apache.jasper@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.ecf@default:default,org.hamcrest.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.ssl@default:false,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.xtext.common.types@default:default,org.apache.commons.codec@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.util@default:default,org.apache.derby@default:default,org.eclipse.ecf.identity@default:default,javax.servlet@default:default,org.eclipse.emf.mwe.utils@default:default,org.apache.log4j@default:default,org.eclipse.emf.compare.diff@default:default,org.apache.xerces@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.commands@default:default,org.apache.commons.cli@default:default,org.apache.xml.serializer@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.http.servlet@default:default,com.lowagie.text@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.apache.commons.httpclient@default:default,org.eclipse.emf.mwe2.launch@default:default,com.google.inject@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.p2.repository@default:default,org.apache.commons.el@default:default,org.eclipse.emf.edit@default:default,com.ibm.icu@default:default,javax.xml@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.xpand@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.xtext.util@default:default,org.eclipse.emf.compare@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.concurrent@default:default"/>

+<stringAttribute key="target_bundles" value="org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.core.jobs@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.emf.mwe.utils@default:default,com.google.inject@default:default,org.eclipse.core.expressions@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xpand@default:default,com.google.collect@default:default,org.eclipse.xtext@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.commands@default:default,org.apache.ant@default:default,org.mortbay.jetty.util@default:default,org.eclipse.xtext.util@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.el@default:default,org.eclipse.emf.mwe2.launch@default:default,org.junit4@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.xml.serializer@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.log4j@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.security@default:default,org.eclipse.osgi@-1:true,org.aopalliance@default:default,org.eclipse.xtend@default:default,org.hamcrest.core@default:default,org.eclipse.emf.ecore.xmi@default:default,com.lowagie.text@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.emf.mwe2.language@default:default,org.apache.jasper@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.edit@default:default,com.ibm.icu@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.common@2:true,org.eclipse.xtext.logging@default:false,javax.xml@default:default,org.eclipse.equinox.ds@1:true,org.apache.xml.resolver@default:default,org.antlr.gen@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ant.core@default:default,org.apache.commons.codec@default:default,org.eclipse.core.runtime@default:true,org.apache.derby@default:default,org.eclipse.equinox.app@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.emf.compare@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.util@default:default,javax.servlet.jsp@default:default,org.eclipse.core.databinding.property@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.osgi.services@default:default,org.eclipse.compare.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.apache.commons.cli@default:default,org.apache.commons.httpclient@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore@default:default,org.apache.xerces@default:default,org.eclipse.core.net@default:default,org.eclipse.xtext.xtend@default:default,org.apache.commons.lang@default:default,org.antlr.runtime@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ecf.identity@default:default"/>

 <booleanAttribute key="tracing" value="false"/>

 <booleanAttribute key="useCustomFeatures" value="false"/>

 <booleanAttribute key="useDefaultConfigArea" value="true"/>

-<stringAttribute key="workspace_bundles" value="org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.derby@4:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.manager.servlet@default:default,org.h2@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.jdk.core@default:default,lba.server.customizations@default:default,org.eclipse.osee.framework.core.datastore.test@default:false,org.postgresql.driver@default:default,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.manager.servlet.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,lba.authentication.provider@default:default,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.postgresql@default:default,lba.db.connection@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.branch.management@default:default"/>

+<stringAttribute key="workspace_bundles" value="org.eclipse.osee.framework.manager.servlet.test@default:false,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.logging@default:default,lba.db.connection@default:default,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.derby@4:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.core.message@default:default,lba.authentication.provider@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.datastore.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,lba.server.customizations@default:default,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.branch.management.test@default:false"/>

 </launchConfiguration>

diff --git a/releng/org.eclipse.osee.client.releng/build.properties b/releng/org.eclipse.osee.client.releng/build.properties
index bd4e5b074a4..991dfa39b15 100644
--- a/releng/org.eclipse.osee.client.releng/build.properties
+++ b/releng/org.eclipse.osee.client.releng/build.properties
@@ -96,8 +96,7 @@ javax.mail.glassfish
 
 #what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup
 #buildZips - creates update site, runtime, sdk, examples zip
-build.steps=buildUpdate,buildZips,buildTests,publish
-#testLocal,publish
+build.steps=buildUpdate,buildZips,buildTests,testLocal,publish
 #,cleanup
 #buildTests,test, packAllInOnes
 
@@ -114,5 +113,6 @@ skipPack=true
 
 writableBuildRoot=${WORKSPACE}/build
 #filteredDependencyCheck=true
+skipFetch=true
 #################################################################################################################
 ## END PROJECT BUILD PROPERTIES ##
diff --git a/releng/org.eclipse.osee.client.releng/testing.properties b/releng/org.eclipse.osee.client.releng/testing.properties
index 3731c20386f..14e893b765b 100644
--- a/releng/org.eclipse.osee.client.releng/testing.properties
+++ b/releng/org.eclipse.osee.client.releng/testing.properties
@@ -10,18 +10,22 @@ Xflags= -Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m
 
 extraVMargs=-Dorg.eclipse.swt.browser.XULRunnerPath=/usr/bin/xulrunner \
 -Dfile.encoding=iso-8859-1 \
+-Dosgi.noShutdown=true \
 -Dosee.application.server=http://localhost:1624 \
 -Dosee.authentication.protocol=demo \
 -Dosee.log.default=INFO \
--Dosee.app.server.port=1624 \
+-Dosee.app.server.port=1620 \
 \
 -Dosee.app.server.home=${testBase}/${buildLabel}/testing/oseeServerRuntime \
--Dosee.db.name=OSEE.ECLIPSE \
+-Dosee.app.server.connectionFile=${osee.app.server.home}/test.osee.client.db.connection.xml \
+-Dosee.connection.info.uri=${osee.app.server.connectionFile} \
+-Dosee.db.name=osee.demo.test.h2.db \
 -Dosee.db.user=osee.eclipse \
 -Dosee.db.passwd=osee.eclipse \
--Dosee.db.address=msa-linux-201.msc.az.boeing.com \
--Dosee.db.port=5432 \
--Dosee.db.is.derby=false \
+-Dosee.db.address=127.0.0.1 \
+-Dosee.db.port=1621 \
+-Dosee.db.type=H2 \
 
-
-#derby.osee.eclipse.org
\ No newline at end of file
+#-Dosee.db.address=msa-linux-201.msc.az.boeing.com \
+#-Dosee.db.port=5432 \
+#-Dosee.db.type=PGSQL \
\ No newline at end of file