Return-Path: 
 <axis-cvs-return-27598-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 72078 invoked from network); 21 Mar 2008 21:39:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Mar 2008 21:39:03 -0000
Received: (qmail 29563 invoked by uid 500); 21 Mar 2008 21:39:01 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 29470 invoked by uid 500); 21 Mar 2008 21:39:01 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 29459 invoked by uid 500); 21 Mar 2008 21:39:01 -0000
Delivered-To: apmail-ws-axis2-cvs@ws.apache.org
Received: (qmail 29456 invoked by uid 99); 21 Mar 2008 21:39:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Mar 2008 14:39:01 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
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; Fri, 21 Mar 2008 21:38:31 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 786EB1A9832; Fri, 21 Mar 2008 14:38:42 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r639868 - in
 /webservices/axis2/trunk/java/modules/samples/jaxws-samples: pom.xml
 src/main/org/apache/axis2/jaxws/samples/servlet/EchoPingSampleServlet.java
 src/webapp/WEB-INF/axis2.xml
Date: Fri, 21 Mar 2008 21:38:41 -0000
To: axis2-cvs@ws.apache.org
From: dims@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080321213842.786EB1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dims
Date: Fri Mar 21 14:38:34 2008
New Revision: 639868

URL: http://svn.apache.org/viewvc?rev=639868&view=rev
Log:
add addressing mar, switch port numbers, set the ClientConfigurationFactory - Part of fix for AXIS2-3647

Modified:
    webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml
    webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/main/org/apache/axis2/jaxws/samples/servlet/EchoPingSampleServlet.java
    webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml

Modified: webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml?rev=639868&r1=639867&r2=639868&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml Fri Mar 21 14:38:34 2008
@@ -54,6 +54,12 @@
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>addressing</artifactId>
+            <version>SNAPSHOT</version>
+            <type>mar</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
             <version>SNAPSHOT</version>
@@ -223,6 +229,19 @@
                 <configuration>
                     <warName>jaxws-samples</warName>
                     <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                    <webResources>
+                        <!-- Need a better war to add the MAR -->
+                        <resource>
+                            <directory>${basedir}/../../addressing/target</directory>
+                            <targetPath>WEB-INF/lib</targetPath>
+                            <includes>
+                                <include>addressing*.mar</include>
+                            </includes>
+                        </resource>
+                    </webResources>
                 </configuration>
             </plugin>
         </plugins>

Modified: webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/main/org/apache/axis2/jaxws/samples/servlet/EchoPingSampleServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/main/org/apache/axis2/jaxws/samples/servlet/EchoPingSampleServlet.java?rev=639868&r1=639867&r2=639868&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/main/org/apache/axis2/jaxws/samples/servlet/EchoPingSampleServlet.java (original)
+++ webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/main/org/apache/axis2/jaxws/samples/servlet/EchoPingSampleServlet.java Fri Mar 21 14:38:34 2008
@@ -19,6 +19,8 @@
 package org.apache.axis2.jaxws.samples.servlet;
 
 import org.apache.axis2.jaxws.samples.client.SampleClient;
+import org.apache.axis2.jaxws.ClientConfigurationFactory;
+import org.apache.axis2.metadata.registry.MetadataFactoryRegistry;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
@@ -48,6 +50,7 @@
     private String uriString = "";
     private String soapString = "";
     private int count = 1;
+    private ClientConfigurationFactory factory = null;
 
     public EchoPingSampleServlet() {
         super();
@@ -68,6 +71,12 @@
      */
     private void processRequest(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
+        
+        if(factory == null) {
+            String path = getServletConfig().getServletContext().getRealPath("/WEB-INF/axis2.xml");
+            factory = new ClientConfigurationFactory(null, path);
+            MetadataFactoryRegistry.setFactory(ClientConfigurationFactory.class, factory);
+        }
 
         ServletContext context = getServletContext();
         String msgString = req.getParameter("msgstring");

Modified: webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml?rev=639868&r1=639867&r2=639868&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml Fri Mar 21 14:38:34 2008
@@ -187,7 +187,7 @@
     <!-- ================================================= -->
     <transportReceiver name="http"
                        class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port">8080</parameter>
+        <parameter name="port">6060</parameter>
         <!-- Here is the complete list of supported parameters (see example settings further below):
             port: the port to listen on (default 6060)
             hostname:  if non-null, url prefix used in reply-to endpoint references                                 (default null)
@@ -365,7 +365,7 @@
     <!-- Global Modules  -->
     <!-- ================================================= -->
     <!-- Comment this to disable Addressing -->
-    <!--<module ref="addressing"/>-->
+    <module ref="addressing"/>
 
     <!--Configuring module , providing parameters for modules whether they refer or not-->
     <!--<moduleConfig name="addressing">-->



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org