removed incubating from various shell scripts, release artifacts, and READMEs

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

17 files changed, 30 insertions, 32 deletions

diff --git a/qpid/java/broker/bin/msTool.sh b/qpid/java/broker/bin/msTool.sh
index 73b1eb2ec7..e190a0a46a 100755
--- a/qpid/java/broker/bin/msTool.sh
+++ b/qpid/java/broker/bin/msTool.sh
@@ -49,7 +49,7 @@ if $cygwin; then
 fi
 
 # Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_TOOLS/lib/qpid-incubating.jar
+QPID_LIBS=$QPID_TOOLS/lib/qpid-all.jar
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
index f425eed72b..63b30b5e71 100755
--- a/qpid/java/broker/bin/qpid-passwd
+++ b/qpid/java/broker/bin/qpid-passwd
@@ -24,7 +24,7 @@ if [ -z "$QPID_HOME" ]; then
 fi

 

 # Set classpath to include Qpid jar with all required jars in manifest

-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar

+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar

 

 # Set other variables used by the qpid-run script before calling

 export JAVA=java \

diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index b8d6c8e3fd..3570056348 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -24,7 +24,7 @@ if [ -z "$QPID_HOME" ]; then
 fi
 
 # 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
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/bdbstore-launch.jar
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
diff --git a/qpid/java/broker/bin/qpid-server.bat b/qpid/java/broker/bin/qpid-server.bat
index 6af214f939..2687baa111 100755
--- a/qpid/java/broker/bin/qpid-server.bat
+++ b/qpid/java/broker/bin/qpid-server.bat
@@ -76,8 +76,8 @@ echo Using CLASSPATH: %CLASSPATH%
 goto afterQpidClasspath

 

 :noQpidClasspath

-echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\qpid-incubating.jar

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

+echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\qpid-all.jar

+set CLASSPATH=%QPID_HOME%\lib\qpid-all.jar

 :afterQpidClasspath

 

 REM start parsing -run arguments

diff --git a/qpid/java/broker/etc/qpid-server.conf b/qpid/java/broker/etc/qpid-server.conf
index c310094817..8a16849b04 100644
--- a/qpid/java/broker/etc/qpid-server.conf
+++ b/qpid/java/broker/etc/qpid-server.conf
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/bdbstore-launch.jar
 
 export JAVA=java \
        JAVA_VM=-server \
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index fc395c9764..9d405c7e4c 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -32,7 +32,7 @@
   ${modules.plugin} ${modules.examples} ${modules.tests}
   ${modules.management} ${modules.management.tools}"/>
 
-  <property name="qpid.jar"           location="${build.lib}/qpid-incubating.jar"/>
+  <property name="qpid.jar"           location="${build.lib}/qpid-all.jar"/>
   <basename property="qpid.jar.name"  file="${qpid.jar}"/>
 
   <property name="resources"     value="${project.root}/resources"/>
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
index ee151426c6..a1c5aa325d 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
@@ -7,6 +7,6 @@ java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.
 
 background "can receive messages" server_java
 clients $cpp/client
-#ps -ao pid,cmd | awk '/qpid-client-incubating-M4.jar/{ print $1 }' | xargs -r kill
+#ps -ao pid,cmd | awk '/qpid-client-<version>.jar/{ print $1 }' | xargs -r kill
 kill %%
 outputs "$cpp/client.out | remove_uuid" "server_java.out | remove_uuid"
diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index 9ca87b97ab..146781ec23 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -23,7 +23,7 @@
   <dirname property="project.root" file="${ant.file.common}"/>
 
   <property name="project.name"          value="qpid"/>
-  <property name="project.version"       value="incubating-M4"/>
+  <property name="project.version"       value="M4"/>
   <property name="project.namever"       value="${project.name}-${project.version}"/>
 
   <property name="resources"             location="${project.root}/resources"/>
