Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-12-04 00:36:13 +0000
committerAngel Avila2014-12-04 00:36:13 +0000
commit7c974809073fe4ea14a6e992917e7c533e7f50e3 (patch)
tree8f35e9bc64fa7024635bee5ace3737fa877c5f00 /plugins/org.eclipse.osee.x.server.p2
parentd2eca638ec9131c1dd5f1f3c18e25e5e6d6e7541 (diff)
downloadorg.eclipse.osee-7c974809073fe4ea14a6e992917e7c533e7f50e3.tar.gz
org.eclipse.osee-7c974809073fe4ea14a6e992917e7c533e7f50e3.tar.xz
org.eclipse.osee-7c974809073fe4ea14a6e992917e7c533e7f50e3.zip
feature[ats_ATS139503]: Remove IOseeDatabaseService from server
Diffstat (limited to 'plugins/org.eclipse.osee.x.server.p2')
-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
2 files changed, 6 insertions, 34 deletions
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 9edca1eb90e..00000000000
--- 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 43499e61c20..a77c55d1267 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} \

Back to the top