Return-Path: Delivered-To: apmail-ws-sandesha-dev-archive@www.apache.org Received: (qmail 2127 invoked from network); 4 Jun 2007 06:14:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jun 2007 06:14:34 -0000 Received: (qmail 61357 invoked by uid 500); 4 Jun 2007 06:14:38 -0000 Delivered-To: apmail-ws-sandesha-dev-archive@ws.apache.org Received: (qmail 61137 invoked by uid 500); 4 Jun 2007 06:14:36 -0000 Mailing-List: contact sandesha-dev-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list sandesha-dev@ws.apache.org Received: (qmail 61126 invoked by uid 500); 4 Jun 2007 06:14:36 -0000 Delivered-To: apmail-ws-sandesha-cvs@ws.apache.org Received: (qmail 61119 invoked by uid 99); 4 Jun 2007 06:14:36 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2007 23:14:36 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2007 23:14:31 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 758361A981A; Sun, 3 Jun 2007 23:14:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r544062 - in /webservices/sandesha/branches/sandesha2/java/1_2: ./ modules/distribution/src/main/assembly/ modules/samples/src/main/java/sandesha2/samples/userguide/ Date: Mon, 04 Jun 2007 06:14:11 -0000 To: sandesha-cvs@ws.apache.org From: chamikara@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070604061411.758361A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chamikara Date: Sun Jun 3 23:14:09 2007 New Revision: 544062 URL: http://svn.apache.org/viewvc?view=rev&rev=544062 Log: Removed rampart dependencies from the maven1 build. Updated samples Modified: webservices/sandesha/branches/sandesha2/java/1_2/maven.xml webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java webservices/sandesha/branches/sandesha2/java/1_2/pom.xml webservices/sandesha/branches/sandesha2/java/1_2/project.properties webservices/sandesha/branches/sandesha2/java/1_2/project.xml Modified: webservices/sandesha/branches/sandesha2/java/1_2/maven.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/maven.xml?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/maven.xml (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/maven.xml Sun Jun 3 23:14:09 2007 @@ -33,9 +33,6 @@ - - - @@ -163,7 +160,6 @@ - @@ -196,6 +192,7 @@ + - - + - - - - - - + --> + @@ -306,7 +295,6 @@ - Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml Sun Jun 3 23:14:09 2007 @@ -39,6 +39,13 @@ + ../../modules/rampart-integration/target + sandesha2-${version}-bin + + sandesha2-rampart-integration-${version}.jar + + + ../../modules/mar/target sandesha2-${version}-bin Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java Sun Jun 3 23:14:09 2007 @@ -121,17 +121,17 @@ serviceClient.setOptions(clientOptions); -// Callback callback1 = new TestCallback ("Callback 1"); -// serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo1",sequenceKey),callback1); -// -// Callback callback2 = new TestCallback ("Callback 2"); -// serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo2",sequenceKey),callback2); -// -// Callback callback3 = new TestCallback ("Callback 3"); -// serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo3",sequenceKey),callback3); -// -// Callback callback4 = new TestCallback ("Callback 4"); -// serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo4",sequenceKey),callback4); + Callback callback1 = new TestCallback ("Callback 1"); + serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo1",sequenceKey),callback1); + + Callback callback2 = new TestCallback ("Callback 2"); + serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo2",sequenceKey),callback2); + + Callback callback3 = new TestCallback ("Callback 3"); + serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo3",sequenceKey),callback3); + + Callback callback4 = new TestCallback ("Callback 4"); + serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo4",sequenceKey),callback4); clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); Callback callback5 = new TestCallback ("Callback 5"); @@ -143,7 +143,7 @@ Thread.sleep(4000); - configContext.getListenerManager().stop(); + configContext.terminate(); serviceClient.cleanup(); } Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java Sun Jun 3 23:14:09 2007 @@ -140,6 +140,9 @@ SandeshaClient.terminateSequence(serviceClient); + configContext.terminate(); + serviceClient.cleanup(); + } private static OMElement getEchoOMBlock(String text, String sequenceKey) { Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java Sun Jun 3 23:14:09 2007 @@ -117,6 +117,7 @@ } } + configContext.terminate(); serviceClient.cleanup(); } Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java Sun Jun 3 23:14:09 2007 @@ -107,6 +107,7 @@ serviceClient.fireAndForget(getPingOMBlock()); SandeshaClient.waitUntilSequenceCompleted(serviceClient); + configContext.terminate(); serviceClient.cleanup(); } Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java Sun Jun 3 23:14:09 2007 @@ -117,6 +117,11 @@ while (!callback3.isComplete()) { Thread.sleep(1000); } + + Thread.sleep(4000); + + configContext.terminate(); + serviceClient.cleanup(); } private static OMElement getEchoOMBlock(String text, String sequenceKey) { Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java Sun Jun 3 23:14:09 2007 @@ -106,7 +106,6 @@ serviceClient.fireAndForget(getPingOMBlock("ping2")); clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); - serviceClient.fireAndForget(getPingOMBlock("ping3")); SequenceReport sequenceReport = null; @@ -125,6 +124,7 @@ } } + configContext.terminate(); serviceClient.cleanup(); } Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java Sun Jun 3 23:14:09 2007 @@ -71,6 +71,9 @@ } Thread.sleep(4000); + + configContext.terminate(); + serviceClient.cleanup(); } private static OMElement getEchoOMBlock(String text, String sequenceKey) { Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java Sun Jun 3 23:14:09 2007 @@ -58,6 +58,7 @@ clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); serviceClient.fireAndForget(getPingOMBlock("ping3")); + configContext.terminate(); serviceClient.cleanup(); } Modified: webservices/sandesha/branches/sandesha2/java/1_2/pom.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/pom.xml?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/pom.xml (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/pom.xml Sun Jun 3 23:14:09 2007 @@ -184,10 +184,16 @@ org.apache.axis2 - axis2 + axis2-kernel ${axis2.version} - + + + org.apache.axis2 + axis2-codegen + ${axis2.version} + + org.apache.axis2 addressing Modified: webservices/sandesha/branches/sandesha2/java/1_2/project.properties URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/project.properties?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/project.properties (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/project.properties Sun Jun 3 23:14:09 2007 @@ -31,13 +31,9 @@ addressing.version=${axis2.version} rampart.version=1.2 -axis2.security.version=1.2 -axis2.rahas.version=1.2 -axis2.secpolicy.version=1.2 neethi.version=2.0.1 XmlSchema.version=1.3.1 -wss4j.version=1.5.2 annogen.version=0.1.0 backport_util_concurrent.version=2.2 @@ -53,11 +49,9 @@ jakarta.httpcore.version=4.0-alpha4 activation.version=1.1 javamail.version=1.4 -xmlsec.version=1.4-SNAPSHOT -bcprov.version=jdk13-133 repo.addressing.mar.name=addressing axis2.jar.groupid=org.apache.axis2 axis2.mar.groupid=org.apache.axis2 -commons.fileupload.version=1.1.1 +commons.fileupload.version=1.1.1 \ No newline at end of file Modified: webservices/sandesha/branches/sandesha2/java/1_2/project.xml URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/project.xml?view=diff&rev=544062&r1=544061&r2=544062 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/project.xml (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/project.xml Sun Jun 3 23:14:09 2007 @@ -136,12 +136,6 @@ mar - ${axis2.mar.groupid} - rampart - ${rampart.version} - mar - - commons-logging commons-logging ${commons.logging.version} @@ -225,45 +219,6 @@ javax.mail mail ${javamail.version} - - - ${axis2.jar.groupid} - axis2-security - ${axis2.security.version} - - - ${axis2.jar.groupid} - axis2-rahas - ${axis2.rahas.version} - - - ${axis2.jar.groupid} - axis2-secpolicy - ${axis2.secpolicy.version} - - - wss4j - wss4j - ${wss4j.version} - - true - - - - xml-security - xmlsec - ${xmlsec.version} - - true - - - - bouncycastle - bcprov - ${bcprov.version} - - true - commons-fileupload --------------------------------------------------------------------- To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org For additional commands, e-mail: sandesha-dev-help@ws.apache.org