cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1400990 - in /cxf/branches/2.6.x-fixes: ./ distribution/src/main/release/samples/jms-spec-demo/ distribution/src/main/release/samples/jms-spec-demo/src/main/config/ distribution/src/main/release/samples/jms-spec-demo/src/main/java/demo/jms...
Date Mon, 22 Oct 2012 18:33:14 GMT
Author: gmazza
Date: Mon Oct 22 18:33:14 2012
New Revision: 1400990

URL: http://svn.apache.org/viewvc?rev=1400990&view=rev
Log:
Merged revisions 1400985 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1400985 | gmazza | 2012-10-22 14:27:57 -0400 (Mon, 22 Oct 2012) | 1 line
  
  README and formatting changes to jms-spec-demo sample
........

Added:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/main/config/
      - copied from r1400985, cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/src/main/config/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/main/config/jms_greeter.wsdl
      - copied unchanged from r1400985, cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/src/main/config/jms_greeter.wsdl
Removed:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/wsdl/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/README.txt
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/pom.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/main/java/demo/jms_greeter/client/Client.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/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-spec-demo/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/README.txt?rev=1400990&r1=1400989&r2=1400990&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/README.txt
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/README.txt
Mon Oct 22 18:33:14 2012
@@ -1,8 +1,12 @@
 SOAP/JMS Specification Transport Demo using Document-Literal Style
-===============================================
+==================================================================
 
-This sample demonstrates use of the Document-Literal style 
-binding over SOAP/JMS Specification Transport.
+This sample demonstrates use of the Document-Literal style binding
+over SOAP/JMS Specification Transport.  In this sample the JMS 
+configuration in placed in the wsdl:binding section but note it
+can also be placed in the wsdl:service section (with anything in
+wsdl:binding overriding it) and/or the wsdl:port section (where it 
+will override anything placed in wsdl:binding and wsdl:service).
 
 Please review the README in the samples directory before
 continuing.
@@ -11,7 +15,6 @@ This demo uses ActiveMQ as the JMS imple
 illustration purposes only. 
 
 
-
 Building and running the demo using Maven
 ---------------------------------------
   
@@ -21,6 +24,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

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/pom.xml?rev=1400990&r1=1400989&r2=1400990&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/pom.xml Mon
Oct 22 18:33:14 2012
@@ -32,6 +32,7 @@
 
     <properties>
         <cxf.version>${project.version}</cxf.version>
+        <wsdl.file>${basedir}/src/main/config/jms_greeter.wsdl</wsdl.file>
     </properties>
     <build>
         <plugins>
@@ -53,7 +54,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/jms_greeter.wsdl</wsdl>
+                                    <wsdl>${wsdl.file}</wsdl>
                                 </wsdlOption>
                             </wsdlOptions>
                         </configuration>
@@ -83,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>
@@ -109,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>
@@ -150,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-spec-demo/src/main/java/demo/jms_greeter/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/main/java/demo/jms_greeter/client/Client.java?rev=1400990&r1=1400989&r2=1400990&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/main/java/demo/jms_greeter/client/Client.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/main/java/demo/jms_greeter/client/Client.java
Mon Oct 22 18:33:14 2012
@@ -39,8 +39,6 @@ public final class Client {
 
     public static void main(String[] args) throws Exception {
 
-        args = new String[1];
-        args[0] = "./wsdl/jms_greeter.wsdl";
         if (args.length == 0) {
             System.out.println("please specify wsdl");
             System.exit(1);

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/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-spec-demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java?rev=1400990&r1=1400989&r2=1400990&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms-spec-demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
Mon Oct 22 18:33:14 2012
@@ -25,7 +25,7 @@ import org.apache.cxf.jms_greeter.JMSGre
                       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());



Mime
View raw message