Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ADCC5D354 for ; Mon, 22 Oct 2012 17:48:31 +0000 (UTC) Received: (qmail 60003 invoked by uid 500); 22 Oct 2012 17:48:31 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 59955 invoked by uid 500); 22 Oct 2012 17:48:31 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 59888 invoked by uid 99); 22 Oct 2012 17:48:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2012 17:48:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2012 17:48:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B93D323888E4; Mon, 22 Oct 2012 17:47:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: gmazza@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121022174744.B93D323888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ ${project.version} + ${basedir}/src/main/config/jms_greeter.wsdl + @@ -53,7 +55,7 @@ - ${basedir}/wsdl/jms_greeter.wsdl + ${wsdl.file} @@ -83,7 +85,7 @@ demo.jms_greeter.server.Server - ${basedir}/wsdl/jms_greeter.wsdl + ${wsdl.file} @@ -109,7 +111,7 @@ demo.jms_greeter.client.Client - ${basedir}/wsdl/jms_greeter.wsdl + ${wsdl.file} @@ -150,17 +152,6 @@ org.apache.cxf - cxf-rt-transports-http - 2.6.4-SNAPSHOT - - - - org.apache.cxf - cxf-rt-transports-http-jetty - 2.6.4-SNAPSHOT - - - org.apache.cxf cxf-rt-transports-jms 2.6.4-SNAPSHOT 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());