Delete stuff that's just going to get synced from M2.x

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

11 files changed, 0 insertions, 557 deletions

diff --git a/java/broker/bin/msTool.sh b/java/broker/bin/msTool.sh
deleted file mode 100755
index b291ed9fe3..0000000000
--- a/java/broker/bin/msTool.sh
+++ /dev/null
@@ -1,60 +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.
-#
-
-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 [ -z "$QPID_TOOLS" ]; then
-    if [ -z "$QPID_HOME" ]; then
-        die "QPID_TOOLS must be set"
-    else
-        QPID_TOOLS=$QPID_HOME
-    fi
-fi
-
-if $cygwin; then
-  QPID_TOOLS=$(cygpath -w $QPID_TOOLS)
-fi
-
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_TOOLS/lib/qpid-incubating.jar
-
-# 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
-
-. qpid-run org.apache.qpid.tools.messagestore.MessageStoreTool "$@"
diff --git a/java/broker/bin/qpid-passwd b/java/broker/bin/qpid-passwd
deleted file mode 100755
index 9e3ee4ff4a..0000000000
--- a/java/broker/bin/qpid-passwd
+++ /dev/null
@@ -1,30 +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_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.tools.security.Passwd "$@"
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server
deleted file mode 100755
index f1f4d72e64..0000000000
--- a/java/broker/bin/qpid-server
+++ /dev/null
@@ -1,31 +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_HOME/lib/qpid-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar
-
-# Set other variables used by the qpid-run script before calling
-export JAVA=java \
-       JAVA_VM=-server \
-       JAVA_MEM=-Xmx1024m \
-       JAVA_GC="-XX:-UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
-       QPID_CLASSPATH=$QPID_LIBS
-
-. qpid-run org.apache.qpid.server.Main "$@"
diff --git a/java/broker/bin/qpid-server-bdb.bat b/java/broker/bin/qpid-server-bdb.bat
deleted file mode 100644
index 8964e577df..0000000000
--- a/java/broker/bin/qpid-server-bdb.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@REM

-@REM Licensed to the Apache Software Foundation (ASF) under one

-@REM or more contributor license agreements.  See the NOTICE file

-@REM distributed with this work for additional information

-@REM regarding copyright ownership.  The ASF licenses this file

-@REM to you under the Apache License, Version 2.0 (the

-@REM "License"); you may not use this file except in compliance

-@REM with the License.  You may obtain a copy of the License at

-@REM 

-@REM   http://www.apache.org/licenses/LICENSE-2.0

-@REM 

-@REM Unless required by applicable law or agreed to in writing,

-@REM software distributed under the License is distributed on an

-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-@REM KIND, either express or implied.  See the License for the

-@REM specific language governing permissions and limitations

-@REM under the License.

-@REM

-

-set BDBSTORE_HOME=c:\qpid\trunk\java\bdbstore

-set QPID_MODULE_JARS=%BDBSTORE_HOME%\target\qpid-bdbstore-1.0-incubating-M2-SNAPSHOT.jar;%BDBSTORE_HOME%\lib\bdb\je-3.1.0.jar

-.\qpid-server.bat
\ No newline at end of file
diff --git a/java/broker/bin/qpid-server.bat b/java/broker/bin/qpid-server.bat
deleted file mode 100644
index a99022cd2d..0000000000
--- a/java/broker/bin/qpid-server.bat
+++ /dev/null
@@ -1,70 +0,0 @@
-@REM

-@REM Licensed to the Apache Software Foundation (ASF) under one

-@REM or more contributor license agreements.  See the NOTICE file

-@REM distributed with this work for additional information

-@REM regarding copyright ownership.  The ASF licenses this file

-@REM to you under the Apache License, Version 2.0 (the

-@REM "License"); you may not use this file except in compliance

-@REM with the License.  You may obtain a copy of the License at

-@REM 

-@REM   http://www.apache.org/licenses/LICENSE-2.0

-@REM 

-@REM Unless required by applicable law or agreed to in writing,

-@REM software distributed under the License is distributed on an

-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-@REM KIND, either express or implied.  See the License for the

-@REM specific language governing permissions and limitations

-@REM under the License.

-@REM

-

-echo off

-REM Script to run the Qpid Java Broker

-

-rem Guess QPID_HOME if not defined

-set CURRENT_DIR=%cd%

-if not "%QPID_HOME%" == "" goto gotHome

-set QPID_HOME=%CURRENT_DIR%

-echo %QPID_HOME%

-if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome

-cd ..

-set QPID_HOME=%cd%

-cd %CURRENT_DIR%

-:gotHome

-if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome

-echo The QPID_HOME environment variable is not defined correctly

-echo This environment variable is needed to run this program

-goto end

-:okHome

-

-if not "%JAVA_HOME%" == "" goto gotJavaHome

-echo The JAVA_HOME environment variable is not defined

