axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r111492 - in webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment: . metadata
Date Fri, 10 Dec 2004 10:20:23 GMT
Author: deepal
Date: Fri Dec 10 02:20:23 2004
New Revision: 111492

URL: http://svn.apache.org/viewcvs?view=rev&rev=111492
Log:
Deleted metadats
Removed:
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/BeanMappingMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/FaultFlowMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/FlowMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/InFlowMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ModuleMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/OperationMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/OutFlowMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ParameterMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/TypeMappingMetaData.java
Modified:
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServerMetaData.java

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&rev=111492&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r1=111491&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r2=111492
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Fri Dec 10 02:20:23 2004
@@ -1,19 +1,6 @@
 package org.apache.axis.deployment;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
 import org.apache.axis.context.MessageContext;
-import org.apache.axis.deployment.metadata.ModuleMetaData;
 import org.apache.axis.deployment.metadata.ServerMetaData;
 import org.apache.axis.deployment.metadata.phaserule.PhaseException;
 import org.apache.axis.deployment.repository.utill.HDFileItem;
@@ -31,6 +18,16 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import javax.xml.stream.XMLStreamException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Vector;
+
 
 /**
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -143,9 +140,9 @@
         addNewModule(module);
     }
 
-    public ModuleMetaData getModule(String moduleName) {
+    public AxisModule getModule(String moduleName) {
         for (int i = 0; i < modulelist.size(); i++) {
-            ModuleMetaData metaData = (ModuleMetaData) modulelist.elementAt(i);
+            AxisModule metaData = (AxisModule) modulelist.elementAt(i);
             if (metaData.getName().equals(moduleName)) {
                 return metaData;
             }
@@ -299,15 +296,13 @@
                                 if (service != null) {
                                     addService(service);
                                     log.info("Deployement WS Name  " + currentFileItem.getName());
-
+                                    currentFileItem = null;
+                                    break;
                                 }
                             } catch (PhaseException e) {
                                 e.printStackTrace();  //To change body of catch statement
use Options | File Templates.
                             } catch (AxisFault axisFault) {
                                 axisFault.printStackTrace();  //To change body of catch statement
use Options | File Templates.
-                            } finally {
-                                currentFileItem = null;
-                                break;
                             }
                         }
                     case MODULE:
@@ -318,15 +313,12 @@
                                 if (metaData != null) {
                                     addModule(metaData);
                                     log.info("Moduel WS Name  " + currentFileItem.getName()
+ " modulename :" + metaData.getName());
+                                    currentFileItem = null;
                                     break;
                                 }
                             } catch (AxisFault axisFault) {
                                 axisFault.printStackTrace();  //To change body of catch statement
use Options | File Templates.
-                            }finally {
-                                currentFileItem = null;
-                                break;
                             }
-
                         }
                 }
             }

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&rev=111492&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java&r1=111491&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java&r2=111492
==============================================================================
--- 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
Fri Dec 10 02:20:23 2004
@@ -1,28 +1,21 @@
 package org.apache.axis.deployment;
 
-import java.io.InputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axis.deployment.metadata.ModuleMetaData;
 import org.apache.axis.deployment.metadata.ServerMetaData;
 import org.apache.axis.deployment.metadata.phaserule.PhaseException;
 import org.apache.axis.deployment.metadata.phaserule.PhaseMetaData;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.Flow;
-import org.apache.axis.description.HandlerMetaData;
-import org.apache.axis.description.Parameter;
+import org.apache.axis.description.*;
 import org.apache.axis.impl.description.FlowImpl;
 import org.apache.axis.impl.description.ParameterImpl;
 import org.apache.axis.impl.description.SimpleAxisOperationImpl;
 import org.apache.axis.impl.providers.SimpleJavaProvider;
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.InputStream;
+
 
 /**
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -260,7 +253,7 @@
                                 String attname = pullparser.getAttributeLocalName(i);
                                 String attvalue = pullparser.getAttributeValue(i);
 
-                                if (attname.equals(ModuleMetaData.REF)) {
+                                if (attname.equals(REF)) {
                                     axisService.addModule(new QName(attvalue));
                                 }
                             }
@@ -569,51 +562,6 @@
         }
     }
 
-    private ModuleMetaData getModule() throws DeploymentException {
-        String moduleref = "";
-        int attribCount = pullparser.getAttributeCount();
-        //   boolean ref_name = false;
-
-        if (attribCount > 0) {
-            for (int i = 0; i < attribCount; i++) {
-                String attname = pullparser.getAttributeLocalName(i);
-                String attvalue = pullparser.getAttributeValue(i);
-
-                if (attname.equals(ModuleMetaData.REF)) {
-                    moduleref = attvalue;
-                }
-            }
-        }
-        boolean END_MODULE = false;
-        String text = ""; // to store the paramater elemnt
-        try {
-            while (!END_MODULE) {
-                int eventType = pullparser.next();
-                if (eventType == XMLStreamConstants.END_DOCUMENT) {
-                    // document end tag met , break the loop
-                    // but the doc end tag wont meet here :)
-                    END_MODULE = true;
-                } else if (eventType == XMLStreamConstants.END_ELEMENT) {
-                    String endtagname = pullparser.getLocalName();
-                    if (endtagname.equals(moduleXMLST)) {
-                        END_MODULE = true;
-                        break;
-                    }
-                } else if (eventType == XMLStreamConstants.CHARACTERS) {
-                    text = text + pullparser.getText();
-                }
-            }
-        } catch (XMLStreamException e) {
-            throw new DeploymentException("parser Exception", e);
-        } catch (Exception e) {
-            throw new DeploymentException("Unknown process Exception", e);
-        }
-        ModuleMetaData module = dpengine.getModule(moduleref);
-        if (module == null) {
-            throw new DeploymentException(moduleref + " is not a valid module ");
-        } else
-            return module;
-    }
 
     public void processModule(AxisModule module) throws DeploymentException {
         int attribCount = pullparser.getAttributeCount();
@@ -624,14 +572,14 @@
                 String attname = pullparser.getAttributeLocalName(i);
                 String attvalue = pullparser.getAttributeValue(i);
 
-               if (attname.equals(ModuleMetaData.NAME)) {
+               if (attname.equals(ATTNAME)) {
                     if (ref_name) {
                         throw new DeploymentException("Module canot have both name and ref
 " + attvalue);
                     } else {
                         module.setName(new QName(attvalue));
                         ref_name = true;
                     }
-                } else if (attname.equals(ModuleMetaData.REF)) {
+                } else if (attname.equals(REF)) {
                     if (ref_name) {
                         throw new DeploymentException("Module canot have both name and ref
 " + attvalue);
                     } else {

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/BeanMappingMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/BeanMappingMetaData.java?view=auto&rev=111491
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/FaultFlowMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/FaultFlowMetaData.java?view=auto&rev=111491
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/FlowMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/FlowMetaData.java?view=auto&rev=111491
==============================================================================

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java?view=diff&rev=111492&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java&r1=111491&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java&r2=111492
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java
Fri Dec 10 02:20:23 2004
@@ -44,7 +44,6 @@
      * ************************
      * HandlerMetaData properties
      */
