[rhmessaging-commits] rhmessaging commits: r3923 - in store/trunk/java/bdbstore: bin and 1 other directory.
Author: rgemmell
Date: 2010-04-22 11:02:40 -0400 (Thu, 22 Apr 2010)
New Revision: 3923
Modified:
store/trunk/java/bdbstore/bin/backup.sh
store/trunk/java/bdbstore/build.xml
Log:
Update build system to include backup-log4j.xml and update backup.sh to use the standard
VERSION=X convention to setup the libs.
merged from java/0.5.x-dev r3908
Modified: store/trunk/java/bdbstore/bin/backup.sh
===================================================================
--- store/trunk/java/bdbstore/bin/backup.sh 2010-04-22 15:02:02 UTC (rev 3922)
+++ store/trunk/java/bdbstore/bin/backup.sh 2010-04-22 15:02:40 UTC (rev 3923)
@@ -1,4 +1,22 @@
#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
# Parse arguments taking all - prefixed args as JAVA_OPTS
for arg in "$@"; do
@@ -11,14 +29,12 @@
if [ -z "$QPID_HOME" ]; then
export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
- export PATH=${PATH}:${QPID_HOME}/bin
fi
-if [ -z "$BDB_HOME" ]; then
- export BDB_HOME=$(dirname $(dirname $(readlink -f $0)))
-fi
+VERSION=0.6
-LIBS=$BDB_HOME/lib/qpid-bdbtools-M3.jar:$BDB_HOME/lib/je-3.3.62.jar:$BDB_HOME/lib/qpid-bdbstore-M3.jar:$QPID_HOME/lib/qpid-incubating.jar
+LIBS=$QPID_HOME/lib/qpid-bdbtools-$VERSION.jar:$QPID_HOME/lib/je-3.3.62.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
+
echo "Starting Hot Backup Script"
java -Dlog4j.configuration=backup-log4j.xml ${JAVA_OPTS} -cp $LIBS
org.apache.qpid.server.store.berkeleydb.BDBBackup ${ARGS}
Modified: store/trunk/java/bdbstore/build.xml
===================================================================
--- store/trunk/java/bdbstore/build.xml 2010-04-22 15:02:02 UTC (rev 3922)
+++ store/trunk/java/bdbstore/build.xml 2010-04-22 15:02:40 UTC (rev 3923)
@@ -7,6 +7,7 @@
<property name="project.version" value="0.5"/>
<property name="src.tools.dir" location="src/tools/java"/>
<property name="src.main.dir" location="src/main/java"/>
+ <property name="src.resources.dir"
location="src/resources"/>
<property name="src.test.dir" location="src/test/java"/>
<property name="build.dir" location="build"/>
<property name="lib.dir" location="lib"/>
@@ -99,7 +100,10 @@
</target>
<target name="jar" depends="build">
- <jar destfile="${bdbstore.jar}"
basedir="${build.classes}"/>
+ <jar destfile="${bdbstore.jar}">
+ <fileset dir="${build.classes}"/>
+ <fileset dir="${src.resources.dir}"/>
+ </jar>
<jar destfile="${bdbtools.jar}"
basedir="${build.tools.classes}"/>
</target>