Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.osee.disposition.feature/feature.xml1
-rw-r--r--features/org.eclipse.osee.orcs.feature/feature.xml14
-rw-r--r--features/org.eclipse.osee.x.server.feature/feature.xml7
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.client.parent/pom.xml3
-rw-r--r--plugins/org.eclipse.osee.coverage.integration.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.database/.classpath7
-rw-r--r--plugins/org.eclipse.osee.database/.project33
-rw-r--r--plugins/org.eclipse.osee.database/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.osee.database/OSGI-INF/default.database.info.provider.xml9
-rw-r--r--plugins/org.eclipse.osee.database/build.properties5
-rw-r--r--plugins/org.eclipse.osee.database/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.database/src/org/eclipse/osee/database/internal/DefaultDatabaseInfoProvider.java61
-rw-r--r--plugins/org.eclipse.osee.orcs.parent/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.parent/tools/osee-application-server.xml68
-rw-r--r--plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch2
-rw-r--r--plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch2
-rw-r--r--plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_https_[HSQLDB].launch2
-rw-r--r--plugins/org.eclipse.osee.support.config/launchConfig/osee.demo.db.connection.xml49
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/demo/osee.demo.db.connection.xml25
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml15
-rw-r--r--plugins/org.eclipse.osee.x.server.parent/pom.xml2
24 files changed, 17 insertions, 349 deletions
diff --git a/features/org.eclipse.osee.disposition.feature/feature.xml b/features/org.eclipse.osee.disposition.feature/feature.xml
index ffcecd94bb..8c46c66244 100644
--- a/features/org.eclipse.osee.disposition.feature/feature.xml
+++ b/features/org.eclipse.osee.disposition.feature/feature.xml
@@ -31,7 +31,6 @@
<import plugin="org.eclipse.osee.console.admin"/>
<import plugin="org.eclipse.osee.event"/>
<import plugin="org.eclipse.osee.executor.admin"/>
- <import plugin="org.eclipse.osee.framework.database"/>
<import plugin="org.eclipse.osgi.services"/>
</requires>
diff --git a/features/org.eclipse.osee.orcs.feature/feature.xml b/features/org.eclipse.osee.orcs.feature/feature.xml
index e1971c5288..61384b760e 100644
--- a/features/org.eclipse.osee.orcs.feature/feature.xml
+++ b/features/org.eclipse.osee.orcs.feature/feature.xml
@@ -60,13 +60,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.framework.database"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.orcs.rest"
download-size="0"
install-size="0"
@@ -88,13 +81,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.hsqldb"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.orcs.rest.model"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.osee.x.server.feature/feature.xml b/features/org.eclipse.osee.x.server.feature/feature.xml
index bfdf3df202..b4b4d5ad1c 100644
--- a/features/org.eclipse.osee.x.server.feature/feature.xml
+++ b/features/org.eclipse.osee.x.server.feature/feature.xml
@@ -48,13 +48,6 @@
</requires>
<plugin
- id="org.eclipse.osee.database"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.osee.app"
download-size="0"
install-size="0"
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml b/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml
index d2d23f7a64..1b3c61e1d5 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml
@@ -161,7 +161,7 @@
<property name="additionalJvmArgs" value=" " />
<property name="xserver-log-output" value="${xserver-data}/server-output.log" />
-
+ <mkdir dir="${xserver-data}" />
<ant antfile="${osee-application-server-launch-ant}" target="run"
inheritRefs="true" output="${xserver-log-output}" />
</target>
diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
index 8dd7db0be7..40cc62262f 100644
--- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Import-Package: com.google.gson;version="2.1.0",
javax.ws.rs,
javax.ws.rs.core,
javax.ws.rs.ext,
- org.apache.commons.lang,
org.codehaus.jackson;version="1.9.13",
org.codehaus.jackson.map;version="1.9.13",
org.eclipse.osee.ats.api,
@@ -45,9 +44,7 @@ Import-Package: com.google.gson;version="2.1.0",
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.core.util,
- org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.jaxrs,
diff --git a/plugins/org.eclipse.osee.client.integration.tests/pom.xml b/plugins/org.eclipse.osee.client.integration.tests/pom.xml
index 675c35c105..4644725bd4 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/pom.xml
@@ -156,7 +156,7 @@
<property name="additionalJvmArgs" value=" " />
<property name="xserver-log-output" value="${xserver-data}/server-output.log" />
-
+ <mkdir dir="${xserver-data}" />
<ant antfile="${osee-application-server-launch-ant}" target="run"
inheritRefs="true" output="${xserver-log-output}" />
</target>
diff --git a/plugins/org.eclipse.osee.client.parent/pom.xml b/plugins/org.eclipse.osee.client.parent/pom.xml
index d68a84ef31..454aae3541 100644
--- a/plugins/org.eclipse.osee.client.parent/pom.xml
+++ b/plugins/org.eclipse.osee.client.parent/pom.xml
@@ -29,7 +29,8 @@
<!--<module>../../plugins/org.eclipse.osee.framework.core.dsl</module> -->
<!--<module>../../plugins/org.eclipse.osee.framework.core.dsl.integration</module> -->
- <!--<module>../../plugins/org.eclipse.osee.framework.database</module> -->
+ <module>../../plugins/org.eclipse.osee.framework.database</module>
+ <module>../../plugins/org.eclipse.osee.hsqldb</module>
<module>../../plugins/org.eclipse.osee.framework.database.init</module>
<module>../../plugins/org.eclipse.osee.framework.messaging.event.res</module>
diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/pom.xml b/plugins/org.eclipse.osee.coverage.integration.tests/pom.xml
index 56a2cfa526..85c50dfe20 100644
--- a/plugins/org.eclipse.osee.coverage.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.coverage.integration.tests/pom.xml
@@ -177,7 +177,7 @@
<property name="xserver-log-output"
value="${project.build.directory}/server-output.log" />
-
+ <mkdir dir="${xserver-data}" />
<ant antfile="${osee-application-server-launch-ant}" target="run"
inheritRefs="true" output="${xserver-log-output}" />
</target>
diff --git a/plugins/org.eclipse.osee.database/.classpath b/plugins/org.eclipse.osee.database/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.database/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.osee.database/.project b/plugins/org.eclipse.osee.database/.project
deleted file mode 100644
index 4e6f8aaaea..0000000000
--- a/plugins/org.eclipse.osee.database/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.osee.database</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.osee.database/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.database/META-INF/MANIFEST.MF
deleted file mode 100644
index 24a5268945..0000000000
--- a/plugins/org.eclipse.osee.database/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osee Database
-Bundle-SymbolicName: org.eclipse.osee.database
-Bundle-Version: 0.20.0.qualifier
-Bundle-Vendor: Eclipse Open System Engineering Environment
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/*.xml
-Import-Package: org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.database.core,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.logger
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.osee.framework.database
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.osee.database/OSGI-INF/default.database.info.provider.xml b/plugins/org.eclipse.osee.database/OSGI-INF/default.database.info.provider.xml
deleted file mode 100644
index d7b0d20a9f..0000000000
--- a/plugins/org.eclipse.osee.database/OSGI-INF/default.database.info.provider.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.osee.database">
- <implementation class="org.eclipse.osee.database.internal.DefaultDatabaseInfoProvider"/>
- <service>
- <provide interface="org.eclipse.osee.framework.database.core.IDatabaseInfoProvider"/>
- </service>
- <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/>
- <reference bind="setDatabaseInfoRegistry" cardinality="1..1" interface="org.eclipse.osee.framework.database.DatabaseInfoRegistry" name="DatabaseInfoRegistry" policy="static"/>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.database/build.properties b/plugins/org.eclipse.osee.database/build.properties
deleted file mode 100644
index 6210e849b5..0000000000
--- a/plugins/org.eclipse.osee.database/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/
-source.. = src/
diff --git a/plugins/org.eclipse.osee.database/pom.xml b/plugins/org.eclipse.osee.database/pom.xml
deleted file mode 100644
index 948e65ac47..0000000000
--- a/plugins/org.eclipse.osee.database/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.orcs.parent</artifactId>
- <version>0.20.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath>
- </parent>
-
- <artifactId>org.eclipse.osee.database</artifactId>
- <packaging>eclipse-plugin</packaging>
- <name>OSEE Database - (Incubation)</name>
-
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.database/src/org/eclipse/osee/database/internal/DefaultDatabaseInfoProvider.java b/plugins/org.eclipse.osee.database/src/org/eclipse/osee/database/internal/DefaultDatabaseInfoProvider.java
deleted file mode 100644
index f23f5c099b..0000000000
--- a/plugins/org.eclipse.osee.database/src/org/eclipse/osee/database/internal/DefaultDatabaseInfoProvider.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.database.internal;
-
-import org.eclipse.osee.framework.core.data.IDatabaseInfo;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.database.DatabaseInfoRegistry;
-import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider;
-import org.eclipse.osee.logger.Log;
-
-/**
- * @author Roberto E. Escobar
- */
-public class DefaultDatabaseInfoProvider implements IDatabaseInfoProvider {
-
- private Log logger;
- private DatabaseInfoRegistry registry;
-
- public void setLogger(Log logger) {
- this.logger = logger;
- }
-
- public void setDatabaseInfoRegistry(DatabaseInfoRegistry registry) {
- this.registry = registry;
- }
-
- private DatabaseInfoRegistry getDatabaseInfoRegistry() {
- return registry;
- }
-
- private Log getLogger() {
- return logger;
- }
-
- @Override
- public IDatabaseInfo getDatabaseInfo() throws OseeDataStoreException {
- IDatabaseInfo databaseInfo = getDatabaseInfoRegistry().getSelectedDatabaseInfo();
- getLogger().info("%s [%s as %s]", databaseInfo.getDriver(), databaseInfo.getDatabaseName(),
- databaseInfo.getDatabaseLoginName());
- return databaseInfo;
- }
-
- @Override
- public int getPriority() {
- return Integer.MIN_VALUE;
- }
-
- @Override
- public String toString() {
- return "Default DB Connection Info Provider";
- }
-
-}
diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml
index c3cbe8487c..0952f67861 100644
--- a/plugins/org.eclipse.osee.orcs.parent/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml
@@ -26,7 +26,6 @@
<module>../../plugins/org.eclipse.osee.framework.core.model.test</module>
<module>../../plugins/org.eclipse.osee.framework.resource.management</module>
<module>../../plugins/org.eclipse.osee.framework.resource.management.test</module>
- <module>../../plugins/org.eclipse.osee.framework.database</module>
<module>../../plugins/org.eclipse.osee.activity</module>
<module>../../plugins/org.eclipse.osee.activity.server</module>
@@ -43,7 +42,6 @@
<module>../../plugins/org.eclipse.osee.orcs.rest.client</module>
<module>../../plugins/org.eclipse.osee.orcs.rest</module>
<module>../../plugins/org.eclipse.osee.orcs.rest.test</module>
- <module>../../plugins/org.eclipse.osee.hsqldb</module>
<module>../../plugins/org.eclipse.osee.orcs.db.test</module>
<module>../../plugins/org.eclipse.osee.orcs.test</module>
diff --git a/plugins/org.eclipse.osee.parent/tools/osee-application-server.xml b/plugins/org.eclipse.osee.parent/tools/osee-application-server.xml
index a8a824d0e6..07dcdb3eb8 100644
--- a/plugins/org.eclipse.osee.parent/tools/osee-application-server.xml
+++ b/plugins/org.eclipse.osee.parent/tools/osee-application-server.xml
@@ -10,7 +10,6 @@
$xserver-db-password=osee.eclipse \
$xserver-db-address=127.0.0.1 \
$xserver-db-port=1623 \
- $xserver-db-type=H2,PGSQL \
${xserver-authentication}
${xserver-data}
@@ -34,17 +33,13 @@
<property name="xserver-use-demo-data" value="false" />
<property name="osee.app.server.config.file" value="${xserver-data}/osee.hsql.test.json" />
- <property name="osee.app.server.connectionFile" value="${xserver-data}/test.osee.performance.db.connection.xml" />
- <property name="osee.app.server.connectionId" value="hsql" />
- <echo message="Server Connection File: [${osee.app.server.connectionFile}]" />
<echo message="Server Config File: [${osee.app.server.config.file}]" />
<echo message="Server Data Directory: [${osee.application.server.data}]" />
<echo message="Osee Application Server Home: [${xserver-home}]" />
<echo message="Osee Application Server Port: [${xserver-port}]" />
<echo message="Osee Application Server Telnet Port: [${xserver-telnet-port}]" />
- <echo message="Osee Application Server Db Type: [${xserver-db-type}]" />
<echo message="Osee Application Server Db Address: [${xserver-db-address}:${xserver-db-port}]" />
<mkdir dir="${xserver-data}" />
@@ -56,7 +51,9 @@
<if>
<equals arg1="${xserver-use-demo-data}" arg2="true" />
<then>
- <copydir src="${xserver-project}/target/server/demo/binary_data" dest="${osee.application.server.data}" />
+ <copy todir="${osee.application.server.data}">
+ <fileset dir="${xserver-project}/target/server/demo/binary_data" />
+ </copy>
<!-- copy database data to server area -->
<copy file="${xserver-project}/target/server/demo/hsql/osee.hsql.db.properties" tofile="${xserver-data}/${xserver-db-name}.properties" />
@@ -66,7 +63,6 @@
</target>
<target name="writeHsqlConnectionFile" depends="init">
- <writeConnectionFile dbType="hsql" dbHome="${xserver-db-home}" dbPrefix="jdbc:hsqldb:hsql" dbDriver="hsql.db.connection" dbName="${xserver-db-name}" dbUser="${xserver-db-username}" dbPasswd="${xserver-db-password}" dbAddress="${xserver-db-address}" dbPort="${xserver-db-port}" connectionFilePath="${osee.app.server.connectionFile}" connectionid="${osee.app.server.connectionId}" />
<writeJsonConfig dbaddress="${xserver-db-address}" dbpath="${xserver-db-home}" dbport="${xserver-db-port}" filepath="${osee.app.server.config.file}" />
</target>
@@ -95,11 +91,8 @@
<sysproperty key="osee.check.tag.queue.on.startup" value="false" />
<sysproperty key="osgi.noShutdown" value="true" />
<sysproperty key="org.osgi.service.http.port" value="${xserver-port}" />
- <sysproperty key="osee.db.connection.id" value="${osee.app.server.connectionId}" />
- <sysproperty key="osee.connection.info.uri" value="${osee.app.server.connectionFile}" />
<sysproperty key="osee.application.server.data" value="${osee.application.server.data}" />
<sysproperty key="osee.authentication.protocol" value="${xserver-authentication}" />
- <!--<sysproperty key="osee.db.embedded.server" value="${xserver-db-address}:${xserver-db-port}" />-->
<sysproperty key="logback.configurationFile" value="${xserver-log-config}" />
<sysproperty key="osgi.configuration.area" value="${xserver-project}/configuration" />
<sysproperty key="cm.config.uri" value="${osee.app.server.config.file}" />
@@ -130,61 +123,6 @@
<sleep milliseconds="10000" />
</target>
- <macrodef name="writeConnectionFile">
- <attribute name="dbHome" />
- <attribute name="dbName" />
- <attribute name="dbUser" />
- <attribute name="dbPasswd" />
- <attribute name="dbType" />
- <attribute name="dbPrefix" />
- <attribute name="dbDriver" />
- <attribute name="dbAddress" />
- <attribute name="dbPort" />
- <attribute name="connectionId" />
- <attribute name="connectionFilePath" />
- <sequential>
- <echo message="Writing [@{dbType}] Db Connection File" />
- <echo file="@{connectionFilePath}">
- &lt;DbConnection&gt;
- &lt;DatabaseInfo id=&quot;db.connection.info&quot;&gt;${line.separator}
- &lt;DatabaseHome key=&quot;#DBHOME#&quot; value=&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}
- &lt;Prefix key=&quot;#PREFIX#&quot; value=&quot;@{dbPrefix}&quot; /&gt;${line.separator}
- &lt;UserName key=&quot;#USERNAME#&quot; value=&quot;@{dbUser}&quot; /&gt;${line.separator}
- &lt;Password key=&quot;#PASSWORD#&quot; value=&quot;@{dbPasswd}&quot; /&gt;${line.separator}
- &lt;Host key=&quot;#HOST#&quot; value=&quot;@AvailableDbServices.hostAddress&quot; /&gt;${line.separator}
- &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;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=@{dbUser}, PUBLIC;MVCC=TRUE&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;hsql.db.connection&quot;&gt;${line.separator}
- &lt;Driver&gt;org.hsqldb.jdbc.JDBCDriver&lt;/Driver&gt;${line.separator}
- &lt;Url&gt;#PREFIX#://#HOST#:#PORT#/#DBNAME#&lt;/Url&gt;${line.separator}
- &lt;Property key=&quot;hsqldb.tx&quot; value=&quot;MVCC&quot; /&gt;${line.separator}
- &lt;/ConnectionDescription&gt;${line.separator}
- ${line.separator}
- </echo>
-
- <echo file="@{connectionFilePath}" append="true">
- ${line.separator}${line.separator}
- &lt;AvailableDbServices&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}
- &lt;/DbConnection&gt;
- </echo>
- </sequential>
- </macrodef>
-
<macrodef name="writeJsonConfig">
<attribute name="dbAddress" />
<attribute name="dbPort" />
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
index 2efb6adbd7..4bfebf96f6 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
@@ -20,7 +20,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#13;&#10;-Xmx1024m&#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=8089&#13;&#10;-Dosee.db.connection.id=hsql&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Dosee.connection.info.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.demo.db.connection.xml&quot;&#13;&#10;-Dlogback.configurationFile=C:\UserData\logback-dev.xml&#13;&#10;-Dcm.config.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.hsql.json&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#13;&#10;-Xmx1024m&#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=8089&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Dlogback.configurationFile=C:\UserData\logback-dev.xml&#13;&#10;-Dcm.config.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.hsql.json&quot;"/>
<stringAttribute key="pde.version" value="3.3"/>
<setAttribute key="selected_features">
<setEntry value="org.eclipse.osee.disposition.feature:default"/>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch
index 7b782e774c..11b42eb18a 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch
@@ -20,7 +20,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#13;&#10;-Xmx1024m&#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=8089&#13;&#10;-Dosee.db.connection.id=postgresqlLocalhost&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.db.connection.count=12&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Dosee.connection.info.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.demo.db.connection.xml&quot;&#13;&#10;-Dcm.config.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.postgresql.json&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#13;&#10;-Xmx1024m&#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=8089&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Dcm.config.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.postgresql.json&quot;"/>
<stringAttribute key="pde.version" value="3.3"/>
<setAttribute key="selected_features">
<setEntry value="org.eclipse.osee.orcs.feature:default"/>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_https_[HSQLDB].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_https_[HSQLDB].launch
index 589975b229..2e2d5c252b 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_https_[HSQLDB].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_https_[HSQLDB].launch
@@ -20,7 +20,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#13;&#10;-Xmx1024m&#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dosee.db.connection.id=hsql&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Dosee.connection.info.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.demo.db.connection.xml&quot;&#13;&#10;-Dorg.eclipse.equinox.http.jetty.https.enabled=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.keystore=${project_loc:org.eclipse.osee.support.config}/launchConfig/demo.keystore&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.password=demoPassword&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.keypassword=demoPassword&#13;&#10;-Dorg.osgi.service.http.port.secure=8089&#13;&#10;-Dcm.config.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.hsql.json&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m&#13;&#10;-Xmx1024m&#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dosee.log.default=INFO&#13;&#10;-Dosee.authentication.protocol=demo&#13;&#10;-Dorg.eclipse.equinox.http.jetty.https.enabled=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.keystore=${project_loc:org.eclipse.osee.support.config}/launchConfig/demo.keystore&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.password=demoPassword&#13;&#10;-Dorg.eclipse.equinox.http.jetty.ssl.keypassword=demoPassword&#13;&#10;-Dorg.osgi.service.http.port.secure=8089&#13;&#10;-Dcm.config.uri=&quot;${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.hsql.json&quot;"/>
<stringAttribute key="pde.version" value="3.3"/>
<setAttribute key="selected_features">
<setEntry value="org.eclipse.osee.orcs.feature:default"/>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/osee.demo.db.connection.xml b/plugins/org.eclipse.osee.support.config/launchConfig/osee.demo.db.connection.xml
deleted file mode 100644
index 8dd0dcb3c3..0000000000
--- a/plugins/org.eclipse.osee.support.config/launchConfig/osee.demo.db.connection.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<DbConnection>
-
- <DatabaseInfo id="postgresqlInfo">
- <DatabaseHome key="#DBHOME#" />
- <DatabaseName key="#DBNAME#" value="OSEE" />
- <DatabaseType key="#TYPE#" value="postgresql" />
- <Prefix key="#PREFIX#" value="jdbc:postgresql" />
- <UserName key="#USERNAME#" value="osee" />
- <Password key="#PASSWORD#" value="osee" />
- <Host key="#HOST#" value="@AvailableDbServices.hostAddress" />
- <Port key="#PORT#" value="@AvailableDbServices.port" />
- </DatabaseInfo>
-
- <ConnectionDescription id="postgresql">
- <Driver>org.postgresql.Driver</Driver>
- <Url>#PREFIX#://#HOST#:#PORT#/#DBHOME##DBNAME#</Url>
- </ConnectionDescription>
-
- <DatabaseInfo id="hsql.db.info">
- <DatabaseHome key="#DBHOME#" value="file:~/hsql/osee.hsql.db" />
- <DatabaseName key="#DBNAME#" value="osee.hsql.db" />
- <DatabaseType key="#TYPE#" value="hsql" />
- <Prefix key="#PREFIX#" value="jdbc:hsqldb:hsql" />
- <UserName key="#USERNAME#" value="public" />
- <Password key="#PASSWORD#" value="" />
- <Host key="#HOST#" value="@AvailableDbServices.hostAddress" />
- <Port key="#PORT#" value="@AvailableDbServices.port" />
- </DatabaseInfo>
-
- <ConnectionDescription id="hsql.db.connection">
- <Driver>org.hsqldb.jdbc.JDBCDriver</Driver>
- <Url>#PREFIX#://#HOST#:#PORT#/#DBNAME#</Url>
- <Property key="hsqldb.tx" value="MVCC" />
- </ConnectionDescription>
-
- <AvailableDbServices>
-
- <Server id="hsql" dbInfo="hsql.db.info" hostAddress="127.0.0.1"
- port="8088" connectsWith="hsql.db.connection" />
-
- <Server id="osee.microdoc" dbInfo="postgresqlInfo" hostAddress="78.46.71.230"
- port="5432" connectsWith="postgresql" applicationServer="http://osee.microdoc.com:8089/" />
-
- <Server id="postgresqlLocalhost" dbInfo="postgresqlInfo"
- hostAddress="localhost" port="5432" connectsWith="postgresql"
- applicationServer="http://localhost:8089/" />
-
- </AvailableDbServices>
-</DbConnection>
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/osee.demo.db.connection.xml b/plugins/org.eclipse.osee.x.server.p2/demo/osee.demo.db.connection.xml
deleted file mode 100644
index 9edca1eb90..0000000000
--- a/plugins/org.eclipse.osee.x.server.p2/demo/osee.demo.db.connection.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<DbConnection>
-
- <DatabaseInfo id="hsql.db.info">
- <DatabaseHome key="#DBHOME#" value="file:demo/hsql/osee.hsql.db" />
- <DatabaseName key="#DBNAME#" value="osee.hsql.db" />
- <DatabaseType key="#TYPE#" value="hsql" />
- <Prefix key="#PREFIX#" value="jdbc:hsqldb:hsql" />
- <UserName key="#USERNAME#" value="public" />
- <Password key="#PASSWORD#" value="" />
- <Host key="#HOST#" value="@AvailableDbServices.hostAddress" />
- <Port key="#PORT#" value="@AvailableDbServices.port" />
- </DatabaseInfo>
-
- <ConnectionDescription id="hsql.db.connection">
- <Driver>org.hsqldb.jdbc.JDBCDriver</Driver>
- <Url>#PREFIX#://#HOST#:#PORT#/#DBNAME#</Url>
- <Property key="hsqldb.tx" value="MVCC" />
- </ConnectionDescription>
-
- <AvailableDbServices>
- <Server id="hsql" dbInfo="hsql.db.info" hostAddress="127.0.0.1"
- port="8088" connectsWith="hsql.db.connection" />
- </AvailableDbServices>
-
-</DbConnection>
diff --git a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml b/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
index 43499e61c2..a77c55d126 100644
--- a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
+++ b/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
@@ -27,7 +27,9 @@
</copy>
<mkdir dir="${server-etc-path}" />
- <copydir src="${etc-content-path}" dest="${server-etc-path}" />
+ <copy todir="${server-etc-path}">
+ <fileset dir="${etc-content-path}" />
+ </copy>
<pathconvert property="launcherBundlePath" setonempty="false">
<path>
@@ -63,15 +65,15 @@
<!-- *************************************************************** -->
<target name="postgreSqlLaunch">
- <createLaunch filepath="${server-path}/runPostgreSqlLocal.sh" cm.cfg.uri="etc/osee.postgresql.json" connection.id="postgresqlLocalhost" serverport="8089" launcher="${equinox-launcher-jar}" extraVMArgs="-Dosee.authentication.protocol=trustAll" />
+ <createLaunch filepath="${server-path}/runPostgreSqlLocal.sh" cm.cfg.uri="etc/osee.postgresql.json" serverport="8089" launcher="${equinox-launcher-jar}" extraVMArgs="-Dosee.authentication.protocol=trustAll" />
</target>
<target name="hsqlLaunch">
- <createLaunch filepath="${server-path}/runHsql.sh" cm.cfg.uri="etc/osee.hsql.json" connection.id="hsql" serverport="8089" launcher="${equinox-launcher-jar}" extraVMArgs="-Dosee.authentication.protocol=trustAll " />
+ <createLaunch filepath="${server-path}/runHsql.sh" cm.cfg.uri="etc/osee.hsql.json" serverport="8089" launcher="${equinox-launcher-jar}" extraVMArgs="-Dosee.authentication.protocol=trustAll " />
</target>
<target name="demoLaunch">
- <createLaunch filepath="${server-path}/runDemo.sh" cm.cfg.uri="etc/osee.hsql.json" connection.id="hsql" serverport="8089" launcher="${equinox-launcher-jar}" extraVMArgs="-Dosee.authentication.protocol=demo \${line.separator}-Dosee.connection.info.uri=&quot;demo/osee.demo.db.connection.xml&quot; \${line.separator}-Dosee.application.server.data=&quot;demo/binary_data&quot;" />
+ <createLaunch filepath="${server-path}/runDemo.sh" cm.cfg.uri="etc/osee.hsql.json" serverport="8089" launcher="${equinox-launcher-jar}" extraVMArgs="-Dosee.authentication.protocol=demo \${line.separator}-Dosee.application.server.data=&quot;demo/binary_data&quot;" />
<copy file="${server-path}/runDemo.sh" tofile="${server-path}/runDemo.bat" overwrite="true" />
<replaceregexp file="${server-path}/runDemo.bat" match="\\" replace="^" flags="g" />
@@ -84,7 +86,6 @@
<unzip src="${demo-content-path}/hsql.zip" dest="${server-demo-path}" />
<unzip src="${demo-content-path}/binary_data.zip" dest="${server-demo-path}/binary_data" />
- <copy file="${demo-content-path}/osee.demo.db.connection.xml" tofile="${server-demo-path}/osee.demo.db.connection.xml" />
</target>
<target name="generateLaunchScripts" depends="demoLaunch,hsqlLaunch,postgreSqlLaunch" />
@@ -174,8 +175,6 @@ osee.log.default=INFO
<macrodef name="createLaunch">
<attribute name="filepath" />
<attribute name="serverport" />
- <attribute name="connection.id" />
- <attribute name="db.connection.pool.size" default="100" />
<attribute name="launcher" />
<attribute name="session.timeout" default="3600" />
<attribute name="serverMaxMem" default="1024m" />
@@ -186,8 +185,6 @@ osee.log.default=INFO
<echo file="@{filepath}" append="false">java -server \
-Xmx@{serverMaxMem} \
-Dorg.osgi.service.http.port=@{serverport} \
--Dosee.db.connection.id=@{connection.id} \
--Dosee.db.connection.pool.size=@{db.connection.pool.size} \
-Dorg.eclipse.equinox.http.jetty.context.sessioninactiveinterval=@{session.timeout} \
-Dcm.config.uri=&quot;@{cm.cfg.uri}&quot; \
@{extraVMArgs} \
diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml
index e75bb34c78..c6d4ce9f43 100644
--- a/plugins/org.eclipse.osee.x.server.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml
@@ -31,8 +31,6 @@
<module>../../plugins/org.eclipse.osee.framework.core.message.test</module>
<module>../../plugins/org.eclipse.osee.framework.manager.servlet</module>
- <module>../../plugins/org.eclipse.osee.database</module>
-
<module>../../features/org.eclipse.osee.x.server.legacy.feature</module>
<module>../../features/org.eclipse.osee.x.server.feature</module>

Back to the top