axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r551228 [9/23] - in /webservices/axis2/branches/java/jaxws21: ./ etc/ modules/adb-codegen/src/org/apache/axis2/schema/ modules/adb-codegen/src/org/apache/axis2/schema/template/ modules/adb-codegen/src/org/apache/axis2/schema/writer/ modules...
Date Wed, 27 Jun 2007 16:46:04 GMT
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.proxy.doclitwrapped.DocLitWrappedProxyImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.proxy.doclitwrapped.DocLitWrappedProxyImpl</parameter>
   <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.proxy.gorilla_dlw.GorillaProxyImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.proxy.gorilla_dlw.GorillaProxyImpl</parameter>
   <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl Wed Jun 27 09:45:37 2007
@@ -251,7 +251,7 @@
 
    <wsdl:message name="testHeaderResponse">
 
-      <wsdl:part name="headerReturn" element="impl:headerReturn"/>
+      <wsdl:part name="headerReturn" type="impl:headerReturn" />
 
    </wsdl:message>
    

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -4,7 +4,7 @@
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/robust-in-only" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.proxy.rpclit.RPCLitImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.proxy.rpclit.RPCLitImpl</parameter>
   <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/server/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/server/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/server/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/server/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.proxy.soap12.server.SOAP12EchoImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.proxy.soap12.server.SOAP12EchoImpl</parameter>
   <operation name="echo" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.resourceinjection.ResourceInjectionPortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.resourceinjection.ResourceInjectionPortTypeImpl</parameter>
   <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,6 +3,6 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.rpclit.enumtype.PortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.rpclit.enumtype.PortTypeImpl</parameter>
  </service>
 </serviceGroup>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java Wed Jun 27 09:45:37 2007
@@ -20,16 +20,29 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Future;
 
+import javax.xml.namespace.QName;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Binding;
 import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
 import javax.xml.ws.Response;
+import javax.xml.ws.Service;
 import javax.xml.ws.handler.Handler;
 import javax.xml.ws.handler.HandlerResolver;
 import javax.xml.ws.handler.PortInfo;
 import javax.xml.ws.soap.SOAPFaultException;
 
+import java.io.StringReader;
+import java.io.StringWriter;
 import junit.framework.TestCase;
 
 import org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersClientLogicalHandler;
@@ -42,10 +55,30 @@
 import org.apache.axis2.jaxws.TestLogger;
 import org.test.addnumbershandler.AddNumbersHandlerResponse;
 