-    private Vector parameters = new Vector();
 
     private String ref;
 
@@ -70,12 +69,8 @@
         this.phaseFirst = false;
         this.phaseLast = false;
 
-        parameters.removeAllElements();
     }
 
-    public Vector getParameters() {
-        return parameters;
-    }
 
     public int getParacount() {
         return paracount;
@@ -145,18 +140,6 @@
         this.name = name;
     }
 
-    public void addParameter(ParameterMetaData parameter) {
-        parameters.add(parameter);
-        paracount++;
-    }
-
-    public ParameterMetaData getParameter(int index) {
-        if (index < paracount) {
-            return (ParameterMetaData) parameters.get(index);
-        } else {
-            return null;
-        }
-    }
 
     public void printMe() {
         log.info("===========================================");

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/InFlowMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/InFlowMetaData.java?view=auto&rev=111491
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ModuleMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ModuleMetaData.java?view=auto&rev=111491
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/OperationMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/OperationMetaData.java?view=auto&rev=111491
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/OutFlowMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/OutFlowMetaData.java?view=auto&rev=111491
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ParameterMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ParameterMetaData.java?view=auto&rev=111491
==============================================================================

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServerMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServerMetaData.java?view=diff&rev=111492&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServerMetaData.java&r1=111491&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServerMetaData.java&r2=111492
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServerMetaData.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServerMetaData.java
Fri Dec 10 02:20:23 2004
@@ -33,13 +33,11 @@
     private Vector parameters = new Vector();
     private Vector handlers = new Vector();
     private Vector modules = new Vector();
-    private Vector typemappings = new Vector();
     private Vector phases = new Vector();
 
     private int parameterCount = 0;
     private int handlerCount = 0;
     private int moduleCount = 0;
-    private int typemappingCount = 0;
     private int phaseCount = 0;
 
     public ServerMetaData() {
@@ -95,18 +93,6 @@
     public AxisModule getModule(int index) {
         if (index <= moduleCount) {
             return (AxisModule) modules.get(index);
-        } else
-            return null;
-    }
-
-    public void addTypeMapping(TypeMappingMetaData typeMapping) {
-        typemappings.add(typeMapping);
-        typemappingCount++;
-    }
-
-    public TypeMappingMetaData getTypeMapping(int index) {
-        if (index <= typemappingCount) {
-            return (TypeMappingMetaData) typemappings.get(index);
         } else
             return null;
     }

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java?view=auto&rev=111491
==============================================================================

Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/TypeMappingMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/TypeMappingMetaData.java?view=auto&rev=111491
==============================================================================

Mime
View raw message