diff --git a/qpid/java/integrationtests/bin/interoptests.py b/qpid/java/integrationtests/bin/interoptests.py
index 128b6da183..a883a22a5f 100755
--- a/qpid/java/integrationtests/bin/interoptests.py
+++ b/qpid/java/integrationtests/bin/interoptests.py
@@ -27,11 +27,11 @@ interop_cases = ["InteropTestCase1DummyRun", "InteropTestCase2BasicP2P", "Intero
 interop_command = "java -cp %s org.apache.qpid.test.framework.distributedtesting.Coordinator --xml -e interop -o . -n interop org.apache.qpid.interop.testcases.%s"
 
 # TODO: read this from the ant properties file
-clientlibs = ["qpid-integrationtests-incubating-M4.jar",
-              "qpid-junit-toolkit-incubating-M4.jar",
+clientlibs = ["qpid-integrationtests-M4.jar",
+              "qpid-junit-toolkit-M4.jar",
               "junit-3.8.1.jar",
-              "qpid-systests-incubating-M4.jar",
-              "qpid-junit-toolkit-incubating-M4.jar",
+              "qpid-systests-M4.jar",
+              "qpid-junit-toolkit-M4.jar",
               "geronimo-jms_1.1_spec-1.0.jar",
               "log4j-1.2.12.jar"]
 
@@ -111,10 +111,10 @@ def start_java(javapath):
     for lib in clientlibs:
         classpath = classpath + testlibdir+"/"+lib+";"
         
-    classpath = classpath + javapath+"/lib/qpid-incubating.jar"        
+    classpath = classpath + javapath+"/lib/qpid-all.jar"        
 
     # Add qpid common since the tests need that, classpath hatefulness
-    classpath = classpath + ";"+testlibdir+"/qpid-common-incubating-M4.jar"
+    classpath = classpath + ";"+testlibdir+"/qpid-common-M4.jar"
     
     return Popen(["java", "-cp","\""+classpath+"\"",
                   "org.apache.qpid.test.framework.distributedtesting.TestClient"],
diff --git a/qpid/java/management/client/README.txt b/qpid/java/management/client/README.txt
index ffbe98e228..0c2a702a46 100644
--- a/qpid/java/management/client/README.txt
+++ b/qpid/java/management/client/README.txt
@@ -5,7 +5,7 @@ The following README content could be read also in http://cwiki.apache.org/confl
 2)HOW TO RUN Q-Man

 

 2.1)PREREQUISITES

-QMan is a standalone application that is packaged as qpid-management-client-incubating-M3.jar. To run QMan you need to add the following jars in your CLASSPATH:

+QMan is a standalone application that is packaged as qpid-management-client-<version>.jar. To run QMan you need to add the following jars in your CLASSPATH:

 

 log4j-1.2.12.jar

 slf4j-api-1.4.0.jar

@@ -15,8 +15,8 @@ commons-codec-1.3.jar
 commons-lang-2.2.jar

 commons-collections-3.2.jar

 commons-configuration-1.2.jar

-qpid-client-incubating-Mx.jar (were x is the current qpid version)

-qpid-common-incubating-Mx.jar (were x is the current qpid version)

+qpid-client-<version>.jar (were <version> is the current qpid version)

+qpid-common-<version>.jar (were <version> is the current qpid version)

 

 alternatively you can run the following script (that add all the qpid jars to the CLASSPATH):

 

@@ -114,4 +114,4 @@ Notes:
 If you wish to configure QMan via a configuration file so QMan establishes a connection with one or several broker at starting time then add the options -Dqman-config=myconfigFile.xml to JAVA_OPTS.

 When Qpid is built form source, the war archive qman.war is located in qpid/java/build/management/client/servlet

 

-Enjoy!
\ No newline at end of file
+Enjoy!

diff --git a/qpid/java/management/client/build.xml b/qpid/java/management/client/build.xml
index 4dbb02ab21..bf32233214 100644
--- a/qpid/java/management/client/build.xml
+++ b/qpid/java/management/client/build.xml
@@ -46,9 +46,9 @@
         </copy>
         <copy todir="${servlet.web-inf}/lib">
             <fileset dir="${build}/lib">
-                <include name="qpid-client-incubating*.jar"/>
-                <include name="qpid-common-incubating*.jar"/>
-                <include name="qpid-management-client-incubating*.jar"/>
+                <include name="qpid-client-*.jar"/>
+                <include name="qpid-common-*.jar"/>
+                <include name="qpid-management-client-*.jar"/>
             </fileset>
         </copy>
     </target>
diff --git a/qpid/java/management/tools/qpid-cli/bin/qpid-cli b/qpid/java/management/tools/qpid-cli/bin/qpid-cli
index 7f84472ebe..0efb49dddd 100755
--- a/qpid/java/management/tools/qpid-cli/bin/qpid-cli
+++ b/qpid/java/management/tools/qpid-cli/bin/qpid-cli
@@ -24,7 +24,7 @@ if [ -z "$QPID_HOME" ]; then
 fi
 
 # Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 2bcfa09f0c..fd3c44c752 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -58,7 +58,7 @@
   <property name="module.release.tgz"          location="${module.release.base}/${module.namever}.tar.gz"/>
   <property name="module.release.bz2"          location="${module.release}/${module.namever}.tar.bz2"/>
 
-  <property name="module.qpid.jar"     location="${module.release.lib}/qpid-incubating.jar"/>
+  <property name="module.qpid.jar"     location="${module.release.lib}/qpid-all.jar"/>
   <basename property="qpid.jar.name"  file="${module.qpid.jar}"/>
 
   <property name="module.coverage"     location="${module.build}/coverage"/>
diff --git a/qpid/java/perftests/bin/topicListener.sh b/qpid/java/perftests/bin/topicListener.sh
index a728592cd7..3a925910ad 100755
--- a/qpid/java/perftests/bin/topicListener.sh
+++ b/qpid/java/perftests/bin/topicListener.sh
@@ -20,14 +20,13 @@
 
 
 # XXX -Xmx512m -Xms512m -XX:NewSize=150m
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
-TEST_JAR=$QPID_HOME/../../../../perftests/target/qpid-perftests-1.0-incubating-M2-SNAPSHOT.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
        JAVA_VM=-server \
        JAVA_MEM="-Xmx128m -Dlog4j.configuration=$HOME/log4j.properties" \
        JAVA_GC="-XX:-UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
-       QPID_CLASSPATH=$QPID_LIBS:$TEST_JAR
+       QPID_CLASSPATH=$QPID_LIBS
 
 . qpid-run -Damqj.logging.level="INFO" org.apache.qpid.oldtopic.Listener $*
diff --git a/qpid/java/perftests/bin/topicPublisher.sh b/qpid/java/perftests/bin/topicPublisher.sh
index f9b6bc19fe..e4e9981a75 100755
--- a/qpid/java/perftests/bin/topicPublisher.sh
+++ b/qpid/java/perftests/bin/topicPublisher.sh
@@ -19,14 +19,13 @@
 #
 
 # XXX -Xmx512m -Xms512m -XX:NewSize=150m
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
-TEST_JAR=$QPID_HOME/../../../../perftests/target/qpid-perftests-1.0-incubating-M2-SNAPSHOT.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
        JAVA_VM=-server \
        JAVA_MEM=-Xmx128m \
        JAVA_GC="-XX:-UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
-       QPID_CLASSPATH=$QPID_LIBS:$TEST_JAR
+       QPID_CLASSPATH=$QPID_LIBS
 
 . qpid-run -Damqj.logging.level="INFO" org.apache.qpid.oldtopic.Publisher $*
diff --git a/qpid/java/perftests/generate-scripts b/qpid/java/perftests/generate-scripts
index a91094253c..3d12cc13c3 100644
--- a/qpid/java/perftests/generate-scripts
+++ b/qpid/java/perftests/generate-scripts
@@ -55,7 +55,7 @@ for arg in "$@"; do
 done
 
 # Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
diff --git a/qpid/java/tools/bin/qpid-bench b/qpid/java/tools/bin/qpid-bench
index 21b092563a..c982e64efd 100644
--- a/qpid/java/tools/bin/qpid-bench
+++ b/qpid/java/tools/bin/qpid-bench
@@ -24,7 +24,7 @@ if [ -z "$QPID_HOME" ]; then
 fi
 
 # Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \