summaryrefslogtreecommitdiff
path: root/java/broker
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-04-27 12:29:52 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-04-27 12:29:52 +0000
commite03851a70de7d8e2ce977adbb490b8bf7df14311 (patch)
treeec3d3503de75257a7026fbf889598620854e6816 /java/broker
parente7f85c4f7d288a103a5ea2873797f1ae50faefe7 (diff)
downloadqpid-python-e03851a70de7d8e2ce977adbb490b8bf7df14311.tar.gz
Bin Updates: Qpid-Run removed new bash 3.x feature += replaced with option="${value1} ${value2}" constructs to support older bash 2.x
renamed passwd qpid-passwd and fixed classpath loading errors. Moved bdbbackup script to live with the bdb module. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@533077 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
-rw-r--r--java/broker/bin/bdbbackup21
-rw-r--r--java/broker/bin/qpid-passwd (renamed from java/broker/bin/passwd)9
2 files changed, 9 insertions, 21 deletions
diff --git a/java/broker/bin/bdbbackup b/java/broker/bin/bdbbackup
deleted file mode 100644
index 34743cd873..0000000000
--- a/java/broker/bin/bdbbackup
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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.
-#
-
-. qpid-run org.apache.qpid.server.store.berkeleydb.BDBBackup "$@"
diff --git a/java/broker/bin/passwd b/java/broker/bin/qpid-passwd
index c1bb05c082..6e64af6e70 100644
--- a/java/broker/bin/passwd
+++ b/java/broker/bin/qpid-passwd
@@ -18,4 +18,13 @@
# under the License.
#
+# Set classpath to include Qpid jar with all required jars in manifest
+QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
+
+# Set other variables used by the qpid-run script before calling
+export JAVA=java \
+ JAVA_VM=-server \
+ JAVA_MEM=-Xmx1024m \
+ QPID_CLASSPATH=$QPID_LIBS
+
. qpid-run org.apache.qpid.server.security.Passwd "$@"