Author: gmazza
Date: Mon Oct 22 18:00:52 2012
New Revision: 1400975
URL: http://svn.apache.org/viewvc?rev=1400975&view=rev
Log:
Merged revisions 1400973 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1400973 | gmazza | 2012-10-22 13:53:53 -0400 (Mon, 22 Oct 2012) | 1 line
Code and README updates for jms_pubsub sample.
........
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/main/config/
- copied from r1400973,
cxf/trunk/distribution/src/main/release/samples/jms_pubsub/src/main/config/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/main/config/jms_greeter.wsdl
- copied unchanged from r1400973,
cxf/trunk/distribution/src/main/release/samples/jms_pubsub/src/main/config/jms_greeter.wsdl
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/wsdl/
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt?rev=1400975&r1=1400974&r2=1400975&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/README.txt
Mon Oct 22 18:00:52 2012
@@ -4,6 +4,11 @@ JMS Transport Demo using Document-Litera
This sample demonstrates use of the Document-Literal style
binding over JMS transport using the pub/sub mechanism.
+Unlike the jms_queue sample, this web service provides only
+the one-way message exchange pattern (greetMeOneWay), not
+the standard request-response model because you cannot ordinarily
+have a single response for a request that has multiple subscribers.
+
Please review the README in the samples directory before
continuing.
@@ -20,6 +25,7 @@ located), using either UNIX or Windows:
Using either UNIX or Windows:
mvn install (this will build the demo)
+
In separate command windows/shells:
mvn -Pjms.broker
mvn -Pserver
@@ -27,5 +33,3 @@ Using either UNIX or Windows:
To remove the code generated from the WSDL file and the .class
files, run "mvn clean".
-
-
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml?rev=1400975&r1=1400974&r2=1400975&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/pom.xml
Mon Oct 22 18:00:52 2012
@@ -31,7 +31,9 @@
<properties>
<cxf.version>${project.version}</cxf.version>
+ <wsdl.file>${basedir}/src/main/config/jms_greeter.wsdl</wsdl.file>
</properties>
+
<build>
<plugins>
<plugin>
@@ -52,7 +54,7 @@
<configuration>
<wsdlOptions>
<wsdlOption>
-
<wsdl>${basedir}/wsdl/jms_greeter.wsdl</wsdl>
+ <wsdl>${wsdl.file}</wsdl>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -82,7 +84,7 @@
<configuration>
<mainClass>demo.jms_greeter.server.Server</mainClass>
<arguments>
-
<argument>${basedir}/wsdl/jms_greeter.wsdl</argument>
+ <argument>${wsdl.file}</argument>
</arguments>
</configuration>
</execution>
@@ -108,7 +110,7 @@
<configuration>
<mainClass>demo.jms_greeter.client.Client</mainClass>
<arguments>
-
<argument>${basedir}/wsdl/jms_greeter.wsdl</argument>
+ <argument>${wsdl.file}</argument>
</arguments>
</configuration>
</execution>
@@ -149,17 +151,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>2.6.4-SNAPSHOT</version>
- </dependency>
- <!-- Jetty is needed if you're using the CXFServlet -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.6.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
<version>2.6.4-SNAPSHOT</version>
</dependency>
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java?rev=1400975&r1=1400974&r2=1400975&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
Mon Oct 22 18:00:52 2012
@@ -25,7 +25,7 @@ import org.apache.cxf.jms_greeter.JMSGre
@javax.jws.WebService(portName = "GreeterPort", serviceName =
"JMSGreeterService",
targetNamespace = "http://cxf.apache.org/jms_greeter",
endpointInterface =
"org.apache.cxf.jms_greeter.JMSGreeterPortType",
- wsdlLocation = "file:./wsdl/jms_greeter.wsdl")
+ wsdlLocation = "file:./src/main/config/jms_greeter.wsdl")
public class GreeterJMSImpl implements JMSGreeterPortType {
private static final Logger LOG =
Logger.getLogger(GreeterJMSImpl.class.getPackage().getName());