+/**
+ * @author rott
+ *
+ */
 public class AddNumbersHandlerTests extends TestCase {
 	
     String axisEndpoint = "http://localhost:8080/axis2/services/AddNumbersHandlerService";
-    
+
+
+    /**
+     * Client app sends 10, 10 as params to sum.  No client-side handlers are configured
+     * for this scenario.  The server-side AddNumbersLogicalHandler is instantiated with a
+     * variable "deduction" with value 1.  Upon class initialization using PostConstruct
+     * annotation, that internal variable is changed to value 2.  The inbound AddNumbersLogicalHandler
+     * subtracts 1 from the first param, then outbound it subtracts 2 from the result sum.
+     * 
+     * This test accomplishes three things (which also carry over to other tests since they all use
+     * the same endpoint and server-side handlers:
+     * 1)  PostConstruct annotation honored in the handler framework for handler instantiation
+     * 2)  AddNumbersLogicalHandler also sets two message context properties, one with APPLICATION
+     *     scope, which the endpoint checks.
+     * 3)  Handlers are sharing properties, both APPLICATION scoped and HANDLER scoped
+     * 3)  General handler framework functionality; make sure handlers are instantiated and called
+     */
     public void testAddNumbersHandler() {
 		try{
             TestLogger.logger.debug("----------------------------------");
@@ -64,9 +97,78 @@
             TestLogger.logger.debug("----------------------------------");
 		} catch(Exception e) {
 			e.printStackTrace();
-			fail();
+            fail(e.getMessage());
 		}
 	}
+    
+    public void testAddNumbersHandlerDispatch() {
+        try {
+            QName serviceName =
+                    new QName("http://org/test/addnumbershandler", "AddNumbersHandlerService");
+            QName portName =
+                    new QName("http://org/test/addnumbershandler", "AddNumbersHandlerPort");
+
+            Service myService = Service.create(serviceName);
+            myService.addPort(portName, null, axisEndpoint);
+            Dispatch<Source> myDispatch = myService.createDispatch(portName, Source.class, Service.Mode.PAYLOAD);
+
+            // set handler chain for binding provider
+            Binding binding = ((BindingProvider) myDispatch).getBinding();
+
+            // create a new list or use the existing one
+            List<Handler> handlers = binding.getHandlerChain();
+        
+            if (handlers == null)
+                handlers = new ArrayList<Handler>();
+            handlers.add(new AddNumbersClientLogicalHandler());
+            handlers.add(new AddNumbersClientProtocolHandler());
+            binding.setHandlerChain(handlers);
+            
+            //Invoke the Dispatch
+            TestLogger.logger.debug(">> Invoking Async Dispatch");
+            Source response = myDispatch.invoke(createRequestSource());
+            String resString = getString(response);
+            if (!resString.contains("<return>16</return>")) {
+                fail("Response string should contain <return>17</return>, but does not.  The resString was: \"" + resString + "\"");
+            }
+
+            TestLogger.logger.debug("----------------------------------");
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+    
+    /*
+     * JAXWS 9.2.1.1 conformance test
+     */
+    public void testAddNumbersHandlerResolver() {
+        try {
+            TestLogger.logger.debug("----------------------------------");
+            TestLogger.logger.debug("test: " + getName());
+
+            AddNumbersHandlerService service = new AddNumbersHandlerService();
+
+            AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
+            
+            service.setHandlerResolver(new MyHandlerResolver());
+
+            BindingProvider p = (BindingProvider) proxy;
+            
+            /*
+             * despite setting MyHandlerResolver on the service, we should get an empty
+             * list from the getBinding().getHandlerChain() call below.  JAXWS 9.2.1.1 conformance
+             */
+            List<Handler> list = p.getBinding().getHandlerChain();
+            
+            assertTrue("List should be empty.  We've not conformed to JAXWS 9.2.1.1.", list.isEmpty());
+
+            TestLogger.logger.debug("----------------------------------");
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+    }
 
     // TODO: disabled until handler support is more complete
     public void _testAddNumbersHandlerWithFault() {
@@ -94,7 +196,15 @@
         }
         TestLogger.logger.debug("----------------------------------");
     }
-    
+
+
+    /**
+     * testAddNumbersClientHandler performs the same tests as testAddNumbersHandler, except
+     * that two client-side handlers are also inserted into the flow.  The inbound AddNumbersClientLogicalHandler
+     * checks that the properties set here in this method (the client app) and the properties set in the
+     * outbound AddNumbersClientProtocolHandler are accessible.  These properties are also checked here in
+     * the client app.  AddNumbersClientLogicalHandler also subtracts 1 from the sum on the inbound flow.
+     */
     public void testAddNumbersClientHandler() {
         try{
             TestLogger.logger.debug("----------------------------------");
@@ -107,15 +217,32 @@
             
             p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, 
                     axisEndpoint);
+            p.getRequestContext().put("myClientKey", "myClientVal");
 
             List<Handler> handlers = p.getBinding().getHandlerChain();
             if (handlers == null)
                 handlers = new ArrayList<Handler>();
             handlers.add(new AddNumbersClientLogicalHandler());
+            handlers.add(new AddNumbersClientProtocolHandler());
             p.getBinding().setHandlerChain(handlers);
 
             int total = proxy.addNumbersHandler(10,10);
             
+            // see if I can get an APPLICATION scoped property set during outbound flow.  I should be able to do this according to 4.2.1
+            
+            // TODO:  assert is now commented out.  This property is set by a client outbound handler, and I don't think it
+            // should be available on the request or response contexts.
+            //assertNotNull("Should be able to retrieve APPLICATION scoped property, but could not.", ((String)p.getRequestContext().get("AddNumbersClientProtocolHandlerOutboundAppScopedProperty")));
+
+            // should NOT be able to get this HANDLER scoped property though
+            assertNull("Should not be able to retrieve HANDLER scoped property, but was able.", (String)p.getResponseContext().get("AddNumbersClientProtocolHandlerOutboundHandlerScopedProperty"));
+            // should be able to get this APPLICATION scoped property set during inbound flow
+            assertNotNull("Should be able to retrieve APPLICATION scoped property, but could not.", (String)p.getResponseContext().get("AddNumbersClientProtocolHandlerInboundAppScopedProperty"));
+            // should NOT be able to get this HANDLER scoped property though
+            assertNull("Should not be able to retrieve HANDLER scoped property, but was able.", (String)p.getResponseContext().get("AddNumbersClientProtocolHandlerInboundHandlerScopedProperty"));
+            // should be able to get this APPLICATION scoped property set by this client
+            assertNotNull("Should be able to retrieve APPLICATION scoped property, but could not.", (String)p.getRequestContext().get("myClientKey"));
+
             assertEquals("With handler manipulation, total should be 4 less than a proper sumation.", 16, total);
             TestLogger.logger.debug("Total (after handler manipulation) = " + total);
             TestLogger.logger.debug("----------------------------------");
@@ -126,7 +253,9 @@
     }
     
     /*
-     * uses a custom HandlerResolver instead of the default
+     * uses a custom HandlerResolver instead of the default.  MyHandlerResolver
+     * puts the AddNumbersClientLogicalHandler and AddNumbersClientProtocolHandler
+     * in the flow.  Results should be the same as testAddNumbersClientHandler.
      */
     public void testAddNumbersClientHandlerMyResolver() {
         try{
@@ -134,10 +263,6 @@
             TestLogger.logger.debug("test: " + getName());
             
             AddNumbersHandlerService service = new AddNumbersHandlerService();
-            
-            // There's a HandlerChain annotation on the SEI, but since
-            // we're using our own handlerresolver that returns an empty list
-            // no client-side handlers will be run
             service.setHandlerResolver(new MyHandlerResolver());
             
             AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
@@ -149,7 +274,9 @@
 
             int total = proxy.addNumbersHandler(10,10);
             
-            assertEquals("With server-side only handler manipulation, total should be a 17.", 17, total);
+            assertEquals("With handler manipulation, total should be 4 less than a proper sumation.",
+                         16,
+                         total);
             TestLogger.logger.debug("Total (after handler manipulation) = " + total);
             TestLogger.logger.debug("----------------------------------");
         } catch(Exception e) {
@@ -226,7 +353,12 @@
             assertEquals(((SOAPFaultException)e).getMessage(), "I don't like the value 99");
         }
     }
-    
+
+    /**
+     * test results should be the same as testAddNumbersClientHandler, except that
+     * AddNumbersClientLogicalHandler2 doubles the first param on outbound.  Async, of course.
+     *
+     */
     public void testAddNumbersClientHandlerAsync() {
         try{
             TestLogger.logger.debug("----------------------------------");
@@ -245,6 +377,7 @@
                 handlers = new ArrayList<Handler>();
             handlers.add(new AddNumbersClientLogicalHandler());
             handlers.add(new AddNumbersClientLogicalHandler2());
+            handlers.add(new AddNumbersClientProtocolHandler());
             p.getBinding().setHandlerChain(handlers);
 
             
@@ -319,9 +452,41 @@
     class MyHandlerResolver implements HandlerResolver {
 
         public List<Handler> getHandlerChain(PortInfo portinfo) {
-            return new ArrayList<Handler>();
+            ArrayList<Handler> handlers = new ArrayList<Handler>();
+            handlers.add(new AddNumbersClientLogicalHandler());
+            handlers.add(new AddNumbersClientProtocolHandler());
+            return handlers;
         }
-        
+
     }
     
+    private String getString(Source source) throws Exception {
+        if (source == null) {
+            return null;
+        }
+        StringWriter writer = new StringWriter();
+        Transformer t = TransformerFactory.newInstance().newTransformer();
+        Result result = new StreamResult(writer);
+        t.transform(source, result);
+        return writer.getBuffer().toString();
+
+    }
+    
+    /**
+     * Create a Source request to be used by Dispatch<Source>
+     */
+    private Source createRequestSource() {
+
+        String reqString = null;
+
+        String ns = "http://org/test/addnumbershandler";
+        String operation = "addNumbersHandler";
+
+        reqString = "<" + operation + 
+                    " xmlns=\"" + ns + "\">" +
+                    "<arg0>10</arg0><arg1>10</arg1>" +
+                    "</" + operation + ">";
+
+        return new StreamSource(new StringReader(reqString));
+    }
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.addnumbers.AddNumbersPortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.addnumbers.AddNumbersPortTypeImpl</parameter>
   <operation name="addNumbers" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientLogicalHandler.java Wed Jun 27 09:45:37 2007
@@ -34,6 +34,33 @@
     public boolean handleMessage(LogicalMessageContext messagecontext) {
         Boolean outbound = (Boolean)messagecontext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
         if (!outbound) {  // inbound response on the client
+
+            /*
+             * These props were set on the outbound flow.  Inbound flow handlers
+             * should have access to them.
+             */
+            String propKey = "AddNumbersClientProtocolHandlerOutboundAppScopedProperty";
+            String myClientVal = (String)messagecontext.get(propKey);
+            if (myClientVal == null)
+                throw new RuntimeException("Property " + propKey + " was null.  MEPContext is not searching hard enough for the property.");
+            propKey = "AddNumbersClientProtocolHandlerOutboundHandlerScopedProperty";
+            myClientVal = (String)messagecontext.get(propKey);
+            if (myClientVal == null)
+                throw new RuntimeException("Property " + propKey + " was null.  MEPContext is not searching hard enough for the property.");
+
+            /*
+             * These props were set on the inbound flow.  Inbound flow handlers
+             * should have access to them.
+             */
+            propKey = "AddNumbersClientProtocolHandlerInboundAppScopedProperty";
+            myClientVal = (String)messagecontext.get(propKey);
+            if (myClientVal == null)
+                throw new RuntimeException("Property " + propKey + " was null.  MEPContext is not searching hard enough for the property.");
+            propKey = "AddNumbersClientProtocolHandlerInboundHandlerScopedProperty";
+            myClientVal = (String)messagecontext.get(propKey);
+            if (myClientVal == null)
+                throw new RuntimeException("Property " + propKey + " was null.  MEPContext is not searching hard enough for the property.");
+            
             LogicalMessage msg = messagecontext.getMessage();
             String st = getStringFromSourcePayload(msg.getPayload());
             String txt = String.valueOf(Integer.valueOf(getFirstArg(st)) - 1);

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientProtocolHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientProtocolHandler.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientProtocolHandler.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersClientProtocolHandler.java Wed Jun 27 09:45:37 2007
@@ -3,6 +3,7 @@
 import java.util.Set;
 
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.MessageContext.Scope;
 import javax.xml.ws.handler.soap.SOAPMessageContext;
 
 /*
@@ -25,6 +26,24 @@
     }
 
     public boolean handleMessage(SOAPMessageContext messagecontext) {
+        Boolean outbound = (Boolean) messagecontext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
+        if (outbound) {
+
+            String appProp1 = "AddNumbersClientProtocolHandlerOutboundAppScopedProperty";
+            messagecontext.put(appProp1, "myVal");
+            messagecontext.setScope(appProp1, Scope.APPLICATION);
+            
+            String appProp2 = "AddNumbersClientProtocolHandlerOutboundHandlerScopedProperty";
+            messagecontext.put(appProp2, "client apps can't see this");
+        }
+        else {  // client inbound response
+            String appProp1 = "AddNumbersClientProtocolHandlerInboundAppScopedProperty";
+            messagecontext.put(appProp1, "myVal");
+            messagecontext.setScope(appProp1, Scope.APPLICATION);
+            
+            String appProp2 = "AddNumbersClientProtocolHandlerInboundHandlerScopedProperty";
+            messagecontext.put(appProp2, "client apps can't see this");
+        }
         return true;
     }
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerPortTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerPortTypeImpl.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerPortTypeImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerPortTypeImpl.java Wed Jun 27 09:45:37 2007
@@ -20,24 +20,39 @@
 
 import java.util.concurrent.Future;
 import javax.jws.WebService;
+import javax.annotation.Resource;
 import javax.jws.HandlerChain;
 import javax.xml.ws.AsyncHandler;
 import org.test.addnumbershandler.AddNumbersHandlerResponse;
 import org.apache.axis2.jaxws.TestLogger;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
 
 
 @WebService(endpointInterface="org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersHandlerPortType")
-@HandlerChain(file="META-INF/AddNumbersHandlers.xml", name="")
+@HandlerChain(file = "AddNumbersHandlers.xml", name = "")
 public class AddNumbersHandlerPortTypeImpl implements AddNumbersHandlerPortType {
 
+    private WebServiceContext ctx;
+    
 	/* (non-Javadoc)
 	 * @see org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersHandlerPortType#addNumbersHandler(int, int)
 	 */
 	public int addNumbersHandler(int arg0, int arg1) throws AddNumbersHandlerFault_Exception {
+        
+        // for these properties tests to always pass, an inbound server-side handler must "put" them
+        MessageContext mc = ctx.getMessageContext();
+        String propKey1 = "AddNumbersLogicalHandlerInboundAppScopedProperty";
+        String propKey2 = "AddNumbersLogicalHandlerInboundHandlerScopedProperty";
+        String value = (String)mc.get(propKey1);
+        if (value == null)
+            throw new RuntimeException("Property value for key \"" + propKey1 + "\" was null, but is APPLICATION scoped and should be accessible by the endpoint");
+        if (mc.containsKey(propKey2))  // instead of "get", use "containsKey" to be a little more robust in testing
+            throw new RuntimeException("MessageContext.containsKey reported true for key \"" + propKey2 + "\" was not null.  This property is HANDLER scoped and should not be accessible by the endpoint");
         TestLogger.logger
                 .debug(">> Received addNumbersHandler request for " + arg0 + " and " + arg1);
         if (arg0 == 101)
-            throw new RuntimeException("blarg");
+            throw new RuntimeException("Got value 101.  AddNumbersHandlerPortTypeImpl.addNumbersHandler method is correctly throwing this exception as part of testing");
         return arg0+arg1;
 	}
 
@@ -54,5 +69,10 @@
         TestLogger.logger.debug(">> Received one-way request.");
         return;
 	}
+    
+    @Resource
+    public void setCtx(WebServiceContext ctx) {
+        this.ctx = ctx;
+    }
 
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersLogicalHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersLogicalHandler.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersLogicalHandler.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersLogicalHandler.java Wed Jun 27 09:45:37 2007
@@ -3,7 +3,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.StringBufferInputStream;
 import java.util.StringTokenizer;
-import java.util.regex.Pattern;
 
 import javax.annotation.PostConstruct;
 import javax.xml.transform.OutputKeys;
@@ -15,6 +14,7 @@
 import javax.xml.ws.LogicalMessage;
 import javax.xml.ws.ProtocolException;
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.MessageContext.Scope;
 
 import org.apache.axis2.jaxws.handler.LogicalMessageContext;
 
@@ -39,8 +39,8 @@
      * this test handleMessage method is obviously not what a customer might write, but it does
      * the trick for kicking the tires in the handler framework.  The AddNumbers service takes two
      * ints as incoming params, adds them, and returns the sum.  This method subtracts 1 from the 
-     * first int on the inbound request, and subtracts 1 from the int on the outbound response.
-     * So the client app should expect a sum 2 less than a sum without this handler manipulating
+     * first int on the inbound request, and subtracts "deduction" from the int on the outbound
+     * response.  So the client app should expect a sum 3 less than a sum with this handler manipulating
      * the SOAP message.
      */
     public boolean handleMessage(LogicalMessageContext messagecontext) {
@@ -54,6 +54,10 @@
             st = replaceFirstArg(st, txt);
             msg.setPayload(new StreamSource(new StringBufferInputStream(st)));
             
+            messagecontext.put("AddNumbersLogicalHandlerInboundAppScopedProperty", "blargval");
+            messagecontext.setScope("AddNumbersLogicalHandlerInboundAppScopedProperty", Scope.APPLICATION);
+            messagecontext.put("AddNumbersLogicalHandlerInboundHandlerScopedProperty", "blargval");
+
         } else { // outbound response if we're on the server
             LogicalMessage msg = messagecontext.getMessage();
             String st = getStringFromSourcePayload(msg.getPayload());

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbershandler/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersHandlerPortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersHandlerPortTypeImpl</parameter>
   <operation name="addNumbers" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addressbook/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addressbook/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addressbook/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/addressbook/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.addressbook.AddressBookImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.addressbook.AddressBookImpl</parameter>
   <operation name="addEntry" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/dlwmin/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/dlwmin/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/dlwmin/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/dlwmin/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.dlwmin.GreeterImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.dlwmin.GreeterImpl</parameter>
   <operation name="greetMe" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbare/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbare/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbare/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbare/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -4,7 +4,7 @@
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.doclitbare.DocLitBarePortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.doclitbare.DocLitBarePortTypeImpl</parameter>
  </service>
 </serviceGroup>
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbaremin/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbaremin/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbaremin/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbaremin/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.doclitbaremin.DocLitBareMinPortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.doclitbaremin.DocLitBareMinPortTypeImpl</parameter>
  </service>
 </serviceGroup>
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/faults/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/faults/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/faults/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/faults/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.faults.FaultyWebServicePortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.faults.FaultyWebServicePortTypeImpl</parameter>
   <operation name="faultyWebService" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/faultsservice/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/faultsservice/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/faultsservice/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/faultsservice/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.faultsservice.FaultsServiceSoapBindingImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.faultsservice.FaultsServiceSoapBindingImpl</parameter>
   <operation name="throwFault" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/mtom/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/mtom/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/mtom/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/mtom/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.mtom.MtomSampleService</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.mtom.MtomSampleService</parameter>
   <operation name="sendImage" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/mtom1/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/mtom1/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/mtom1/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/mtom1/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.mtom1.SendImageService</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.mtom1.SendImageService</parameter>
   <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/nonwrap/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/nonwrap/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/nonwrap/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/nonwrap/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.nonwrap.DocLitNonWrapPortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.nonwrap.DocLitNonWrapPortTypeImpl</parameter>
  </service>
 </serviceGroup>
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/parallelasync/server/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/parallelasync/server/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/parallelasync/server/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/parallelasync/server/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.parallelasync.server.DocLitWrappedPortImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.parallelasync.server.DocLitWrappedPortImpl</parameter>
   <operation name="ping" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/wrap/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/wrap/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/wrap/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/wrap/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.wrap.DocLitWrapImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.wrap.DocLitWrapImpl</parameter>
   <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/wsgen/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/wsgen/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/wsgen/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/sample/wsgen/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.sample.wsgen.WSGenImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.sample.wsgen.WSGenImpl</parameter>
   <operation name="invoke" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/security/server/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.security.server.SecurityProvider</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.security.server.SecurityProvider</parameter>
   <excludeOperations>
      <operation>invoke</operation>
   </excludeOperations>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/stringlist/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/stringlist/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/stringlist/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/stringlist/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,6 +3,6 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.stringlist.StringListPortTypeImpl</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.stringlist.StringListPortTypeImpl</parameter>
  </service>
 </serviceGroup>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.message.datasource.XMessageDataSourceProvider</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.message.datasource.XMessageDataSourceProvider</parameter>
   <excludeOperations>
      <operation>invoke</operation>
   </excludeOperations>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/source/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/source/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/source/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/source/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.message.source.XMessageSourceProvider</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.message.source.XMessageSourceProvider</parameter>
   <excludeOperations>
      <operation>invoke</operation>
   </excludeOperations>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/string/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/string/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/string/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/message/string/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.message.string.XMessageStringProvider</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.message.string.XMessageStringProvider</parameter>
   <excludeOperations>
      <operation>invoke</operation>
   </excludeOperations>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/payload/source/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/payload/source/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/payload/source/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/payload/source/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.payload.source.XPayloadSourceProvider</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.payload.source.XPayloadSourceProvider</parameter>
   <excludeOperations>
      <operation>invoke</operation>
   </excludeOperations>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/payload/string/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/payload/string/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/payload/string/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/xmlhttp/provider/payload/string/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="org.apache.axis2.jaxws.server.JAXWSMessageReceiver"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.payload.string.XPayloadStringProvider</parameter>
+  <parameter name="ServiceClass">org.apache.axis2.jaxws.xmlhttp.provider.payload.string.XPayloadStringProvider</parameter>
   <excludeOperations>
      <operation>invoke</operation>
   </excludeOperations>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/server/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/server/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/server/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/server/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,7 +3,7 @@
   <messageReceivers>
    <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="server.EchoServiceMessageReceiverInOut"/>
   </messageReceivers>
-  <parameter locked="false" name="ServiceClass">server.EchoServiceSkeleton</parameter>
+  <parameter name="ServiceClass">server.EchoServiceSkeleton</parameter>
   <operation name="echoString" mep="http://www.w3.org/2004/08/wsdl/in-out">
     <actionMapping/>
   </operation>

Modified: webservices/axis2/branches/java/jaxws21/modules/jibx/test-resources/repo/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jibx/test-resources/repo/conf/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jibx/test-resources/repo/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jibx/test-resources/repo/conf/axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,22 +2,22 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">false</parameter>
-    <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
     <!-- If you have a frontend host which exposes this webservice using a different public URL  -->
     <!-- use this parameter to override autodetected url -->
-    <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
+    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
 
 
     <!--    The way of adding listener to the system-->
     <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
     <!-- ================================================= -->
@@ -38,27 +38,27 @@
     <!-- ================================================= -->
     <transportReceiver name="http"
                        class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <!--Uncomment if you want to have SMTP transport support-->
     <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
+    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
+    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
+    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
+    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
+    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
     <!--</transportReceiver>-->
 
     <transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -71,21 +71,21 @@
                      class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
     <transportSender name="https"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
    <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
+       <parameter name="transport.mail.smtp.user">axis2</parameter>
+       <parameter name="transport.mail.smtp.password">axis2</parameter>
+       <parameter name="transport.mail.smtp.port">25</parameter>
    </transportSender>
    -->
 
@@ -97,7 +97,7 @@
 
     <!--Configuring module , providing parameters for modules whether they refer or not-->
     <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+    <!--<parameter name="addressingPara">N/A</parameter>-->
     <!--</moduleConfig>-->
 
     <!-- ================================================= -->
@@ -107,20 +107,20 @@
         <!--  System pre defined phases       -->
          <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
 	    <handler name="RequestURIBasedOperationDispatcher"
                      class="org.apache.axis2.dispatchers.RequestURIBasedOperationDispatcher"/>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
         </phase>
         <phase name="Security"/>
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
         </phase>
         <!--  System pre defined phases       -->
         <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
@@ -138,16 +138,16 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
 
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
         </phase>
         <!--      user can add his own phases to this area  -->
         <phase name="OperationInFaultPhase"/>

Modified: webservices/axis2/branches/java/jaxws21/modules/json/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/json/test-resources/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/json/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/json/test-resources/axis2.xml Wed Jun 27 09:45:37 2007
@@ -20,52 +20,52 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">false</parameter>
-    <parameter name="enableSwA" locked="false">false</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="enableSwA">false</parameter>
 
     <!--Uncomment if you want to enable file caching for attachments -->
-    <!--parameter name="cacheAttachments" locked="false">true</parameter>
-    <parameter name="attachmentDIR" locked="false"></parameter>
-    <parameter name="sizeThreshold" locked="false">4000</parameter-->
+    <!--parameter name="cacheAttachments">true</parameter>
+    <parameter name="attachmentDIR"></parameter>
+    <parameter name="sizeThreshold">4000</parameter-->
 
     <!--This will give out the timout of the configuration contexts, in seconds-->
-    <parameter name="ConfigContextTimeoutInterval" locked="false">30</parameter>
+    <parameter name="ConfigContextTimeoutInterval">30</parameter>
 
     <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
     <!--that behaviour.-->
-    <parameter name="sendStacktraceDetailsWithFaults" locked="false">false</parameter>
+    <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
 
     <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
     <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
     <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
     <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
-    <parameter name="DrillDownToRootCauseForFaultReason" locked="false">false</parameter>
+    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
     <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
-    <!--<parameter name="ServicesDirectory" locked="false">service</parameter>-->
+    <!--<parameter name="ServicesDirectory">service</parameter>-->
     <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
-    <!--<parameter name="ModulesDirectory" locked="false">modules</parameter>-->
+    <!--<parameter name="ModulesDirectory">modules</parameter>-->
 
 
 
     <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
     <!--root which can configured using the following contextRoot parameter-->
-    <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->
+    <!--<parameter name="contextRoot">axis2</parameter>-->
 
     <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distingiush those endpoints-->
     <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
     <!--context path to proper Axis2 servlets-->
-    <!--<parameter name="servicePath" locked="false">services</parameter>-->
-    <!--<parameter name="restPath" locked="false">rest</parameter>-->
+    <!--<parameter name="servicePath">services</parameter>-->
+    <!--<parameter name="restPath">rest</parameter>-->
 
 
     <!--Set the flag to true if you want to enable transport level session mangment-->
-    <parameter name="manageTransportSession" locked="false">false</parameter>
+    <parameter name="manageTransportSession">false</parameter>
 
     <!--Following two parameters will be used to handle REST in Axis2. The default settings will make Axis2 to have two-->
     <!--different endpoints, one for REST (AxisRESTServlet) one for SOAP message handling (AxisServlet). But following-->
@@ -82,12 +82,12 @@
 
     <!-- If you have a frontend host which exposes this webservice using a different public URL  -->
     <!-- use this parameter to override autodetected url -->
-    <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
+    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
 
 
     <!--    The way of adding listener to the system-->
     <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
     <!-- ================================================= -->
@@ -139,7 +139,7 @@
     <!-- ================================================= -->
     <transportReceiver name="http"
                        class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">8080</parameter>
+        <parameter name="port">8080</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)
@@ -154,53 +154,53 @@
                                   note that no such threads can exist with default unbounded request queue
             threadKeepAliveTimeUnit:  TimeUnit of value in threadKeepAliveTime (default SECONDS)                    (default SECONDS)
         -->
-        <!-- <parameter name="hostname"                  locked="false">http://www.myApp.com/ws</parameter> -->
-        <!-- <parameter name="originServer"              locked="false">My-Server/1.1</parameter>           -->
-        <!-- <parameter name="requestTimeout"            locked="false">10000</parameter>                   -->
-        <!-- <parameter name="requestTcpNoDelay"         locked="false">false</parameter>                   -->
-        <!-- <parameter name="requestCoreThreadPoolSize" locked="false">50</parameter>                      -->
-        <!-- <parameter name="RequestMaxThreadPoolSize"  locked="false">100</parameter>                     -->
-        <!-- <parameter name="threadKeepAliveTime"       locked="false">240000</parameter>                  -->
-        <!-- <parameter name="threadKeepAliveTimeUnit"   locked="false">MILLISECONDS</parameter>            -->
+        <!-- <parameter name="hostname"                 >http://www.myApp.com/ws</parameter> -->
+        <!-- <parameter name="originServer"             >My-Server/1.1</parameter>           -->
+        <!-- <parameter name="requestTimeout"           >10000</parameter>                   -->
+        <!-- <parameter name="requestTcpNoDelay"        >false</parameter>                   -->
+        <!-- <parameter name="requestCoreThreadPoolSize">50</parameter>                      -->
+        <!-- <parameter name="RequestMaxThreadPoolSize" >100</parameter>                     -->
+        <!-- <parameter name="threadKeepAliveTime"      >240000</parameter>                  -->
+        <!-- <parameter name="threadKeepAliveTimeUnit"  >MILLISECONDS</parameter>            -->
     </transportReceiver>
     
     <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
     <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory" locked="false">        	        	
-        	<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>        	
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+        <parameter name="myTopicConnectionFactory">
+        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
         </parameter>
 
-        <parameter name="myQueueConnectionFactory" locked="false">        	        	
-        	<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>        	
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+        <parameter name="myQueueConnectionFactory">
+        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
         </parameter>
 
-        <parameter name="default" locked="false">        	        	
-        	<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>        	
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+        <parameter name="default">
+        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
         </parameter>
     </transportReceiver>-->
 
     <!--Uncomment if you want to have SMTP transport support-->
     <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
+    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
+    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
+    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
+    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
+    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
     <!--</transportReceiver>-->
 
 	<!--Uncomment if you want to have TCP transport support-->
     <!--transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter-->>
+        <parameter name="port">6060</parameter-->>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
     <!-- /transportReceiver -->
 
     <!-- ================================================= -->
@@ -213,13 +213,13 @@
                      class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
     <transportSender name="https"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
     <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
     <transportSender name="jms"
@@ -228,10 +228,10 @@
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
    <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
+       <parameter name="transport.mail.smtp.user">axis2</parameter>
+       <parameter name="transport.mail.smtp.password">axis2</parameter>
+       <parameter name="transport.mail.smtp.port">25</parameter>
    </transportSender>
    -->
 
@@ -243,7 +243,7 @@
 
     <!--Configuring module , providing parameters for modules whether they refer or not-->
     <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+    <!--<parameter name="addressingPara">N/A</parameter>-->
     <!--</moduleConfig>-->
 
     <!-- ================================================= -->
@@ -253,11 +253,11 @@
         <!--  System pre defined phases       -->
         <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
         </phase>
@@ -265,12 +265,12 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
         </phase>
         <!--  System pre defined phases       -->
         <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
@@ -291,18 +291,18 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
 
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
         </phase>
         <!--      user can add his own phases to this area  -->
         <phase name="OperationInFaultPhase"/>



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


Mime
View raw message