You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/02/08 05:45:50 UTC

svn commit: r152364 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/deployment/DeploymentParser.java test-resources/deployment/BadServer.xml test-resources/deployment/BadService.xml

Author: deepal
Date: Mon Feb  7 20:45:49 2005
New Revision: 152364

URL: http://svn.apache.org/viewcvs?view=rev&rev=152364
Log:
modified to provide a way to catch un supported elements in server.cml , service.xml and modeule.xml

Modified:
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml
    webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadService.xml

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java?view=diff&r1=152363&r2=152364
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java Mon Feb  7 20:45:49 2005
@@ -132,7 +132,7 @@
                         for (int i = 0; i < trasports.size(); i++) {
                             dpengine.getEngineRegistry().addTransport((AxisTransport)trasports.get(i));
                         }
-                        
+
                     } else if (TYPEMAPPINGST.equals(ST)) {
                         throw new UnsupportedOperationException("Type Mappings are not allowed in server.xml");
                     } else if (MODULEST.equals(ST)) {
@@ -167,8 +167,8 @@
         boolean END_TRANSPORTS = false;
         ArrayList transportList = new ArrayList();
         AxisTransport transport = null;
-        
-        
+
+
         String text = ""; // to store the paramater elemnt
         try {
             while (!END_TRANSPORTS) {
@@ -228,12 +228,9 @@
                 String attname = pullparser.getAttributeLocalName(i);
                 String attvalue = pullparser.getAttributeValue(i);
                 if (PROVIDERNAME.equals(attname)) {
-                    //TODO load the java clss for this
-                    //TODO  somtimes Provider should be change
-                    dpengine.getCurrentFileItem().setProvideName(attvalue);
-                    //  Provider provider = new SimpleJavaProvider();
-                    // provider. .setName(new QName(getValue(attvalue)));
-                    // axisService.setProvider(provider);
+                    if(dpengine != null && dpengine.getCurrentFileItem() != null)  {
+                        dpengine.getCurrentFileItem().setProvideName(attvalue);
+                    }
                 } else if (STYLENAME.equals(attname)) {
                     // axisService.setStyle();
                     //TODO setStyle should be handle latter
@@ -313,6 +310,8 @@
                             }
                         }
 
+                    } else {
+                        throw new DeploymentException("parser Exception : un supported element" + ST);
                     }
                 }
             }
@@ -461,6 +460,8 @@
                     } else if (tagnae.equals(PARAMETERST)) {
                         Parameter parameter = processParameter();
                         handler.addParameter(parameter);
+                    } else {
+                        throw new DeploymentException("parser Exception : un supported element" + tagnae);
                     }
                 } else if (eventType == XMLStreamConstants.END_ELEMENT) {
                     String endtagname = pullparser.getLocalName();
@@ -709,6 +710,8 @@
                     if (HANDERST.equals(tagnae)) {
                         HandlerMetaData handler = processHandler();
                         inFlow.addHandler(handler);
+                    } else {
+                        throw new DeploymentException("parser Exception : un supported element" + tagnae);
                     }
                 } else if (eventType == XMLStreamConstants.END_ELEMENT) {
                     String endtagname = pullparser.getLocalName();
@@ -745,6 +748,8 @@
                     if (HANDERST.equals(tagnae)) {
                         HandlerMetaData handler = processHandler();
                         outFlow.addHandler(handler);
+                    } else {
+                        throw new DeploymentException("parser Exception : un supported element" + tagnae);
                     }
                 } else if (eventType == XMLStreamConstants.END_ELEMENT) {
                     String endtagname = pullparser.getLocalName();
@@ -782,6 +787,8 @@
                     if (HANDERST.equals(tagnae)) {
                         HandlerMetaData handler = processHandler();
                         faultFlow.addHandler(handler);
+                    }  else {
+                        throw new DeploymentException("parser Exception : un supported element" + tagnae);
                     }
                 } else if (eventType == XMLStreamConstants.END_ELEMENT) {
                     String endtagname = pullparser.getLocalName();
@@ -819,6 +826,8 @@
                         if (ATTNAME.equals(attname)) {
                             pahseList.add(attvalue);
                         }
+                    }   else {
+                        throw new DeploymentException("parser Exception : un supported element" + tagnae);
                     }
                 } else if (eventType == XMLStreamConstants.END_ELEMENT) {
                     String endtagname = pullparser.getLocalName();
@@ -890,6 +899,8 @@
                         processModule(module);
                         // module.setArchiveName(archiveName);
                         // module.setName(archiveName);
+                    } else {
+                        throw new DeploymentException("parser Exception : un supported element" + ST);
                     }
                     //processStartElement();
                     break;//todo this has to be chenfed only for testng

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml?view=diff&r1=152363&r2=152364
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadServer.xml Mon Feb  7 20:45:49 2005
@@ -24,4 +24,7 @@
         <phase name="anyhase"/>
         <phase name="service"/>
     </phaseOrder>
+    <gool>
+        not good
+    </gool>
 </server>

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadService.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadService.xml?view=diff&r1=152363&r2=152364
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadService.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/deployment/BadService.xml Mon Feb  7 20:45:49 2005
@@ -11,7 +11,9 @@
     Phases
     P1 p2 p3
     -->
-
+    <gool>
+        this not bad
+    </gool>
     <inflow>
         <handler name="h1" class="org.apache.axis.engine.registry.SpeakingHandler">
             <order phase="p1" phaseFirst="true"/>