Author: ningjiang
Date: Mon Dec 27 07:12:20 2010
New Revision: 1053010
URL: http://svn.apache.org/viewvc?rev=1053010&view=rev
Log:
Merged revisions 1052997 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1052997 | ningjiang | 2010-12-27 13:12:14 +0800 (Mon, 27 Dec 2010) | 1 line
Put the activemq-data into target, and fix the warning of Client
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/broker/EmbeddedBroker.java
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/client/Client.java
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/broker/EmbeddedBroker.java
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/client/Client.java
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/broker/EmbeddedBroker.java
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/client/Client.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 27 07:12:20 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994,1052996
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994,1052996-1052997
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/broker/EmbeddedBroker.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/broker/EmbeddedBroker.java?rev=1053010&r1=1053009&r2=1053010&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/broker/EmbeddedBroker.java
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/broker/EmbeddedBroker.java
Mon Dec 27 07:12:20 2010
@@ -28,6 +28,7 @@ public final class EmbeddedBroker {
public static void main(String[] args) throws Exception {
BrokerService broker = new BrokerService();
broker.setPersistenceAdapter(new MemoryPersistenceAdapter());
+ broker.setDataDirectory("target/activemq-data");
broker.addConnector("tcp://localhost:61616");
broker.start();
System.out.println("JMS broker ready ...");
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/client/Client.java?rev=1053010&r1=1053009&r2=1053010&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/client/Client.java
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/demo/jms_greeter/client/Client.java
Mon Dec 27 07:12:20 2010
@@ -47,7 +47,7 @@ public final class Client {
File wsdl = new File(args[0]);
- JMSGreeterService service = new JMSGreeterService(wsdl.toURL(),
SERVICE_NAME);
+ JMSGreeterService service = new
JMSGreeterService(wsdl.toURI().toURL(), SERVICE_NAME);
JMSGreeterPortType greeter =
(JMSGreeterPortType)service.getPort(PORT_NAME, JMSGreeterPortType.class);
System.out.println("Invoking sayHi...");
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/broker/EmbeddedBroker.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/broker/EmbeddedBroker.java?rev=1053010&r1=1053009&r2=1053010&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/broker/EmbeddedBroker.java
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/broker/EmbeddedBroker.java
Mon Dec 27 07:12:20 2010
@@ -28,6 +28,7 @@ public final class EmbeddedBroker {
public static void main(String[] args) throws Exception {
BrokerService broker = new BrokerService();
broker.setPersistenceAdapter(new MemoryPersistenceAdapter());
+ broker.setDataDirectory("target/activemq_data");
broker.addConnector("tcp://localhost:61616");
broker.start();
System.out.println("JMS broker ready ...");
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/client/Client.java?rev=1053010&r1=1053009&r2=1053010&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/client/Client.java
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/demo/jms_greeter/client/Client.java
Mon Dec 27 07:12:20 2010
@@ -42,7 +42,7 @@ public final class Client {
File wsdl = new File(args[0]);
- JMSGreeterService service = new JMSGreeterService(wsdl.toURL(),
SERVICE_NAME);
+ JMSGreeterService service = new
JMSGreeterService(wsdl.toURI().toURL(), SERVICE_NAME);
JMSGreeterPortType greeter =
(JMSGreeterPortType)service.getPort(PORT_NAME, JMSGreeterPortType.class);
System.out.println("Invoking greetMeOneWay...");
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/broker/EmbeddedBroker.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/broker/EmbeddedBroker.java?rev=1053010&r1=1053009&r2=1053010&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/broker/EmbeddedBroker.java
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/broker/EmbeddedBroker.java
Mon Dec 27 07:12:20 2010
@@ -28,6 +28,7 @@ public final class EmbeddedBroker {
public static void main(String[] args) throws Exception {
BrokerService broker = new BrokerService();
broker.setPersistenceAdapter(new MemoryPersistenceAdapter());
+ broker.setDataDirectory("target/activemq-data");
broker.addConnector("tcp://localhost:61616");
broker.start();
System.out.println("JMS broker ready ...");
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/client/Client.java?rev=1053010&r1=1053009&r2=1053010&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/client/Client.java
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/jms_queue/src/demo/jms_greeter/client/Client.java
Mon Dec 27 07:12:20 2010
@@ -51,7 +51,7 @@ public final class Client {
File wsdl = new File(args[0]);
- JMSGreeterService service = new JMSGreeterService(wsdl.toURL(),
SERVICE_NAME);
+ JMSGreeterService service = new
JMSGreeterService(wsdl.toURI().toURL(), SERVICE_NAME);
JMSGreeterPortType greeter =
(JMSGreeterPortType)service.getPort(PORT_NAME, JMSGreeterPortType.class);
System.out.println("Invoking sayHi...");
