Author: ningjiang
Date: Mon Oct 23 22:45:48 2006
New Revision: 467250
URL: http://svn.apache.org/viewvc?view=rev&rev=467250
Log:
update jms samples to use ActiveMQ4.0.X
Removed:
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/wsdl/jms_greeter_config.xml
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/wsdl/jms_greeter.wsdl
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/wsdl/jms_greeter.wsdl
incubator/cxf/trunk/pom.xml
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?view=diff&rev=467250&r1=467249&r2=467250
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
Mon Oct 23 22:45:48 2006
@@ -68,15 +68,8 @@
<isset property="env.CXF_HOME"/>
</condition>
<property name="cxf.home" location="../.."/>
- <property name="activemq.home" location="${cxf.home}/lib/activemq/3.2"/>
<property name="cxf.etc.dir" location="${cxf.home}/etc"/>
- <path id="activeMQ.classpath">
- <pathelement location="${activemq.home}/lib/spring-core-1.2.5.jar"/>
- <pathelement location="${activemq.home}/lib/spring-beans-1.2.5.jar"/>
- <pathelement location="${cxf.home}/lib/cxf-incubator.jar"/>
- </path>
-
<path id="cxf.classpath">
<pathelement location="${basedir}"/>
<pathelement location="${build.classes.dir}"/>
@@ -128,22 +121,6 @@
<delete dir="${activemq.home}/var"/>
</target>
- <!-- Target to start JMS Broker for JMS samples -->
- <target name="jmsbroker.start">
- <property name="derby.system.home" location="${build.var.dir}"/>
-
- <java classname="org.activemq.spring.Main" fork="yes"
dir="${activemq.home}/bin">
- <classpath>
- <path refid="activeMQ.classpath"/>
- </classpath>
- <arg value="${activemq.home}/conf/activemq.xml"/>
- <jvmarg value="-Dactivemq.home=${activemq.home}"/>
- <jvmarg value="-Dderby.system.home=${derby.system.home}"/>
- <jvmarg value="-Dderby.storage.fileSyncTransactionLog=true"/>
- <jvmarg value="-Dderby.storage.dir=${build.var.dir}"/>
- <sysproperty key="log4j.configuration"
value="file:///${cxf.etc.dir}/log4j.properties"/>
- </java>
- </target>
<target name="build" depends="compile" description="build demo client and
server"/>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt?view=diff&rev=467250&r1=467249&r2=467250
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
Mon Oct 23 22:45:48 2006
@@ -20,6 +20,27 @@
javac, and java to build and run the demos, you must set the
environment by running the script.
+This demo need to play with ActiveMQ 4.0.X, Before you run this
+Demo, please make sure you had installed the ActiveMQ 4.0.X and
+set ACTIVE_HOME enviroment variables.
+
+Befor you run this demo, please start up the JMS message broker first.
+
+From ActiveMQ 4.0.X insallation launch ActiveMQ JMS Broker in seperate window
+or in background using the commandline:
+
+For Unix:
+
+cd <activemq.home.dir>/bin
+activemq
+
+For Windows:
+cd <activemq.home.dir>\bin
+activemq.bat
+
+The location of <activemq.home.dir> depends on whether you have installed the
+binary or source release.
+
Building and running the demo using ant
@@ -31,7 +52,6 @@
Using either UNIX or Windows:
ant build
- ant jmsbroker.start
ant server
ant client
@@ -77,22 +97,8 @@
Running the demo using java
---------------------------
-From ActiveMQ insallation launch ActiveMQ JMS Broker in seperate window or in
-background using the commandline:
-
-For Unix:
-
-cd <activemq.home.dir>/bin
-activemq ../conf/activemq.xml
-
-For Windows:
-cd <activemq.home.dir>\bin
-activemq.bat ..\conf\activemq.xml
-
The location of <activemq.home.dir> depends on whether you have installed the
-binary or source release. In the binary release, <activemq.home.dir> is in
-lib/activemq/3.2. In the source release, <activemq.home.dir> is in
-tools/activemq/3.2.
+binary or source release.
From the samples/jms_pubsub directory run the commands, entered on a
single command line:
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/build.xml?view=diff&rev=467250&r1=467249&r2=467250
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/build.xml
Mon Oct 23 22:45:48 2006
@@ -18,7 +18,16 @@
under the License.
-->
<project name="JMS Greeter pub-sub demo" default="build" basedir=".">
+ <property environment="env"/>
+ <condition property="activemq.home" value="${env.ACTIVEMQ_HOME}">
+ <isset property="env.ACTIVEMQ_HOME"/>
+ </condition>
+ <fail message="this sample need to use activemq, please setup
ACTIVEMQ_HOME."
+ unless="activemq.home"/>
+
+ <property name="thirdparty.classpath"
location="${activemq.home}/incubator-activemq-4.0.2.jar"/>
+
<import file="../common_build.xml"/>
<property name="wsdl.dir" location="${basedir}/wsdl"/>
@@ -28,12 +37,12 @@
<property name="param1" value=""/>
<property name="param2" value=""/>
<property name="param3" value=""/>
- <cxfrun classname="demo.jms_greeter.client.Client"
jvmarg1="-Dceltix.config.file=file:///${basedir}/wsdl/jms_greeter_config.xml"
param1="${basedir}/wsdl/jms_greeter.wsdl" param2="${op}" param3="${param1}"
param4="${param2}" param5="${param3}"/>
+ <cxfrun classname="demo.jms_greeter.client.Client"
param1="${basedir}/wsdl/jms_greeter.wsdl" param2="${op}" param3="${param1}"
param4="${param2}" param5="${param3}"/>
</target>
<target name="server" description="run demo server" depends="build">
- <cxfrun classname="demo.jms_greeter.server.Server"
jvmarg1="-Dceltix.config.file=file:///${basedir}/wsdl/jms_greeter_config.xml"
param1="${basedir}/wsdl/jms_greeter.wsdl"/>
+ <cxfrun classname="demo.jms_greeter.server.Server"
param1="${basedir}/wsdl/jms_greeter.wsdl"/>
</target>
<target name="generate.code" unless="codegen.notrequired">
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/wsdl/jms_greeter.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/wsdl/jms_greeter.wsdl?view=diff&rev=467250&r1=467249&r2=467250
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/wsdl/jms_greeter.wsdl
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/wsdl/jms_greeter.wsdl
Mon Oct 23 22:45:48 2006
@@ -68,10 +68,10 @@
<jms:address
destinationStyle="topic"
jndiConnectionFactoryName="ConnectionFactory"
-
jndiDestinationName="dynamicTopics/test.celtix.jmstransport.topic"
+
jndiDestinationName="dynamicTopics/test.cxf.jmstransport.topic"
>
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61616"/>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt?view=diff&rev=467250&r1=467249&r2=467250
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
Mon Oct 23 22:45:48 2006
@@ -20,6 +20,26 @@
javac, and java to build and run the demos, you must set the
environment by running the script.
+This demo need to play with ActiveMQ 4.X, Before you run this
+Demo, please make sure you had installed the ActiveMQ 4.X and
+set ACTIVE_HOME enviroment variables.
+
+Befor you run this demo, please start up the JMS message broker first.
+
+From ActiveMQ 4.X insallation launch ActiveMQ JMS Broker in seperate window
+or in background using the commandline:
+
+For Unix:
+
+cd <activemq.home.dir>/bin
+activemq
+
+For Windows:
+cd <activemq.home.dir>\bin
+activemq.bat
+
+The location of <activemq.home.dir> depends on whether you have installed the
+binary or source release.
Building and running the demo using ant
@@ -78,23 +98,6 @@
Running the demo using java
---------------------------
-
-From ActiveMQ insallation launch ActiveMQ JMS Broker in seperate window or in
-background using the commandline:
-
-For Unix:
-
-cd <activemq.home.dir>/bin
-activemq ../conf/activemq.xml
-
-For Windows:
-cd <activemq.home.dir>\bin
-activemq.bat ..\conf\activemq.xml
-
-The location of <activemq.home.dir> depends on whether you have installed the
-binary or source release. In the binary release, <activemq.home.dir> is in
-lib/activemq/3.2. In the source release, <activemq.home.dir> is in
-tools/activemq/3.2.
From the samples/jms_queue directory run the commands, entered on a
single command line:
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/build.xml?view=diff&rev=467250&r1=467249&r2=467250
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/build.xml
Mon Oct 23 22:45:48 2006
@@ -18,6 +18,14 @@
under the License.
-->
<project name="JMS Queue Greeter" default="build" basedir=".">
+ <property environment="env"/>
+ <condition property="activemq.home" value="${env.ACTIVEMQ_HOME}">
+ <isset property="env.ACTIVEMQ_HOME"/>
+ </condition>
+ <fail message="this sample need to use activemq, please setup
ACTIVEMQ_HOME."
+ unless="activemq.home"/>
+
+ <property name="thirdparty.classpath"
location="${activemq.home}/incubator-activemq-4.0.2.jar"/>
<import file="../common_build.xml"/>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/wsdl/jms_greeter.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/wsdl/jms_greeter.wsdl?view=diff&rev=467250&r1=467249&r2=467250
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/wsdl/jms_greeter.wsdl
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/wsdl/jms_greeter.wsdl
Mon Oct 23 22:45:48 2006
@@ -135,9 +135,9 @@
<jms:address
destinationStyle="queue"
jndiConnectionFactoryName="ConnectionFactory"
-
jndiDestinationName="dynamicQueues/test.celtix.jmstransport.queue">
+
jndiDestinationName="dynamicQueues/test.cxf.jmstransport.queue">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61616"/>
</jms:address>
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=467250&r1=467249&r2=467250
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Mon Oct 23 22:45:48 2006
@@ -651,6 +651,11 @@
</snapshots>
</repository>
<repository>
+ <id>ActiveMQ</id>
+ <name>ActiveMQ Maven2 Temp Repository</name>
+
<url>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC3/maven2</url>
+ </repository>
+ <repository>
<id>java.net</id>
<name>java.net Maven Repository</name>
<url>https://maven-repository.dev.java.net/nonav/repository/</url>
