Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 76558 invoked from network); 21 Apr 2008 16:24:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Apr 2008 16:24:13 -0000 Received: (qmail 92014 invoked by uid 500); 21 Apr 2008 16:24:14 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 91965 invoked by uid 500); 21 Apr 2008 16:24:14 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 91956 invoked by uid 99); 21 Apr 2008 16:24:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Apr 2008 09:24:14 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Apr 2008 16:23:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3E4081A9832; Mon, 21 Apr 2008 09:23:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r650192 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/ distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/ distr... Date: Mon, 21 Apr 2008 16:23:45 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080421162348.3E4081A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Apr 21 09:23:34 2008 New Revision: 650192 URL: http://svn.apache.org/viewvc?rev=650192&view=rev Log: Merged revisions 649597 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r649597 | seanoc | 2008-04-18 12:34:35 -0400 (Fri, 18 Apr 2008) | 1 line Update READMES and build.xml files to use latest release versions of ActiveMQ (5.0.0) and ServiceMix(3.2.1) ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/handlers/README.txt incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/build.xml incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/build.xml Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt Mon Apr 21 09:23:34 2008 @@ -51,7 +51,7 @@ Build Instructions ------------------ . Download & Install ServiceMix - http://incubator.apache.org/servicemix/servicemix-31.html + http://servicemix.apache.org/servicemix-321.html . export SERVICEMIX_HOME for your shell envirnoment @@ -73,16 +73,9 @@ Start cxf server For UNIX: - > ant server -Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-4.1-incubator-20070103.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.2.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0.0-incubator.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.1.jar + > ant server -Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-4.1.1.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.2.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0.0-incubator.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.1.jar For Windows: - > ant server -Dthirdparty.classpath="%SERVICEMIX_HOME%"/lib/activemq-core-4.1-incubator-20070103.jar:"%SERVICEMIX_HOME%"/lib/backport-util-concurrent-2.2.jar:"%SERVICEMIX_HOME%"/lib/activeio-core-3.0.0-incubator.jar:"%SERVICEMIX_HOME%"/lib/geronimo-j2ee-management_1.0_spec-1.1.jar - -Install and start the ServiceMix soap/jms binding component -copy servicemix-jms-3.1-incubating-installer.zip, servicemix-http-3.1-incubating-installer.zip and -servicemix-shared-3.1-incubating-installer.zip to the deploy directory -where servicemix monitor on, for a instance, start servicemix from -$SERVICEMIX_HOME/bin, then copy the three zip files into deploy directory under -$SERVICEMIX_HOME/bin + > ant server -Dthirdparty.classpath="%SERVICEMIX_HOME%"/lib/activemq-core-4.1.1.jar:"%SERVICEMIX_HOME%"/lib/backport-util-concurrent-2.2.jar:"%SERVICEMIX_HOME%"/lib/activeio-core-3.0.0-incubator.jar:"%SERVICEMIX_HOME%"/lib/geronimo-j2ee-management_1.0_spec-1.1.jar Deploy and start the CXF demo service assembly Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt Mon Apr 21 09:23:34 2008 @@ -49,7 +49,7 @@ Build Instructions ------------------ . Download & Install ServiceMix - http://incubator.apache.org/servicemix/servicemix-31.html + http://servicemix.apache.org/servicemix-321.html . export SERVICEMIX_HOMEfor your shell envirnoment @@ -71,9 +71,9 @@ Start cxf server For UNIX: - > ant server -Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-4.1-incubator-20070103.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.2.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0.0-incubator.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.1.jar + > ant server -Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-4.1.1.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.2.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0.0-incubator.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.1.jar For Windows: - > ant server -Dthirdparty.classpath="%SERVICEMIX_HOME%"/lib/activemq-core-4.1-incubator-20070103.jar:"%SERVICEMIX_HOME%"/lib/backport-util-concurrent-2.2.jar:"%SERVICEMIX_HOME%"/lib/activeio-core-3.0.0-incubator.jar:"%SERVICEMIX_HOME%"/lib/geronimo-j2ee-management_1.0_spec-1.1.jar + > ant server -Dthirdparty.classpath="%SERVICEMIX_HOME%"/lib/activemq-core-4.1.1.jar:"%SERVICEMIX_HOME%"/lib/backport-util-concurrent-2.2.jar:"%SERVICEMIX_HOME%"/lib/activeio-core-3.0.0-incubator.jar:"%SERVICEMIX_HOME%"/lib/geronimo-j2ee-management_1.0_spec-1.1.jar Install and start the CXF Service Engine: @@ -85,14 +85,6 @@ > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml install-component -Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml start-component -Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx - -Install and start the ServiceMix jms binding component - -copy servicemix-jms-3.1-incubating-installer.zip and -servicemix-shared-3.1-incubating-installer.zip to the deploy directory -where servicemix monitor on, for a instance, start servicemix from -$SERVICEMIX_HOME/bin, then copy the two zip files into deploy directory under -$SERVICEMIX_HOME/bin Deploy the and start CXF demo service assembly Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/handlers/README.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/handlers/README.txt?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/handlers/README.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/handlers/README.txt Mon Apr 21 09:23:34 2008 @@ -42,7 +42,7 @@ ------------------ . Download & Install ServiceMix - http://incubator.apache.org/servicemix/servicemix-31.html + http://servicemix.apache.org/servicemix-321.html . export SERVICEMIX_HOME for your shell envirnoment Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt Mon Apr 21 09:23:34 2008 @@ -51,7 +51,7 @@ Build Instructions ------------------ . Download & Install ServiceMix - http://incubator.apache.org/servicemix/servicemix-31.html + http://servicemix.apache.org/servicemix-321.html . export SERVICEMIX_HOME for your shell envirnoment @@ -78,14 +78,6 @@ For Windows: > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml install-component -Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx > ant -f "%SERVICEMIX_HOME%"/ant/servicemix-ant-task.xml start-component -Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx - -Install and start the ServiceMix soap binding component - -copy servicemix-http-3.1-incubating-installer.zip and -servicemix-shared-3.1-incubating-installer.zip to the deploy directory -where servicemix monitor on, for a instance, start servicemix from -$SERVICEMIX_HOME/bin, then copy the two zip files into deploy directory under -$SERVICEMIX_HOME/bin Deploy the and start CXF demo service assembly Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt Mon Apr 21 09:23:34 2008 @@ -46,7 +46,7 @@ ------------------ . Download & Install ServiceMix - http://incubator.apache.org/servicemix/servicemix-31.html + http://servicemix.apache.org/servicemix-321.html . export SERVICEMIX_HOME for your shell envirnoment Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt Mon Apr 21 09:23:34 2008 @@ -26,28 +26,28 @@ javac, and java to build and run the demos, you must set the environment. -This demo requires ActiveMQ 4.1.X. Before you run this -demo, please make sure you had installed the ActiveMQ 4.1.X and +This demo requires ActiveMQ 5.0.0. Before you run this +demo, please make sure you had installed the ActiveMQ 5.0.0 and set ACTIVEMQ_HOME and ACTIVEMQ_VERSION environment variables. -ActiveMQ 4.1.0 the version variable should be +ActiveMQ 5.0.0 the version variable should be For Unix: -export ACTIVEMQ_VERSION=4.1.0-incubator +export ACTIVEMQ_HOME=/installdir/apache-activemq-5.0.0 For Windows: -set ACTIVEMQ_VERSION=4.1.0-incubator +set ACTIVEMQ_VERSION=installdir\apache-activemq-5.0.0 -ActiveMQ 4.1.1 the version variable should be +ActiveMQ 5.0.0 the version variable should be For Unix: -export ACTIVEMQ_VERSION=4.1.1 +export ACTIVEMQ_VERSION=5.0.0 For Windows: -set ACTIVEMQ_VERSION=4.1.1 +set ACTIVEMQ_VERSION=5.0.0 Before you run this demo, start up the JMS message broker. -From ActiveMQ 4.1.X insallation launch ActiveMQ JMS Broker in seperate window +From ActiveMQ 5.0.0 insallation launch ActiveMQ JMS Broker in seperate window or in background using the commands: For Unix: @@ -105,13 +105,13 @@ For UNIX: export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-manifest.jar:./build/classes: -$ACTIVEMQ_HOME/apache-activemq-$ACTIVEMQ_VERSION.jar +$ACTIVEMQ_HOME/activemq-all-$ACTIVEMQ_VERSION.jar javac -d build/classes src/demo/jms_greeter/client/*.java javac -d build/classes src/demo/jms_greeter/server/*.java For Windows: set classpath=%classpath%;%CXF_HOME%\lib\cxf-manifest.jar;.\build\classes; -%ACTIVEMQ_HOME%\apache-activemq-%ACTIVEMQ_VERSION%.jar +%ACTIVEMQ_HOME%\activemq-all-%ACTIVEMQ_VERSION%.jar javac -d build\classes src\demo\jms_greeter\client\*.java javac -d build\classes src\demo\jms_greeter\server\*.java @@ -194,7 +194,7 @@ - + with Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/build.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/build.xml?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/build.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_pubsub/build.xml Mon Apr 21 09:23:34 2008 @@ -31,7 +31,7 @@ - + Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt Mon Apr 21 09:23:34 2008 @@ -26,29 +26,29 @@ javac, and java to build and run the demos, you must set the environment. -This demo requires ActiveMQ 4.1.X. Before you run this -demo, please make sure you had installed the ActiveMQ 4.1.X and +This demo requires ActiveMQ 5.0.0. Before you run this +demo, please make sure you had installed the ActiveMQ 5.0.0 and set ACTIVEMQ_HOME and ACTIVEMQ_VERSION environment variables. -ActiveMQ 4.1.0 the version variable should be +ActiveMQ 5.0.0 the version variable should be For Unix: -export ACTIVEMQ_VERSION=4.1.0-incubator +export ACTIVEMQ_HOME=/installdir/apache-activemq-5.0.0 For Windows: -set ACTIVEMQ_VERSION=4.1.0-incubator +set ACTIVEMQ_VERSION=installdir\apache-activemq-5.0.0 -ActiveMQ 4.1.1 the version variable should be +ActiveMQ 5.0.0 the version variable should be For Unix: -export ACTIVEMQ_VERSION=4.1.1 +export ACTIVEMQ_VERSION=5.0.0 For Windows: -set ACTIVEMQ_VERSION=4.1.1 +set ACTIVEMQ_VERSION=5.0.0 Before you run this demo, please start up the JMS message broker first. -From your ActiveMQ 4.1.X installation launch ActiveMQ JMS broker in a +From your ActiveMQ 5.0.0 installation launch ActiveMQ JMS broker in a separate window or in the background using the commandline: For Unix: Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/build.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/build.xml?rev=650192&r1=650191&r2=650192&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/build.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jms_queue/build.xml Mon Apr 21 09:23:34 2008 @@ -30,7 +30,7 @@ - +