From 9fdf5367a92ea93f9489a6e6d4ae7a3537c73dff Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 2 May 2011 14:11:46 +0000
Subject: [PATCH] LMS-2237
SVN: 21087
---
datastore_server/build/build.xml | 12 +++++++++---
datastore_server/dist/etc/service.properties | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 65fb7441f63..8d4327fa21b 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -38,7 +38,7 @@
<param name="test.suite" value="tests.xml" />
</antcall>
</target>
-
+
<target name="dss-jar" depends="compile">
<mkdir dir="${dist.datastore_server.lib}" />
<delete dir="tmp/test"/><!-- remove this directory in order to get a clean clean-flag -->
@@ -49,15 +49,20 @@
<include name="**/unix.so" />
</fileset>
</copy>
+ <jar destfile="${dist}/sql.jar">
+ <fileset dir="source">
+ <include name="**/*.sql" />
+ </fileset>
+ </jar>
<recursive-jar destfile="${dss-jar.file}">
<fileset dir="${classes}">
<include name="**/*.class" />
<include name="**/*.xsd" />
<include name="${build.info.filename}" />
</fileset>
- <fileset dir="source">
+ <zipfileset prefix="datastore_server/" src="${dist}/sql.jar">
<include name="**/*.sql" />
- </fileset>
+ </zipfileset>
<fileset dir="${nativeroot}">
<include name="**/unix.so" />
</fileset>
@@ -67,6 +72,7 @@
value="${version.number} (r${revision.number},${clean.flag})" />
</manifest>
</recursive-jar>
+ <delete file="${dist}/sql.jar"/>
<jar update="true" destfile="${dss-jar.file}">
<fileset dir="../datastore_server/${sources}">
<include name="**/*.xml" />
diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index c81893ad7f2..422a916565a 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -125,7 +125,7 @@ path-info-db.version-holder-class = ch.systemsx.cisd.openbis.dss.generic.shared.
path-info-db.databaseEngineCode = postgresql
path-info-db.basicDatabaseName = pathinfo
path-info-db.databaseKind = demo
-path-info-db.scriptFolder = sql
+path-info-db.scriptFolder = datastore_server/sql
# ---------------------------------------------------------------------------
--
GitLab