diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-04-27 12:48:51 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-04-27 12:48:51 +0000 |
| commit | 1728d25e47815a3d12320d77f03b98909f55b715 (patch) | |
| tree | 49279d223c510b02398e5b4e24f19ff63054bb63 /java/broker/bin | |
| parent | 90b39f5665f0159767d94c4fc3b466586ddec147 (diff) | |
| download | qpid-python-1728d25e47815a3d12320d77f03b98909f55b715.tar.gz | |
Merged revisions 533075-533079 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
........
r533075 | ritchiem | 2007-04-27 13:27:19 +0100 (Fri, 27 Apr 2007) | 2 lines
QPID-473 Base64MD5PrincipalDatabase doesn't check password changes were applied to disk before storing in memory
Reversed the effects of the requested change if the changes cannot be persisted to disk
........
r533077 | ritchiem | 2007-04-27 13:29:52 +0100 (Fri, 27 Apr 2007) | 3 lines
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.
........
r533078 | ritchiem | 2007-04-27 13:30:07 +0100 (Fri, 27 Apr 2007) | 1 line
Updated PrincipalDatabase implementations to return empty strings rather than null. As this causes NPE on MC.
........
r533079 | ritchiem | 2007-04-27 13:31:03 +0100 (Fri, 27 Apr 2007) | 1 line
Updated MLT to have variables that define the BROKER and VHOST used and White space
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@533083 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/bin')
| -rw-r--r-- | java/broker/bin/bdbbackup | 21 | ||||
| -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 "$@"
|