qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ritch...@apache.org
Subject svn commit: r942119 - in /qpid/trunk/qpid/java/broker/bin: qpid-passwd qpid-server
Date Fri, 07 May 2010 15:16:50 GMT
Author: ritchiem
Date: Fri May  7 15:16:50 2010
New Revision: 942119

URL: http://svn.apache.org/viewvc?rev=942119&view=rev
Log:
QPID-2491 : Committed patch provided by Sorin Suciu to remove readlink from the broker start
script making it cross platform (Darwin,Solaris)

Modified:
    qpid/trunk/qpid/java/broker/bin/qpid-passwd
    qpid/trunk/qpid/java/broker/bin/qpid-server

Modified: qpid/trunk/qpid/java/broker/bin/qpid-passwd
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-passwd?rev=942119&r1=942118&r2=942119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/qpid-passwd (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid-passwd Fri May  7 15:16:50 2010
@@ -18,9 +18,9 @@
 # under the License.
 #
 
+WHEREAMI=`dirname $0`
 if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
-    export PATH=${PATH}:${QPID_HOME}/bin
+    export QPID_HOME=`cd $WHEREAMI/../ && pwd`
 fi
 
 # Set classpath to include Qpid jar with all required jars in manifest
@@ -32,4 +32,4 @@ export JAVA=java \
        JAVA_MEM=-Xmx1024m \
        QPID_CLASSPATH=$QPID_LIBS
 
-. qpid-run org.apache.qpid.tools.security.Passwd "$@"
+. ${QPID_HOME}/bin/qpid-run org.apache.qpid.tools.security.Passwd "$@"

Modified: qpid/trunk/qpid/java/broker/bin/qpid-server
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-server?rev=942119&r1=942118&r2=942119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/qpid-server (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid-server Fri May  7 15:16:50 2010
@@ -17,10 +17,9 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-
+WHEREAMI=`dirname $0`
 if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
-    export PATH=${PATH}:${QPID_HOME}/bin
+    export QPID_HOME=`cd $WHEREAMI/../ && pwd`
 fi
 
 # Set classpath to include Qpid jar with all required jars in manifest
@@ -36,4 +35,4 @@ export JAVA=java \
 
 QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32 -DQPID_LOG_APPEND=$QPID_LOG_APPEND"
 
-. qpid-run org.apache.qpid.server.Main "$@"
+. ${QPID_HOME}/bin/qpid-run org.apache.qpid.server.Main "$@"



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message