cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1400971 - in /cxf/branches/2.6.x-fixes: ./ distribution/src/main/release/samples/jms_queue/ distribution/src/main/release/samples/jms_queue/src/main/config/ distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/ser...
Date Mon, 22 Oct 2012 17:47:44 GMT
Author: gmazza
Date: Mon Oct 22 17:47:44 2012
New Revision: 1400971

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

........
  r1400969 | gmazza | 2012-10-22 13:39:52 -0400 (Mon, 22 Oct 2012) | 1 line
  
  Updates, clarifications to jms_queue sample
........

Added:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/src/main/config/
      - copied from r1400969, cxf/trunk/distribution/src/main/release/samples/jms_queue/src/main/config/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/src/main/config/jms_greeter.wsdl
      - copied unchanged from r1400969, cxf/trunk/distribution/src/main/release/samples/jms_queue/src/main/config/jms_greeter.wsdl
Removed:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/wsdl/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java

Propchange: cxf/branches/2.6.x-fixes/
            ('svn:mergeinfo' removed)

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_queue/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt?rev=1400971&r1=1400970&r2=1400971&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/README.txt Mon
Oct 22 17:47:44 2012
@@ -1,8 +1,10 @@
 JMS Transport Demo using Document-Literal Style
 ===============================================
 
-This sample demonstrates use of the Document-Literal style 
-binding over JMS Transport using the queue mechanism.
+This sample demonstrates use of the Document-Literal style binding over 
+JMS Transport using the queue mechanism. This sample uses a 
+start-from-WSDL approach, see the similar java_first_jms sample
+for a Java-first sample.
 
 Please review the README in the samples directory before
 continuing.
@@ -12,7 +14,6 @@ illustration purposes only.
 
 
 
-
 Building and running the demo using Maven
 ---------------------------------------
   
@@ -20,6 +21,7 @@ From the base directory of this sample (
 located), 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_queue/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml?rev=1400971&r1=1400970&r2=1400971&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/pom.xml Mon Oct
22 17:47:44 2012
@@ -32,7 +32,9 @@
 
     <properties>
         <cxf.version>${project.version}</cxf.version>
+        <wsdl.file>${basedir}/src/main/config/jms_greeter.wsdl</wsdl.file>
     </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -53,7 +55,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/jms_greeter.wsdl</wsdl>
+                                    <wsdl>${wsdl.file}</wsdl>
                                 </wsdlOption>
                             </wsdlOptions>
                         </configuration>
@@ -83,7 +85,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 +111,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 +152,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_queue/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_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java?rev=1400971&r1=1400970&r2=1400971&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
Mon Oct 22 17:47:44 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