-echo This environment variable is needed to run this program

-goto exit

-:gotJavaHome

-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome

-goto okJavaHome

-:noJavaHome

-echo The JAVA_HOME environment variable is not defined correctly

-echo This environment variable is needed to run this program.

-goto exit

-:okJavaHome

-

-rem Slurp the command line arguments. This loop allows for an unlimited number

-rem of agruments (up to the command line limit, anyway).

-set QPID_ARGS=%1

-if ""%1""=="""" goto runCommand

-shift

-:loop

-if ""%1""=="""" goto runCommand

-set QPID_ARGS=%QPID_ARGS% %1

-shift

-goto loop

-

-rem QPID_OPTS intended to hold any -D props for use

-rem user must enclose any value for QPID_OPTS in double quotes

-:runCommand

-set LAUNCH_JAR=%QPID_HOME%\lib\qpid-incubating.jar

-set MODULE_JARS=%QPID_MODULE_JARS%

-"%JAVA_HOME%\bin\java" -server -Xmx1024m %QPID_OPTS% -DQPID_HOME="%QPID_HOME%" -cp "%LAUNCH_JAR%;%MODULE_JARS%" org.apache.qpid.server.Main %QPID_ARGS%

-

-:end

diff --git a/java/broker/bin/qpid.start b/java/broker/bin/qpid.start
deleted file mode 100755
index 0793aed84c..0000000000
--- a/java/broker/bin/qpid.start
+++ /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-server -run:debug "$@"
\ No newline at end of file
diff --git a/java/broker/bin/qpid.stop b/java/broker/bin/qpid.stop
deleted file mode 100755
index 6482fc3293..0000000000
--- a/java/broker/bin/qpid.stop
+++ /dev/null
@@ -1,137 +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.stop Script
-# 
-# Script checks for a given pid running PROGRAM and attempts to quit it
-#
-
-MAX_ATTEMPTS=1
-SLEEP_DELAY=1
-PROGRAM="DQPID"
-
-
-#
-# Print what is going to be done
-#
-printActions()
-{
-#ps=`ps o command p $1|grep $PROGRAM`
-ps=`ps -o args -p $1|grep $PROGRAM`
-echo "Attempting to kill: $ps"
-}
-
-#
-# Forcably Quit the specified PID($1)
-#
-forceQuit()
-{
-kill -9 $1
-}
-
-
-#
-# Gracefully ask the PID($1) to quit
-#
-quit()
-{
-kill $1
-}
-
-#
-# Grep the ps log for the PID ($1) to ensure that it has quit
-#
-lookup()
-{
-result=`ps -o args -p $1 |grep -v grep |grep $PROGRAM |wc -l`
-}
-
-#
-# Sleep and then check then lookup the PID($1) to ensure it has quit
-#
-check()
-{
-echo "Waiting $SLEEP_DELAY second for $1 to exit"
-sleep $SLEEP_DELAY
-lookup $1
-}
-
-
-
-#
-# Verify the PID($1) is available
-#
-verifyPid()
-{
-lookup $1
-if [[ $[$result] == 1 ]] ; then
- brokerspid=$1
-else
- echo "Unable to locate Qpid Process with PID $1"
- exit -1
-fi
-}
-
-#
-# Main Run
-#
-
-# Check if we are killing all qpid pids or just one.
-if [[ $# == 0 ]] ; then
-	echo "Killing All Qpid Brokers for user: '$USER'"
-	qpid.stopall
-	exit $?
-else	
-	verifyPid $1
-fi
-
-printActions $brokerspid
-
-# Attempt to quit the process MAX_ATTEMPTS Times
-attempt=0
-while [[ $[$result] > 0 && $[$attempt] < $[$MAX_ATTEMPTS] ]] ; do
- quit $brokerspid
- check $brokerspid
- attempt=$[$attempt + 1]
-done
-
-# Check that it has quit
-if [[ $[$result] == 0 ]] ; then
- echo "Process quit"
- exit 0
-else
-
- # Now attempt to force quit the process
- attempt=0
- while [[ $[$result] > 0 && $[$attempt] < $[$MAX_ATTEMPTS] ]] ; do
-  forceQuit $brokerspid
-  check $brokerspid
-  attempt=$[$attempt + 1]
- done
-
-
- # Output final status
- if [[ $[$result] > 0 && $[$attempt] == $[$MAX_ATTEMPTS] ]] ; then
-	echo "Stopped trying to kill process: $brokerspid"
-	echo "Attempted to stop $attempt times"
- else
-	echo "Done "
- fi
-fi
diff --git a/java/broker/bin/qpid.stopall b/java/broker/bin/qpid.stopall
deleted file mode 100755
index d71f591de8..0000000000
--- a/java/broker/bin/qpid.stopall
+++ /dev/null
@@ -1,74 +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.stopall script
-# 
-# Script attempts to stop all PROGRAMs running under the current user 
-#  Utilises qpid.stop to perform the actual stopping
-#
-
-PROGRAM="DQPID"
-
-#
-# grep ps for instances of $PROGRAM and collect PIDs
-#
-lookup()
-{
-#pids=`ps o pid,command  | grep $PROGRAM | grep -v grep | cut -d ' ' -f 1`
-pids=`ps -ef |grep $USER | grep $PROGRAM | grep -v grep | awk '{print $2}'`
-result=`echo -n $pids | wc -w`
-}
-
-
-#
-# Show the PS output for given set of pids
-#
-showPids()
-{
-ps -o user,pid,args -p $pids
-}
-
-
-#
-# Main Run
-#
-
-lookup
-
-if [[ $[$result] == 0 ]] ; then
- echo "No Qpid Brokers found running under user '$USER'"
- exit 0
-fi
-
-for pid in $pids ; do
-
-qpid.stop $pid
-
-done
-
-# Check we have quit all
-lookup
-
-if [[ $[$result] == 0 ]] ; then
- echo "All Qpid brokers successfully quit"
-else
- echo "Some brokers were not quit"
- showPids $pids
-fi
diff --git a/java/broker/bin/run.bat b/java/broker/bin/run.bat
deleted file mode 100755
index 5b0aa0f23b..0000000000
--- a/java/broker/bin/run.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@REM

-@REM Licensed to the Apache Software Foundation (ASF) under one

-@REM or more contributor license agreements.  See the NOTICE file

-@REM distributed with this work for additional information

-@REM regarding copyright ownership.  The ASF licenses this file

-@REM to you under the Apache License, Version 2.0 (the

-@REM "License"); you may not use this file except in compliance

-@REM with the License.  You may obtain a copy of the License at

-@REM 

-@REM   http://www.apache.org/licenses/LICENSE-2.0

-@REM 

-@REM Unless required by applicable law or agreed to in writing,

-@REM software distributed under the License is distributed on an

-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-@REM KIND, either express or implied.  See the License for the

-@REM specific language governing permissions and limitations

-@REM under the License.

-@REM

-

-@echo off

-set CORE_CLASSES=..\classes;..\testclasses

-

-set COMMONDIR=..\..\common

-

-set COMMONLIB=%COMMONDIR%\lib\slf4j\slf4j-simple.jar;%COMMONDIR%\lib\logging-log4j\log4j-1.2.9.jar;%COMMONDIR%\lib\mina\mina-core-0.9.2.jar

-

-set DIST=..\lib\bdb\je-3.0.12.jar;..\dist\amqpd.jar;..\..\client\dist\amqp-common.jar

-

-set CP=%CORE_CLASSES%;%DIST%;%COMMONLIB%

-

-"%JAVA_HOME%\bin\java" -Xmx512m -Damqj.logging.level=INFO -cp %CP% %*

diff --git a/java/broker/bin/run.sh b/java/broker/bin/run.sh
deleted file mode 100755
index 6b62049e94..0000000000
--- a/java/broker/bin/run.sh
+++ /dev/null
@@ -1,44 +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.
-#
-
-
-COMMONDIR=../../common
-
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/slf4j/slf4j-simple.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/logging-log4j/log4j-1.2.13.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/mina/mina-core-0.9.5-SNAPSHOT.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/mina/mina-filter-ssl-0.9.5-SNAPSHOT.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-collections/commons-collections-3.1.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-cli/commons-cli-1.0.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-configuration/commons-configuration-1.2.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-logging/commons-logging-api.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-logging/commons-logging.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-lang/commons-lang-2.1.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/junit/junit-4.0.jar
-
-DIST=../lib/bdb/je-3.0.12.jar:../dist/amqpd-tests.jar:../dist/amqpd.jar:../../client/dist/amqp-common.jar
-
-CP=../intellijclasses:$DIST:$COMMONLIB
-
-if [ "$(uname -a | fgrep Cygwin)" != "" ]; then
-    CP=$(cygpath --mixed --path $CP)
-fi
-
-"$JAVA_HOME/bin/java" -Xmx512m -Dprepopulate=10 -Damqj.logging.level=INFO -cp $CP $*
diff --git a/java/broker/bin/runAll b/java/broker/bin/runAll
deleted file mode 100755
index 4ced1d263b..0000000000
--- a/java/broker/bin/runAll
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-#
-# 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.
-#
-
-doRun()
-{
-    class=$1
-    shift
-    echo
-    echo ================================================================================
-    echo Running $class
-    ./run.sh $class "$@"
-}
-
-# parameters are: clients messages iterations
-doRun org.apache.qpid.server.queue.SendPerfTest 10 1000 100
-
-doRun org.apache.qpid.server.queue.QueuePerfTest
-
-doRun org.apache.qpid.server.queue.QueueConcurrentPerfTest