Author: rhs
Date: Tue Dec 9 17:29:01 2008
New Revision: 724948
URL: http://svn.apache.org/viewvc?rev=724948&view=rev
Log:
removed incubating from various shell scripts, release artifacts, and READMEs
Modified:
incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh
incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd
incubator/qpid/trunk/qpid/java/broker/bin/qpid-server
incubator/qpid/trunk/qpid/java/broker/bin/qpid-server.bat
incubator/qpid/trunk/qpid/java/broker/etc/qpid-server.conf
incubator/qpid/trunk/qpid/java/build.xml
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
incubator/qpid/trunk/qpid/java/common.xml
incubator/qpid/trunk/qpid/java/integrationtests/bin/interoptests.py
incubator/qpid/trunk/qpid/java/management/client/README.txt
incubator/qpid/trunk/qpid/java/management/client/build.xml
incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli
incubator/qpid/trunk/qpid/java/module.xml
incubator/qpid/trunk/qpid/java/perftests/bin/topicListener.sh
incubator/qpid/trunk/qpid/java/perftests/bin/topicPublisher.sh
incubator/qpid/trunk/qpid/java/perftests/generate-scripts
incubator/qpid/trunk/qpid/java/tools/bin/qpid-bench
Modified: incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/msTool.sh Tue Dec 9 17:29:01 2008
@@ -49,7 +49,7 @@
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 \
Modified: incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd Tue Dec 9 17:29:01
2008
@@ -24,7 +24,7 @@
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 \
Modified: incubator/qpid/trunk/qpid/java/broker/bin/qpid-server
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/qpid-server?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/qpid-server (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/qpid-server Tue Dec 9 17:29:01
2008
@@ -24,7 +24,7 @@
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 \
Modified: incubator/qpid/trunk/qpid/java/broker/bin/qpid-server.bat
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/qpid-server.bat?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/qpid-server.bat (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/qpid-server.bat Tue Dec 9
17:29:01 2008
@@ -76,8 +76,8 @@
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
Modified: incubator/qpid/trunk/qpid/java/broker/etc/qpid-server.conf
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/etc/qpid-server.conf?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/etc/qpid-server.conf (original)
+++ incubator/qpid/trunk/qpid/java/broker/etc/qpid-server.conf Tue Dec 9
17:29:01 2008
@@ -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 \
Modified: incubator/qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Tue Dec 9 17:29:01 2008
@@ -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"/>
Modified:
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
(original)
+++
incubator/qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
Tue Dec 9 17:29:01 2008
@@ -7,6 +7,6 @@
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"
Modified: incubator/qpid/trunk/qpid/java/common.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common.xml?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common.xml (original)
+++ incubator/qpid/trunk/qpid/java/common.xml Tue Dec 9 17:29:01 2008
@@ -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"/>
Modified: incubator/qpid/trunk/qpid/java/integrationtests/bin/interoptests.py
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/integrationtests/bin/interoptests.py?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/integrationtests/bin/interoptests.py
(original)
+++ incubator/qpid/trunk/qpid/java/integrationtests/bin/interoptests.py Tue Dec
9 17:29:01 2008
@@ -27,11 +27,11 @@
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 @@
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"],
Modified: incubator/qpid/trunk/qpid/java/management/client/README.txt
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/README.txt?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/client/README.txt (original)
+++ incubator/qpid/trunk/qpid/java/management/client/README.txt Tue Dec 9
17:29:01 2008
@@ -5,7 +5,7 @@
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-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 @@
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!
Modified: incubator/qpid/trunk/qpid/java/management/client/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/build.xml?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/client/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/management/client/build.xml Tue Dec 9
17:29:01 2008
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli
(original)
+++ incubator/qpid/trunk/qpid/java/management/tools/qpid-cli/bin/qpid-cli Tue
Dec 9 17:29:01 2008
@@ -24,7 +24,7 @@
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 \
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Tue Dec 9 17:29:01 2008
@@ -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"/>
Modified: incubator/qpid/trunk/qpid/java/perftests/bin/topicListener.sh
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/bin/topicListener.sh?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/bin/topicListener.sh (original)
+++ incubator/qpid/trunk/qpid/java/perftests/bin/topicListener.sh Tue Dec 9
17:29:01 2008
@@ -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 $*
Modified: incubator/qpid/trunk/qpid/java/perftests/bin/topicPublisher.sh
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/bin/topicPublisher.sh?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/bin/topicPublisher.sh (original)
+++ incubator/qpid/trunk/qpid/java/perftests/bin/topicPublisher.sh Tue Dec 9
17:29:01 2008
@@ -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 $*
Modified: incubator/qpid/trunk/qpid/java/perftests/generate-scripts
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/generate-scripts?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/generate-scripts (original)
+++ incubator/qpid/trunk/qpid/java/perftests/generate-scripts Tue Dec 9
17:29:01 2008
@@ -55,7 +55,7 @@
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 \
Modified: incubator/qpid/trunk/qpid/java/tools/bin/qpid-bench
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/tools/bin/qpid-bench?rev=724948&r1=724947&r2=724948&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/tools/bin/qpid-bench (original)
+++ incubator/qpid/trunk/qpid/java/tools/bin/qpid-bench Tue Dec 9 17:29:01 2008
@@ -24,7 +24,7 @@
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 \
