axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From az...@apache.org
Subject svn commit: r521771 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: deployment/ description/ engine/
Date Fri, 23 Mar 2007 15:35:43 GMT
Author: azeez
Date: Fri Mar 23 08:35:42 2007
New Revision: 521771

URL: http://svn.apache.org/viewvc?view=rev&rev=521771
Log:
Fixing some stuff that were not changed when removing the QName from Modules


Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=521771&r1=521770&r2=521771
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
Fri Mar 23 08:35:42 2007
@@ -308,8 +308,7 @@
             OMElement moduleref = (OMElement) moduleRefs.next();
             OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(TAG_REFERENCE));
             String refName = moduleRefAttribute.getAttributeValue();
-
-            globalModules.add(new QName(refName));
+            globalModules.add(refName);
         }
     }
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=521771&r1=521770&r2=521771
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Fri Mar 23 08:35:42 2007
@@ -591,7 +591,7 @@
      */
     public void engageModules() throws AxisFault {
         for (Iterator iterator = axisConfig.getGlobalModules().iterator(); iterator.hasNext();)
{
-            QName name = (QName) iterator.next();
+            String name = (String) iterator.next();
             axisConfig.engageModule(name);
         }
     }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?view=diff&rev=521771&r1=521770&r2=521771
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
Fri Mar 23 08:35:42 2007
@@ -126,7 +126,7 @@
                         throw new DeploymentException(
                                 Messages.getMessage(DeploymentErrorMsgs.MODULE_NOT_FOUND,
refName));
                     } else {
-                        axisServiceGroup.addModuleref(new QName(refName));
+                        axisServiceGroup.addModuleref(refName);
                     }
                 }
             }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java?view=diff&rev=521771&r1=521770&r2=521771
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
Fri Mar 23 08:35:42 2007
@@ -24,7 +24,6 @@
 import org.apache.axis2.modules.Module;
 import org.apache.axis2.util.Utils;
 
-import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -79,7 +78,7 @@
         moduleConfigmap.put(moduleConfiguration.getModuleName(), moduleConfiguration);
     }
 
-    public void addModuleref(QName moduleref) {
+    public void addModuleref(String moduleref) {
         modulesList.add(moduleref);
     }
 
@@ -121,8 +120,8 @@
         addChild(service);
     }
 
-    public void addToGroup(AxisService service) throws Exception{
-          if (service == null) {
+    public void addToGroup(AxisService service) throws Exception {
+        if (service == null) {
             return;
         }
         service.setParent(this);
@@ -150,8 +149,8 @@
         }
         service.setLastupdate();
         addChild(service);
-        if(axisConfig!=null){
-            axisConfig.addToAllServicesMap(service.getName(),service);
+        if (axisConfig != null) {
+            axisConfig.addToAllServicesMap(service.getName(), service);
         }
     }
 
@@ -240,7 +239,7 @@
 
     public String getServiceGroupName() {
         // Note: if the serviceGroupName is not set, then this could be null.
-        // If the serviceGroupName has not been set and a service is added to this group,

+        // If the serviceGroupName has not been set and a service is added to this group,
         // then the serviceGroupName will default to the name of the first service
         return serviceGroupName;
     }
@@ -264,7 +263,7 @@
 
     public Object getKey() {
         // Note: if the serviceGroupName is not set, then this could be null.
-        // If the serviceGroupName has not been set and a service is added to this group,

+        // If the serviceGroupName has not been set and a service is added to this group,
         // then the serviceGroupName will default to the name of the first service
         return this.serviceGroupName;
     }
@@ -274,10 +273,11 @@
         if (module == null) {
             return false;
         }
-        Iterator engagedModuleItr = engagedModules.iterator();
-        while (engagedModuleItr.hasNext()) {
-            QName axisModule = (QName) engagedModuleItr.next();
-            if (axisModule.getLocalPart().equals(module.getName())) {
+
+        for (Iterator engagedModuleItr = engagedModules.iterator();
+             engagedModuleItr.hasNext();) {
+            String axisModule = (String) engagedModuleItr.next();
+            if (axisModule.equals(module.getName())) {
                 return true;
             }
         }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=521771&r1=521770&r2=521771
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Fri Mar 23 08:35:42 2007
@@ -23,14 +23,7 @@
 import org.apache.axis2.dataretrieval.AxisDataLocator;
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.AxisDescription;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.ModuleConfiguration;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.*;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.phaseresolver.PhaseResolver;
 import org.apache.axis2.transport.MessageFormatter;
@@ -43,13 +36,7 @@
 import javax.xml.namespace.QName;
 import java.net.URL;
 import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Class AxisConfiguration
@@ -232,7 +219,7 @@
      *
      * @param module
      */
-    public void removeModule(QName module) {
+    public void removeModule(String module) {
         allModules.remove(module);
         // TODO disengage has to be done here
     }
@@ -276,13 +263,13 @@
             axisService = (AxisService) services.next();
             String serviceName = axisService.getName();
             if (allServices.get(serviceName) != null) {
-                 throw new AxisFault(Messages.getMessage(
-                    "twoservicecannothavesamename", axisService.getName()));
+                throw new AxisFault(Messages.getMessage(
+                        "twoservicecannothavesamename", axisService.getName()));
+            }
+            if (axisService.getSchematargetNamespace() == null) {
+                axisService
+                        .setSchematargetNamespace(Java2WSDLConstants.AXIS2_XSD);
             }
-             if (axisService.getSchematargetNamespace() == null) {
-                   axisService
-                    .setSchematargetNamespace(Java2WSDLConstants.AXIS2_XSD);
-             }
         }
         services = axisServiceGroup.getServices();
         while (services.hasNext()) {
@@ -322,8 +309,11 @@
         // serviceGroups.put(axisServiceGroup.getServiceGroupName(),
         // axisServiceGroup);
         addChild(axisServiceGroup);
-    }public void addToAllServicesMap(String serviceName, AxisService axisService) {
-    allServices.put(serviceName, axisService);}
+    }
+
+    public void addToAllServicesMap(String serviceName, AxisService axisService) {
+        allServices.put(serviceName, axisService);
+    }
 
     public AxisServiceGroup removeServiceGroup(String serviceGroupName) throws AxisFault
{
         AxisServiceGroup axisServiceGroup = (AxisServiceGroup) getChild(serviceGroupName);
@@ -350,12 +340,11 @@
      * @param transport
      * @throws AxisFault
      */
-    public void addTransportIn(TransportInDescription transport)
-            throws AxisFault {
+    public void addTransportIn(TransportInDescription transport) throws AxisFault {
         if (transport.getReceiver() == null) {
             throw new AxisFault(
                     "Transport Receiver can not be null for the transport "
-                            + transport.getName());
+                    + transport.getName());
         }
         transportsIn.put(transport.getName(), transport);
     }
@@ -371,7 +360,7 @@
         if (transport.getSender() == null) {
             throw new AxisFault(
                     "Transport sender can not be null for the transport "
-                            + transport.getName());
+                    + transport.getName());
         }
         transportsOut.put(transport.getName(), transport);
     }
@@ -382,9 +371,9 @@
      * the correct module. Both the below cases are valid : -
      * 1. engageModule("addressing"); 2. engageModule("addressing-1.23");
      *
-     * @deprecate Please use the String version instead
      * @param moduleref QName of module to engage
      * @throws AxisFault
+     * @deprecated Please use the String version instead
      */
     public void engageModule(QName moduleref) throws AxisFault {
         engageModule(moduleref.getLocalPart());



---------------------------------------------------------------------
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