axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r168080 - in /webservices/axis/trunk/java/modules: core/samples/deployment/ core/samples/deployment/OutService/META-INF/ core/samples/deployment/service1/META-INF/ core/samples/deployment/service2/META-INF/ core/src/org/apache/axis/deployment/ core/test-resources/deployment/ core/test/org/apache/axis/deployment/ samples/src/encoding/sample1/ samples/src/encoding/sample2/benchMark/ samples/src/interop/doclit/
Date Wed, 04 May 2005 05:51:21 GMT
Author: deepal
Date: Tue May  3 22:51:20 2005
New Revision: 168080

URL: http://svn.apache.org/viewcvs?rev=168080&view=rev
Log:
refactoring , introducing messageReceivers for the operation

Modified:
    webservices/axis/trunk/java/modules/core/samples/deployment/OutService/META-INF/service.xml
    webservices/axis/trunk/java/modules/core/samples/deployment/server.xml
    webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml
    webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
    webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
    webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml
    webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/service.xml
    webservices/axis/trunk/java/modules/samples/src/interop/doclit/service.xml

Modified: webservices/axis/trunk/java/modules/core/samples/deployment/OutService/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/OutService/META-INF/service.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/OutService/META-INF/service.xml
(original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/OutService/META-INF/service.xml
Tue May  3 22:51:20 2005
@@ -1,5 +1,5 @@
-<service provider="org.apache.axis.providers.RawXMLProvider" style="rpc" contextPath="services">
-    <java:implementation class="org.apache.axis.services.OutService" xmlns:java="http://ws.apache.org/axis2/deployment/java"/>
+<service name="">
+    <parameter name="ServiceClass" locked="xsd:false">org.apache.axis.services.OutService</parameter>
     <parameter name="OUTSERVICE" locked="xsd:true">true</parameter>
     <operation name="outService"/>
 </service>

Modified: webservices/axis/trunk/java/modules/core/samples/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/server.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/server.xml Tue May  3 22:51:20
2005
@@ -1,7 +1,6 @@
 <server name ="AxisJava2.0" >
-    <messageReciver map="name"  impl="abcs"/>
-
-    <phaseOrder type="inflow">
+    <messageReceiver mep="INOUT"  class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
+      <phaseOrder type="inflow">
         <phase name="global"/>
         <phase name="transport"/>
         <phase name="Logging"/>

Modified: webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml
(original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/service1/META-INF/service.xml
Tue May  3 22:51:20 2005
@@ -1,5 +1,4 @@
 <service name="">
-
     <parameter name="ServiceClass" locked="xsd:false">org.apache.axis.sample.echo.EchoImpl</parameter>
 
     <inflow>

Modified: webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml
(original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/service2/META-INF/service.xml
Tue May  3 22:51:20 2005
@@ -1,5 +1,4 @@
-<service messageReceiver="org.apache.axis.receivers.RawXMLINOutMessageRecevier" style="rpc"
contextPath="services">
-
+<service name="">
     <!-- these are Service Parameters -->
     <parameter name="para1" locked="xsd:true">10</parameter>
     <parameter name="para2" locked="xsd:false">Colombo</parameter>

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
Tue May  3 22:51:20 2005
@@ -290,7 +290,7 @@
         currentFileItem.setClassLoader();
         loadServiceProperties(serviceMetaData);
         engineconfig.addService(serviceMetaData);
-        System.out.println("adding new service" + serviceMetaData.getName().getLocalPart());
+        System.out.println("adding new service : " + serviceMetaData.getName().getLocalPart());
     }
 
     /**

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
Tue May  3 22:51:20 2005
@@ -125,15 +125,15 @@
                         dpengine.getEngineconfig().addTransportIn(transportin);
                     } else if (TYPEMAPPINGST.equals(ST)) {
                         throw new UnsupportedOperationException("Type Mappings are not allowed
in server.xml");
-                    } else if (MEP.equals(ST)){
+                    } else if (MESSAGERECEIVER.equals(ST)){
                         int attribCount = pullparser.getAttributeCount();
                         if (attribCount == 2) {
-                            String attname = pullparser.getAttributeLocalName(1);
-                            String attvalue = pullparser.getAttributeValue(1);
+                            String attname = pullparser.getAttributeLocalName(0);
+                            String attvalue = pullparser.getAttributeValue(0);
                             if(MEP.equals(attname)){
                                 String name = attvalue;
-                                attname = pullparser.getAttributeLocalName(2);
-                                attvalue = pullparser.getAttributeValue(2);
+                                attname = pullparser.getAttributeLocalName(1);
+                                attvalue = pullparser.getAttributeValue(1);
                                 if(CLASSNAME.equals(attname)){
                                     try {
                                         Class messageReceiver = null;
@@ -345,12 +345,13 @@
                 String attname = pullparser.getAttributeLocalName(i);
                 String attvalue = pullparser.getAttributeValue(i);
                 if (ATQNAME.equals(attname)) {
-                    if(attname == null || attname.trim() =="") {
+                    if(attvalue == null || attvalue.trim().equals("")) {
                         axisService.setName(new QName(getAxisServiceName(dpengine.getCurrentFileItem().getServiceName())));
-                    }  else
+                    }  else{
                         axisService.setName(new QName(attvalue));
+                    }
                 } else {
-                    throw new DeploymentException("Bad arguments for the service" + axisService.getName());
+                    throw new DeploymentException(attname + " Bad arguments for the service"
+ getAxisServiceName(dpengine.getCurrentFileItem().getServiceName()));
                 }
             }
         } else {
@@ -655,8 +656,8 @@
                     }else if (MESSAGERECEIVER.equals(ST)){
                         attribCount = pullparser.getAttributeCount();
                         if(attribCount > 0){
-                            String attname = pullparser.getAttributeLocalName(1);
-                            String attvalue = pullparser.getAttributeValue(1);
+                            String attname = pullparser.getAttributeLocalName(0);
+                            String attvalue = pullparser.getAttributeValue(0);
                             if(CLASSNAME.equals(attname)){
                                 operation.setMessageReciever(attvalue);
                             } else {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml Tue
May  3 22:51:20 2005
@@ -2,7 +2,7 @@
     <parameter name="hotdeployment" locked="xsd:false">true</parameter>
     <parameter name="hotupdate" locked="xsd:false">true</parameter>
 
-    <messageReceiver mep="" class=""/>
+    <messageReceiver mep="INOUT"  class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
 
     <transportReceiver name="http">
     </transportReceiver>

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/server.xml Tue May
 3 22:51:20 2005
@@ -1,4 +1,5 @@
 <server name ="AxisJava2.0" >
+     <messageReceiver mep="INOUT"  class="org.apache.axis.receivers.RawXMLINOutMessageRecevier"/>
     <parameter name="para1" locked="xsd:true">10</parameter>
     <parameter name="para2" locked="xsd:false">Colombo</parameter>
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
Tue May  3 22:51:20 2005
@@ -42,17 +42,18 @@
 
         assertNotNull(er);
         assertNotNull(er.getGlobal());
-
         AxisService service = er.getService(new QName("service2"));
         assertNotNull(service);
-        MessageReceiver provider = service.getMessageReceiver();
+        //commentd since there is no service based messgeRecivers
+        /*MessageReceiver provider = service.getMessageReceiver();
         assertNotNull(provider);
-        assertTrue(provider instanceof RawXMLINOutMessageRecevier);
+        assertTrue(provider instanceof RawXMLINOutMessageRecevier);*/
         ClassLoader cl = service.getClassLoader();
         assertNotNull(cl);
         Class.forName("Echo2", true, cl);
         assertNotNull(service.getName());
-        assertEquals(service.getStyle(),"rpc");
+       //no style for the service 
+     //   assertEquals(service.getStyle(),"rpc");
 
         Flow flow = service.getFaultInFlow();
         assertTrue(flow.getHandlerCount() > 0);

Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/service.xml Tue May 
3 22:51:20 2005
@@ -1,4 +1,4 @@
-<service messageReceiver="encoding.sample1.EchoProvider" style="rpc" contextPath="services">
+<service name="sample1">
 
     <parameter name="ServiceClass" locked="xsd:false">encoding.sample1.EchoImpl</parameter>
 

Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/service.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/service.xml
(original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/service.xml
Tue May  3 22:51:20 2005
@@ -1,4 +1,4 @@
-<service messageReceiver="org.apache.axis.receivers.RawXMLINOutMessageRecevier" style="rpc"
contextPath="services">
+<service name="sample2">
 
     <parameter name="ServiceClass" locked="xsd:false">encoding.sample2.benchMark.Benchmark1Impl</parameter>
 

Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/service.xml?rev=168080&r1=168079&r2=168080&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/service.xml (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/service.xml Tue May  3
22:51:20 2005
@@ -1,4 +1,4 @@
-<service messageReceiver="org.apache.axis.receivers.RawXMLINOutMessageRecevier" style="rpc"
contextPath="services">
+<service name="doclit">
 
     <parameter name="ServiceClass" locked="xsd:false">interop.doclit.WSDLInteropTestDocLitPortType</parameter>
 



Mime
View raw message