Rolled back revision 561365 and commented out some broken code in ClientSession.java. The trunk should now build.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@561578 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 4 insertions, 60 deletions

diff --git a/qpid/java/broker/bin/msTool.sh b/qpid/java/broker/bin/msTool.sh
deleted file mode 100755
index 4d55ee7811..0000000000
--- a/qpid/java/broker/bin/msTool.sh
+++ /dev/null
@@ -1,56 +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.
-#
-
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_TOOLS/lib/qpid-incubating.jar
-
-die() {
-  if [[ $1 = -usage ]]; then
-    shift
-    usage=true
-  else
-    usage=false
-  fi
-  echo "$@"
-  $usage && echo
-  $usage && usage
-  exit 1
-}
-
-cygwin=false
-if [[ "$(uname -a | fgrep Cygwin)" != "" ]]; then
-  cygwin=true
-fi
-
-if $cygwin; then
-  QPID_TOOLS=$(cygpath -w $QPID_TOOLS)
-fi
-
-# Set other variables used by the qpid-run script before calling
-export JAVA=java \
-       JAVA_VM=-server \
-       JAVA_OPTS=-Dlog4j.configuration=file:$QPID_TOOLS/etc/mstool-log4j.xml \
-       QPID_CLASSPATH=$QPID_LIBS
-
-if [ -z "$QPID_TOOLS" ]; then
-  die "QPID_TOOLS be set"
-fi
-
-. qpid-run org.apache.qpid.tools.messagestore.MessageStoreTool "$@"
diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
index f046252522..6e64af6e70 100644
--- a/qpid/java/broker/bin/qpid-passwd
+++ b/qpid/java/broker/bin/qpid-passwd
@@ -27,4 +27,4 @@ export JAVA=java \
        JAVA_MEM=-Xmx1024m \

        QPID_CLASSPATH=$QPID_LIBS

 

-. qpid-run org.apache.qpid.tools.security.Passwd "$@"

+. qpid-run org.apache.qpid.server.security.Passwd "$@"

diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index fabf7e941c..76d0ad786d 100644
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -7,9 +7,9 @@
 # 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
@@ -25,7 +25,7 @@ QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar
 export JAVA=java \
        JAVA_VM=-server \
        JAVA_MEM=-Xmx1024m \
-       JAVA_GC=-XX:-UseConcMarkSweepGC \
+       JAVA_GC=-XX:-UseConcMarkSweepGC
        QPID_CLASSPATH=$QPID_LIBS
 
 . qpid-run org.apache.qpid.server.Main "$@"