axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r371801 - in /webservices/axis2/trunk/java/modules: addressing/test/org/apache/axis2/handlers/addressing/ core/src/org/apache/axis2/context/ core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/deployment/repository/util/ core/sr...
Date Tue, 24 Jan 2006 04:17:27 GMT
Author: deepal
Date: Mon Jan 23 20:16:09 2006
New Revision: 371801

URL: http://svn.apache.org/viewcvs?rev=371801&view=rev
Log:
- added support for module description
- rename ModuleDescription into AxisModule to have the consistent nature
- update jsps
- improved service start/stop capability

Added:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java   (contents, props changed)
      - copied, changed from r371509, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java
Removed:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java
Modified:
    webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/InavalidModuleImpl.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
    webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
    webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java
    webservices/axis2/trunk/java/modules/webapp/EngageToServiceGroup.jsp
    webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp
    webservices/axis2/trunk/java/modules/webapp/ViewServiceHandlers.jsp
    webservices/axis2/trunk/java/modules/webapp/engagingglobally.jsp
    webservices/axis2/trunk/java/modules/webapp/engagingtoanoperation.jsp
    webservices/axis2/trunk/java/modules/webapp/engagingtoaservice.jsp
    webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp
    webservices/axis2/trunk/java/modules/webapp/listModules.jsp
    webservices/axis2/trunk/java/modules/webapp/listService.jsp

Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java Mon Jan 23 20:16:09 2006
@@ -19,7 +19,7 @@
 import junit.framework.TestCase;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.engine.AxisConfiguration;
 
 import javax.xml.namespace.QName;
@@ -39,8 +39,8 @@
                 .getAxisConfiguration();
         File file = new File("target/addressing.mar");
         assertTrue(file.exists());
-        ModuleDescription moduleDesc = er.getModule(new QName("addressing"));
-        assertNotNull(moduleDesc);
+        AxisModule axisModule = er.getModule(new QName("addressing"));
+        assertNotNull(axisModule);
     }
 
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java Mon Jan 23 20:16:09 2006
@@ -3,7 +3,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.deployment.FileSystemConfigurator;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
@@ -83,7 +83,7 @@
             Collection col = modules.values();
 
             for (Iterator iterator = col.iterator(); iterator.hasNext();) {
-                ModuleDescription axismodule = (ModuleDescription) iterator.next();
+                AxisModule axismodule = (AxisModule) iterator.next();
                 Module module = axismodule.getModule();
 
                 if (module != null) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Mon Jan 23 20:16:09 2006
@@ -25,7 +25,7 @@
 import org.apache.axis2.description.AxisServiceGroup;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.ModuleConfiguration;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
@@ -366,7 +366,7 @@
             }
         }
 
-        ModuleDescription module = baseConfig.getModule(new QName(moduleName));
+        AxisModule module = baseConfig.getModule(new QName(moduleName));
 
         if (module != null) {
             param = module.getParameter(key);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceContext.java Mon Jan 23 20:16:09 2006
@@ -95,14 +95,6 @@
         return serviceGroupContext;
     }
 
-    public ArrayList getReplyTorefpars() {
-        return replyTorefpars;
-    }
-
-    public void setReplyTorefpars(ArrayList replyTorefpars) {
-        this.replyTorefpars = replyTorefpars;
-    }
-
     public String getMyEPRAddress() {
         return myEPRAddress;
     }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Mon Jan 23 20:16:09 2006
@@ -40,7 +40,10 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 
 public class DeploymentEngine implements DeploymentConstants {
 
@@ -120,7 +123,7 @@
         modulelist.add(moduleName);
     }
 
-    private void addNewModule(ModuleDescription modulemetadata) throws AxisFault {
+    private void addNewModule(AxisModule modulemetadata) throws AxisFault {
 
         Flow inflow = modulemetadata.getInFlow();
         ClassLoader moduleClassLoader = modulemetadata.getModuleClassLoader();
@@ -169,7 +172,7 @@
 
         for (int i = 0; i < groupModules.size(); i++) {
             QName moduleName = (QName) groupModules.get(i);
-            ModuleDescription module = axisConfig.getModule(moduleName);
+            AxisModule module = axisConfig.getModule(moduleName);
 
             if (module != null) {
                 serviceGroup.engageModule(axisConfig.getModule(moduleName));
@@ -194,7 +197,7 @@
             ArrayList list = axisService.getModules();
 
             for (int i = 0; i < list.size(); i++) {
-                ModuleDescription module = axisConfig.getModule((QName) list.get(i));
+                AxisModule module = axisConfig.getModule((QName) list.get(i));
 
                 if (module == null) {
                     throw new DeploymentException(
@@ -212,7 +215,7 @@
 
                 for (int i = 0; i < modules.size(); i++) {
                     QName moduleName = (QName) modules.get(i);
-                    ModuleDescription module = axisConfig.getModule(moduleName);
+                    AxisModule module = axisConfig.getModule(moduleName);
 
                     if (module != null) {
                         opDesc.engageModule(module, axisConfig);
@@ -250,14 +253,14 @@
      * @return Returns ModuleDescription.
      * @throws DeploymentException
      */
-    public ModuleDescription buildModule(File modulearchive, AxisConfiguration config)
+    public AxisModule buildModule(File modulearchive, AxisConfiguration config)
             throws DeploymentException {
-        ModuleDescription axismodule;
+        AxisModule axismodule;
 
         try {
             this.setPhasesinfo(config.getPhasesInfo());
             currentArchiveFile = new ArchiveFileData(modulearchive, TYPE_MODULE);
-            axismodule = new ModuleDescription();
+            axismodule = new AxisModule();
             ArchiveReader archiveReader = new ArchiveReader();
 
             currentArchiveFile.setClassLoader(false, config.getModuleClassLoader());
@@ -422,7 +425,7 @@
                             String moduleStatus = "";
 
                             try {
-                                ModuleDescription metaData = new ModuleDescription();
+                                AxisModule metaData = new AxisModule();
 
                                 metaData.setModuleClassLoader(currentArchiveFile.getClassLoader());
                                 metaData.setParent(axisConfig);
@@ -576,19 +579,17 @@
     }
 
     public void unDeploy() {
-        String serviceName = "";
+        String fileName;
         try {
             if (wsToUnDeploy.size() > 0) {
                 for (int i = 0; i < wsToUnDeploy.size(); i++) {
                     WSInfo wsInfo = (WSInfo) wsToUnDeploy.get(i);
                     if (wsInfo.getType() == TYPE_SERVICE) {
-                        serviceName = getAxisServiceName(wsInfo.getFileName());
-                        //TODO : need to remove Servicegroup  from configuration : AXIS2- 390
-                        // todo fix me deepal
+                        fileName = getAxisServiceName(wsInfo.getFileName());
+                        axisConfig.removeServiceGroup(fileName);
                         log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
                                 wsInfo.getFileName()));
                     }
-                    axisConfig.getFaultyServices().remove(serviceName);
                 }
             }
         } catch (Exception e) {
@@ -660,7 +661,7 @@
         return currentArchiveFile;
     }
 
-    public ModuleDescription getModule(QName moduleName) throws AxisFault {
+    public AxisModule getModule(QName moduleName) throws AxisFault {
         return axisConfig.getModule(moduleName);
     }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java Mon Jan 23 20:16:09 2006
@@ -19,11 +19,7 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisOperationFactory;
-import org.apache.axis2.description.InOnlyAxisOperation;
-import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.PolicyInclude;
+import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.i18n.Messages;
@@ -34,6 +30,7 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import java.io.InputStream;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -42,16 +39,16 @@
  */
 public class ModuleBuilder extends DescriptionBuilder {
     private AxisConfiguration axisConfig;
-    private ModuleDescription module;
+    private AxisModule module;
 
-    public ModuleBuilder(InputStream serviceInputStream, ModuleDescription module,
+    public ModuleBuilder(InputStream serviceInputStream, AxisModule module,
                          AxisConfiguration axisConfig) {
         super(serviceInputStream, axisConfig);
         this.axisConfig = axisConfig;
         this.module = module;
     }
 
-    private void loadModuleClass(ModuleDescription module, String moduleClassName)
+    private void loadModuleClass(AxisModule module, String moduleClassName)
             throws DeploymentException {
         Class moduleClass;
 
@@ -91,8 +88,29 @@
                 }
             }
 
+// process service description
+            OMElement descriptionElement =
+                    moduleElement.getFirstChildWithName(new QName(TAG_DESCRIPTION));
+
+            if (descriptionElement != null) {
+                OMElement descriptionValue = descriptionElement.getFirstElement();
+
+                if (descriptionValue != null) {
+                    StringWriter writer = new StringWriter();
+
+                    descriptionValue.build();
+                    descriptionValue.serialize(writer);
+                    writer.flush();
+                    module.setModuleDescription(writer.toString());
+                } else {
+                    module.setModuleDescription(descriptionElement.getText());
+                }
+            } else {
+                module.setModuleDescription("module decription not found");
+            }
+
             // setting the PolicyInclude
-            
+
             // processing <wsp:Policy> .. </..> elements
             Iterator policyElements = moduleElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY));
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Mon Jan 23 20:16:09 2006
@@ -21,7 +21,7 @@
 import org.apache.axis2.deployment.util.Utils;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.om.OMAttribute;
@@ -349,7 +349,7 @@
     }
 
     public void readModuleArchive(String filename, DeploymentEngine engine,
-                                  ModuleDescription module, boolean explodedDir,
+                                  AxisModule module, boolean explodedDir,
                                   AxisConfiguration axisConfig)
             throws DeploymentException {
 

Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java (from r371509, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java&r1=371509&r2=371801&rev=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java Mon Jan 23 20:16:09 2006
@@ -35,7 +35,7 @@
  * <p>Handler are registered once they are available. They are available to all services if axis2.xml
  * has a module ref="." or avalible to a single service if services.xml have module ref=".."</p>
  */
-public class ModuleDescription implements FlowInclude, ParameterInclude {
+public class AxisModule implements FlowInclude, ParameterInclude {
 
     /**
      * Field flowInclude
@@ -57,16 +57,19 @@
     // to store module operations , which are suppose to be added to a service if it is engaged to a service
     private HashMap operations;
     private AxisConfiguration parent;
-    
+
     /*
-     * to store policies which are falid for any service for which the module is
-     */ 
+    * to store policies which are falid for any service for which the module is
+    */
     private PolicyInclude policyInclude;
 
+    // Small description about the module
+    private String moduleDescription;
+
     /**
      * Constructor ModuleDescription.
      */
-    public ModuleDescription() {
+    public AxisModule() {
         operations = new HashMap();
         policyInclude = new PolicyInclude();
     }
@@ -76,7 +79,7 @@
      *
      * @param name
      */
-    public ModuleDescription(QName name) {
+    public AxisModule(QName name) {
         this();
         this.name = name;
     }
@@ -231,12 +234,20 @@
     public void setParent(AxisConfiguration parent) {
         this.parent = parent;
     }
-    
+
     public void setPolicyInclude(PolicyInclude policyInclude) {
         this.policyInclude = policyInclude;
     }
-    
+
     public PolicyInclude getPolicyInclude() {
         return policyInclude;
+    }
+
+    public String getModuleDescription() {
+        return moduleDescription;
+    }
+
+    public void setModuleDescription(String moduleDescription) {
+        this.moduleDescription = moduleDescription;
     }
 }

Propchange: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java Mon Jan 23 20:16:09 2006
@@ -11,7 +11,6 @@
 import org.apache.axis2.engine.AxisError;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.om.OMElement;
 import org.apache.axis2.phaseresolver.PhaseResolver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -100,7 +99,7 @@
      * @param moduleref
      * @throws AxisFault
      */
-    public final void engageModule(ModuleDescription moduleref, AxisConfiguration axisConfig)
+    public final void engageModule(AxisModule moduleref, AxisConfiguration axisConfig)
             throws AxisFault {
         if (moduleref == null) {
             return;
@@ -110,7 +109,7 @@
         Iterator module_itr = engagedModules.iterator();
 
         while (module_itr.hasNext()) {
-            ModuleDescription module = (ModuleDescription) module_itr.next();
+            AxisModule module = (AxisModule) module_itr.next();
 
             if (module.getName().equals(moduleref.getName())) {
                 log.debug(moduleref.getName().getLocalPart()

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Mon Jan 23 20:16:09 2006
@@ -24,7 +24,6 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.util.PolicyUtil;
-import org.apache.axis2.wsdl.builder.wsdl4j.WSDLPump;
 import org.apache.axis2.wsdl.writer.WOMWriter;
 import org.apache.axis2.wsdl.writer.WOMWriterFactory;
 import org.apache.commons.logging.Log;
@@ -32,16 +31,13 @@
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.wsdl.WSDLConstants;
 import org.apache.wsdl.WSDLDescription;
-import org.apache.wsdl.impl.WSDLDescriptionImpl;
 
 import javax.wsdl.Definition;
 import javax.wsdl.Port;
 import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.wsdl.factory.WSDLFactory;
 import javax.xml.namespace.QName;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.util.*;
 
@@ -49,6 +45,7 @@
  * Class AxisService
  */
 public class AxisService extends AxisDescription {
+
     private Definition definition = null;
     private Log log = LogFactory.getLog(getClass());
     private String fileName = "";
@@ -85,6 +82,9 @@
 // to set the handler chain available in phase info
     private boolean useDefaultChains = true;
 
+    //to keep the status of the service , since service can stop at the run time
+    private boolean active = true;
+
     /**
      * Constructor AxisService.
      */
@@ -126,7 +126,7 @@
      *
      * @param module
      */
-    public void addModuleOperations(ModuleDescription module, AxisConfiguration axisConfig)
+    public void addModuleOperations(AxisModule module, AxisConfiguration axisConfig)
             throws AxisFault {
         HashMap map = module.getOperations();
         Collection col = map.values();
@@ -168,7 +168,7 @@
         Iterator modules = getEngagedModules().iterator();
 
         while (modules.hasNext()) {
-            ModuleDescription module = (ModuleDescription) modules.next();
+            AxisModule module = (AxisModule) modules.next();
             AxisServiceGroup parent = (AxisServiceGroup) getParent();
             AxisConfiguration axisConfig = null;
 
@@ -231,7 +231,7 @@
      *
      * @param moduleref
      */
-    public void engageModule(ModuleDescription moduleref, AxisConfiguration axisConfig)
+    public void engageModule(AxisModule moduleref, AxisConfiguration axisConfig)
             throws AxisFault {
         if (moduleref == null) {
             return;
@@ -241,7 +241,7 @@
         Iterator itr_engageModules = engagedModules.iterator();
 
         while (itr_engageModules.hasNext()) {
-            ModuleDescription module = (ModuleDescription) itr_engageModules.next();
+            AxisModule module = (AxisModule) itr_engageModules.next();
 
             if (module.getName().equals(moduleref.getName())) {
                 log.debug(moduleref.getName().getLocalPart()
@@ -288,7 +288,7 @@
 //        if (getWSDLDefinition() != null) {
 //            printUsingWSDLDefinition(out, serviceURL);
 //        } else {
-            printUsingWOM(out, serviceURL);
+        printUsingWOM(out, serviceURL);
 //        }
     }
 
@@ -314,12 +314,12 @@
                     port.addExtensibilityElement(soapAddress);
                 }
             }
-            
-            WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDefinition, out);      
+
+            WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDefinition, out);
             out.flush();
         } catch (Exception e) {
-        	throw new AxisFault(e);
-		}
+            throw new AxisFault(e);
+        }
     }
 
     public void printUsingWOM(OutputStream out, String serviceURL) throws AxisFault {
@@ -419,7 +419,7 @@
      */
     public AxisOperation getOperation(QName operationName) {
 //        AxisOperation axisOperation = (AxisOperation) operations.get(operationName);
-    	AxisOperation axisOperation = (AxisOperation) getChild(operationName);
+        AxisOperation axisOperation = (AxisOperation) getChild(operationName);
 
         if (axisOperation == null) {
             axisOperation = (AxisOperation) operationsAliasesMap.get(operationName.getLocalPart());
@@ -587,5 +587,13 @@
 
     public Object getKey() {
         return getName();
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
     }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java Mon Jan 23 20:16:09 2006
@@ -20,7 +20,6 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisEvent;
-import org.apache.axis2.om.OMElement;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -30,6 +29,7 @@
 import java.util.Iterator;
 
 public class AxisServiceGroup extends AxisDescription {
+
     private Log log = LogFactory.getLog(getClass());
 
     // to store module ref at deploy time parsing
@@ -46,7 +46,7 @@
 
     // to keep name of the service group
     private String serviceGroupName;
-    
+
     /**
      * Field services
      */
@@ -90,10 +90,10 @@
 
             while (modules.hasNext()) {
                 QName moduleName = (QName) modules.next();
-                ModuleDescription moduleDesc = axisConfig.getModule(moduleName);
+                AxisModule axisModule = axisConfig.getModule(moduleName);
 
-                if (moduleDesc != null) {
-                    service.engageModule(moduleDesc, axisConfig);
+                if (axisModule != null) {
+                    service.engageModule(axisModule, axisConfig);
                 } else {
                     throw new AxisFault("Trying to engage a module which is not " + "available : "
                             + moduleName.getLocalPart());
@@ -110,7 +110,7 @@
         engagedModules.add(moduleName);
     }
 
-    public void engageModule(ModuleDescription module) throws AxisFault {
+    public void engageModule(AxisModule module) throws AxisFault {
         QName moduleName = module.getName();
         boolean needToadd = true;
         for (Iterator iterator = engagedModules.iterator(); iterator.hasNext();) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java Mon Jan 23 20:16:09 2006
@@ -248,7 +248,7 @@
                 mc.setSoapAction((String) soapaction.getValue());
             }
         }
-        addRefParsToRequset(mc.getEnvelope());
+        addReferenceParameters(mc.getEnvelope());
         if (options.isUseSeparateListener()) {
             CallbackReceiver callbackReceiver = (CallbackReceiver) axisOp
                     .getMessageReceiver();
@@ -309,7 +309,7 @@
         }
     }
 
-    private void addRefParsToRequset(SOAPEnvelope env) {
+    private void addReferenceParameters(SOAPEnvelope env) {
         if (options.isManageSession()) {
             EndpointReference tepr = sc.getTargetEPR();
             if (tepr != null) {
@@ -366,18 +366,6 @@
             // requesy automatically send them back
             sc.setTargetEPR(getReplyToEPR(resenvelope.getHeader()
                     .getFirstChildWithName(new QName("ReplyTo"))));
-//            sc.setTargetEPR(epr);
-//            OMElement refernceParameters = resenvelope.getHeader()
-//                    .getFirstChildWithName(new QName("ReplyTo"))
-//                    .getFirstChildWithName(new QName("ReferenceParameters"));
-//            ArrayList replyTorefPars = new ArrayList();
-//            Iterator refPars = refernceParameters.getChildren();
-//            while (refPars.hasNext()) {
-//                OMElement omElement = (OMElement) refPars.next();
-//                replyTorefPars.add(omElement);
-//            }
-//            sc.setReplyTorefpars(replyTorefPars);
-
         } catch (Exception e) {
             //NPE may occure there for need to catch this
         }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Mon Jan 23 20:16:09 2006
@@ -134,7 +134,7 @@
      * @param module
      * @throws AxisFault
      */
-    public void addModule(ModuleDescription module) throws AxisFault {
+    public void addModule(AxisModule module) throws AxisFault {
         module.setParent(this);
         allModules.put(module.getName(), module);
     }
@@ -209,6 +209,20 @@
         addChild(axisServiceGroup);
     }
 
+    public void removeServiceGroup(String serviceGroupName) throws AxisFault {
+        AxisServiceGroup axisServiceGroup = (AxisServiceGroup) getChild(serviceGroupName);
+        if (axisServiceGroup == null) {
+            throw new AxisFault("invalid service group name : " + serviceGroupName);
+        }
+        Iterator services = axisServiceGroup.getServices();
+        while (services.hasNext()) {
+            AxisService axisService = (AxisService) services.next();
+            allservices.remove(axisService.getName());
+            notifyObservers(AxisEvent.SERVICE_REMOVE, axisService);
+        }
+        removeChild(serviceGroupName);
+    }
+
     /**
      * Method addTransportIn.
      *
@@ -276,7 +290,7 @@
      * @throws AxisFault
      */
     public void engageModule(QName moduleref) throws AxisFault {
-        ModuleDescription module = getModule(moduleref);
+        AxisModule module = getModule(moduleref);
         if (module == null) {
             // there is no module found with the given name , so better check for dafult module version
             String moduleName = moduleref.getLocalPart();
@@ -300,7 +314,7 @@
      */
     public void engageModule(String moduleName, String versionID) throws AxisFault {
         QName moduleQName = Utils.getModuleName(moduleName, versionID);
-        ModuleDescription module = getModule(moduleQName);
+        AxisModule module = getModule(moduleQName);
         if (module == null) {
             module = loadModulefromResources(moduleQName.getLocalPart());
             engageModule(module, moduleQName);
@@ -310,7 +324,7 @@
 
     }
 
-    private void engageModule(ModuleDescription module, QName moduleQName) throws AxisFault {
+    private void engageModule(AxisModule module, QName moduleQName) throws AxisFault {
         if (module != null) {
             for (Iterator iterator = engagedModules.iterator(); iterator.hasNext();) {
                 QName qName = (QName) iterator.next();
@@ -339,8 +353,8 @@
      * @return Returns ModuleDescription.
      * @throws AxisFault
      */
-    public ModuleDescription loadModulefromResources(String moduleName) throws AxisFault {
-        ModuleDescription module;
+    public AxisModule loadModulefromResources(String moduleName) throws AxisFault {
+        AxisModule module;
         // trying to read from resources
         File file = new ArchiveReader().creatModuleArchivefromResource(moduleName,
                 getRepository());
@@ -428,8 +442,8 @@
      * @param name
      * @return Returns ModuleDescription.
      */
-    public ModuleDescription getModule(QName name) {
-        ModuleDescription module = (ModuleDescription) allModules.get(name);
+    public AxisModule getModule(QName name) {
+        AxisModule module = (AxisModule) allModules.get(name);
         if (module != null) {
             return module;
         }
@@ -439,7 +453,7 @@
             String moduleName = name.getLocalPart();
             String defaultModuleVersion = getDefaultModuleVersion(moduleName);
             if (defaultModuleVersion != null) {
-                module = (ModuleDescription) allModules.get(
+                module = (AxisModule) allModules.get(
                         Utils.getModuleName(moduleName, defaultModuleVersion));
                 if (module != null) {
                     return module;
@@ -486,8 +500,17 @@
      * @param name
      * @return Returns AxisService.
      */
-    public AxisService getService(String name) {
-        return (AxisService) allservices.get(name);
+    public AxisService getService(String name) throws AxisFault {
+        AxisService axisService = (AxisService) allservices.get(name);
+        if (axisService != null) {
+            if (axisService.isActive()) {
+                return axisService;
+            } else {
+                throw new AxisFault("Trying to acess inactive service :" + name);
+            }
+        } else {
+            return null;
+        }
     }
 
     // the class loder that become the parent of all the services
@@ -497,12 +520,12 @@
 
     public AxisServiceGroup getServiceGroup(String serviceNameAndGroupString) {
 //        return (AxisServiceGroup) serviceGroups.get(serviceNameAndGroupString);
-    	return (AxisServiceGroup) getChild(serviceNameAndGroupString);
+        return (AxisServiceGroup) getChild(serviceNameAndGroupString);
     }
 
     public Iterator getServiceGroups() {
 //        return serviceGroups.values().iterator();
-    	return getChildren();
+        return getChildren();
     }
 
     // to get all the services in the system
@@ -626,16 +649,34 @@
         return (String) nameToverionMap.get(moduleName);
     }
 
-    public ModuleDescription getDefaultModule(String moduleName) {
+    public AxisModule getDefaultModule(String moduleName) {
         String defualtModuleVersion = getDefaultModuleVersion(moduleName);
         if (defualtModuleVersion == null) {
-            return (ModuleDescription) allModules.get(new QName(moduleName));
+            return (AxisModule) allModules.get(new QName(moduleName));
         } else {
-            return (ModuleDescription) allModules.get(new QName(moduleName + "-" + defualtModuleVersion));
+            return (AxisModule) allModules.get(new QName(moduleName + "-" + defualtModuleVersion));
         }
     }
 
     public Object getKey() {
         return getAxis2HomeDirectory(); // TODO CheckMe
+    }
+
+    public void stopService(String serviceName) throws AxisFault {
+        AxisService service = (AxisService) allservices.get(serviceName);
+        if (service == null) {
+            throw new AxisFault("Invalid service name : " + serviceName);
+        }
+        service.setActive(false);
+        notifyObservers(AxisEvent.SERVICE_STOP, service);
+    }
+
+    public void stratService(String serviceName) throws AxisFault {
+        AxisService service = (AxisService) allservices.get(serviceName);
+        if (service == null) {
+            throw new AxisFault("Invalid service name : " + serviceName);
+        }
+        service.setActive(true);
+        notifyObservers(AxisEvent.SERVICE_START, service);
     }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java Mon Jan 23 20:16:09 2006
@@ -27,6 +27,8 @@
      */
     public static final int SERVICE_DEPLOY = 1;
     public static final int SERVICE_REMOVE = 0;
+    public static final int SERVICE_STOP=2;
+    public static final int SERVICE_START=3;
     private int EVENT_TYPE;
     private AxisService service;
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java Mon Jan 23 20:16:09 2006
@@ -105,7 +105,7 @@
     private void fillContextsFromSessionContext(MessageContext msgContext) throws AxisFault {
         AxisService service = msgContext.getAxisService();
         if (service == null) {
-            throw new AxisFault("AxisService Not found yet");
+            throw new AxisFault("Service not found operation terminated !!");
         }
         SessionContext sessionContext = msgContext.getSessionContext();
         String serviceGroupContextId = msgContext.getServiceGroupContextId();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java Mon Jan 23 20:16:09 2006
@@ -18,7 +18,7 @@
 package org.apache.axis2.modules;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.AxisDescription;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.engine.AxisConfiguration;
@@ -40,7 +40,7 @@
 public interface Module {
 
     // initialize the module
-    public void init(ConfigurationContext configContext, ModuleDescription module) throws AxisFault;
+    public void init(ConfigurationContext configContext, AxisModule module) throws AxisFault;
 
     /**
      * When engaging this module to some service or operation , module will be notify by calling this

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java Mon Jan 23 20:16:09 2006
@@ -20,7 +20,7 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.Flow;
 import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
@@ -162,7 +162,7 @@
         }
     }
 
-    public void engageModuleToOperation(AxisOperation axisOperation, ModuleDescription module)
+    public void engageModuleToOperation(AxisOperation axisOperation, AxisModule module)
             throws PhaseException {
         Flow flow = null;
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Mon Jan 23 20:16:09 2006
@@ -106,7 +106,6 @@
         service.setClassLoader(Thread.currentThread().getContextClassLoader());
         service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS, className));
 
-        // todo I assumed in-out mep , this has to be imroved : Deepal
         AxisOperation axisOp = new InOutAxisOperation(opName);
 
         axisOp.setMessageReceiver(messageReceiver);
@@ -126,7 +125,6 @@
         service.setClassLoader(Thread.currentThread().getContextClassLoader());
         service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS, className));
 
-        // todo I assumed in-out mep , this has to be imroved : Deepal
         AxisOperation axisOp = new OutInAxisOperation(opName);
 
         axisOp.setMessageReceiver(messageReceiver);
@@ -136,40 +134,8 @@
         return service;
     }
 
-    public static void extractServiceGroupAndServiceInfo(String filePart,
-                                                         MessageContext messageContext) {
-        String[] values = parseRequestURLForServiceAndOperation(filePart);
-        String serviceNameAndGroup = values[0];
-
-        if (serviceNameAndGroup != null) {
-            String[]          serviceNameAndGroupStrings = serviceNameAndGroup.split(":");
-            AxisConfiguration registry =
-                    messageContext.getConfigurationContext().getAxisConfiguration();
-
-            if (serviceNameAndGroupStrings[0] != null) {
-                AxisServiceGroup axisServiceGroup =
-                        registry.getServiceGroup(serviceNameAndGroupStrings[0]);
-                String serviceNameStr = "";
-
-                if (serviceNameAndGroupStrings.length == 1) {
-
-                    // This means user has not given a service name.
-                    // the notations is ...../axis2/services/<ServiceGroupName>
-                    serviceNameStr = serviceNameAndGroupStrings[0];
-                }
-
-                AxisService axisService = registry.getService(serviceNameStr);
-
-                if ((axisServiceGroup != null) && (axisService != null)) {
-                    messageContext.setAxisServiceGroup(axisServiceGroup);
-                    messageContext.setAxisService(axisService);
-                }
-            }
-        }
-    }
-
-    public static ServiceContext fillContextInformation(AxisOperation axisOperation,
-                                                        AxisService axisService, ConfigurationContext configurationContext) {
+    public static ServiceContext fillContextInformation(AxisService axisService,
+                                                        ConfigurationContext configurationContext) {
 
         // 2. if null, create new opCtxt
         // fill the service group context and service context info
@@ -290,8 +256,8 @@
         Iterator allModules = modules.values().iterator();
         HashMap defaultModules = new HashMap();
         while (allModules.hasNext()) {
-            ModuleDescription moduleDescription = (ModuleDescription) allModules.next();
-            QName moduleName = moduleDescription.getName();
+            AxisModule axisModule = (AxisModule) allModules.next();
+            QName moduleName = axisModule.getName();
             String moduleNameString = getModuleName(moduleName.getLocalPart());
             String moduleVersionString = getModuleVersion(moduleName.getLocalPart());
             String currentDefaultVerison = (String) defaultModules.get(moduleNameString);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/InavalidModuleImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/InavalidModuleImpl.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/InavalidModuleImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/InavalidModuleImpl.java Mon Jan 23 20:16:09 2006
@@ -3,7 +3,7 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.modules.Module;
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.AxisDescription;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
@@ -24,7 +24,7 @@
 
 public class InavalidModuleImpl implements Module {
     // initialize the module
-    public void init(ConfigurationContext configContext, ModuleDescription module) throws AxisFault {
+    public void init(ConfigurationContext configContext, AxisModule module) throws AxisFault {
     }
 
     public void engageNotify(AxisDescription axisDescription) throws AxisFault {

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java Mon Jan 23 20:16:09 2006
@@ -3,7 +3,7 @@
 import junit.framework.TestCase;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.util.Utils;
 
@@ -40,23 +40,23 @@
 
     public void testCalculateDefaultModuleVersions() throws AxisFault {
         AxisConfiguration axiConfiguration = new AxisConfiguration();
-        ModuleDescription module1 = new ModuleDescription();
+        AxisModule module1 = new AxisModule();
         module1.setName(new QName("Module1"));
         axiConfiguration.addModule(module1);
 
-        ModuleDescription module2 = new ModuleDescription();
+        AxisModule module2 = new AxisModule();
         module2.setName(new QName("Module2-0.94"));
         axiConfiguration.addModule(module2);
 
-        ModuleDescription module3 = new ModuleDescription();
+        AxisModule module3 = new AxisModule();
         module3.setName(new QName("Module2-0.95"));
         axiConfiguration.addModule(module3);
 
-        ModuleDescription module4 = new ModuleDescription();
+        AxisModule module4 = new AxisModule();
         module4.setName(new QName("Module2-0.93"));
         axiConfiguration.addModule(module4);
 
-        ModuleDescription module5 = new ModuleDescription();
+        AxisModule module5 = new AxisModule();
         module5.setName(new QName("testModule-1.93"));
         axiConfiguration.addModule(module5);
 

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java Mon Jan 23 20:16:09 2006
@@ -67,7 +67,7 @@
     }
 
     public void testModule() throws AxisFault {
-        ModuleDescription module = new ModuleDescription(new QName("module1"));
+        AxisModule module = new AxisModule(new QName("module1"));
         module.setParent(reg);
         testParameteInClude(module);
         testFlowIncludeTest(module);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java Mon Jan 23 20:16:09 2006
@@ -22,7 +22,7 @@
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.phaseresolver.PhaseException;
 
 import javax.xml.namespace.QName;
@@ -38,7 +38,7 @@
         String filename = "./target/test-resources/deployment";
         ac = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename,null)
                 .getAxisConfiguration();
-        ModuleDescription module = ac.getModule(new QName("module1"));
+        AxisModule module = ac.getModule(new QName("module1"));
         assertNotNull(module);
         ac.engageModule(new QName("module1"));
         AxisService service = ac.getService("service2");

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java Mon Jan 23 20:16:09 2006
@@ -21,7 +21,7 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.ParameterImpl;
 
@@ -57,7 +57,7 @@
             para.setName("PARA_NAME");
             para.setLocked(true);
             reg.addParameter(para);
-            ModuleDescription module = new ModuleDescription(new QName("Service1"));
+            AxisModule module = new AxisModule(new QName("Service1"));
             module.setParent(reg);
             module.addParameter(para);
             fail("This should fails with Parmter is locked can not overide");

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java Mon Jan 23 20:16:09 2006
@@ -23,7 +23,7 @@
 import org.apache.axis2.deployment.ModuleBuilder;
 import org.apache.axis2.deployment.ServiceBuilder;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 
 import javax.xml.stream.XMLStreamException;
 import java.io.FileInputStream;
@@ -126,7 +126,7 @@
     public void testOveride_Non_locked_Para_Module() {
         try {
             assertNotNull(ar);
-            ModuleDescription module = new ModuleDescription();
+            AxisModule module = new AxisModule();
             module.setParent(ar);
             InputStream in = new FileInputStream(repo + "/module_overide_global_non_locked_para.xml");
             ModuleBuilder mbuilder = new ModuleBuilder(in, module, ar);
@@ -141,7 +141,7 @@
     public void testOveride_locked_Para_Module() {
         try {
             assertNotNull(ar);
-            ModuleDescription module = new ModuleDescription();
+            AxisModule module = new AxisModule();
             module.setParent(ar);
             InputStream in = new FileInputStream(repo + "/module_overide_locked_para.xml");
             ModuleBuilder mbuilder = new ModuleBuilder(in, module, ar);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java Mon Jan 23 20:16:09 2006
@@ -81,7 +81,7 @@
             fail("The test must fail due to wrong service Name");
 
         } catch (AxisFault e) {
-            assertTrue(e.getMessage().indexOf("Service Not found") >= 0);
+            assertTrue(e.getMessage().indexOf("Service not found") >= 0);
             tearDown();
             return;
         }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java Mon Jan 23 20:16:09 2006
@@ -21,7 +21,7 @@
 import junit.framework.TestCase;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.util.Utils;
@@ -57,7 +57,7 @@
 
         //service.setFaultInFlow(new MockFlow("service faultflow", 1));
 
-        ModuleDescription m1 = new ModuleDescription(
+        AxisModule m1 = new AxisModule(
                 new QName("", "A Mdoule 1"));
         m1.setInFlow(new MockFlow("service module inflow", 4));
         //m1.setFaultInFlow(new MockFlow("service module faultflow", 1));

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Mon Jan 23 20:16:09 2006
@@ -25,7 +25,7 @@
 import org.apache.axis2.deployment.DeploymentEngine;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
 
 import javax.xml.namespace.QName;
@@ -128,9 +128,9 @@
         ConfigurationContext configContext = ConfigurationContextFactory
                 .createConfigurationContextFromFileSystem(
                         "target/test-resources/integrationRepo",null);
-        ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
+        AxisModule axisModule = deploymentEngine.buildModule(file,
                 configContext.getAxisConfiguration());
-        configContext.getAxisConfiguration().addModule(moduleDesc);
+        configContext.getAxisConfiguration().addModule(axisModule);
 
         configContext.getAxisConfiguration().addService(service);
 
@@ -146,9 +146,9 @@
 
         ConfigurationContext configContext = ConfigurationContextFactory .createConfigurationContextFromFileSystem(
                 "target/test-resources/integrationRepo",null);
-        ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
+        AxisModule axisModule = deploymentEngine.buildModule(file,
                 configContext.getAxisConfiguration());
-        configContext.getAxisConfiguration().addModule(moduleDesc);
+        configContext.getAxisConfiguration().addModule(axisModule);
         configContext.getAxisConfiguration().engageModule(new QName("addressing"));
         return configContext;
     }
@@ -162,10 +162,10 @@
 
         ConfigurationContext configContext = ConfigurationContextFactory
                 .createConfigurationContextFromFileSystem(clientHome,null);
-        ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
+        AxisModule axisModule = deploymentEngine.buildModule(file,
                 configContext.getAxisConfiguration());
 
-        configContext.getAxisConfiguration().addModule(moduleDesc);
+        configContext.getAxisConfiguration().addModule(axisModule);
         // sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());
 
         configContext.getAxisConfiguration().addService(service);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java Mon Jan 23 20:16:09 2006
@@ -97,7 +97,6 @@
         finish = false;
         resultElem = null;
         envelope = null;
-        String expected = value;
         try {
             if (clientConfigContext == null) {
                 clientConfigContext = UtilsMailServer
@@ -117,7 +116,7 @@
             engineRegistry.removeService(serviceName.getLocalPart());
             clientService.addOperation(clientOperation);
             engineRegistry.addService(clientService);
-            clientServiceContext = Utils.fillContextInformation(clientOperation, clientService, clientConfigContext);
+            clientServiceContext = Utils.fillContextInformation(clientService, clientConfigContext);
 
 
             Options options = new Options();
@@ -157,7 +156,7 @@
 
             assertNotNull("Result value is null", result);
 
-            assertEquals("Expected result not received.", expected, result);
+            assertEquals("Expected result not received.", value, result);
 
         } catch (AxisFault e) {
             log.error(e, e);

Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java Mon Jan 23 20:16:09 2006
@@ -24,7 +24,7 @@
 import org.apache.axis2.deployment.DeploymentEngine;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
 
 import javax.xml.namespace.QName;
@@ -119,9 +119,9 @@
 
         ConfigurationContext configContext = ConfigurationContextFactory
                 .createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
-        ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
+        AxisModule axisModule = deploymentEngine.buildModule(file,
                                                                     configContext.getAxisConfiguration());
-        configContext.getAxisConfiguration().addModule(moduleDesc);
+        configContext.getAxisConfiguration().addModule(axisModule);
 
         configContext.getAxisConfiguration().addService(service);
 
@@ -136,9 +136,9 @@
         DeploymentEngine deploymentEngine = new DeploymentEngine();
 
         ConfigurationContext configContext = ConfigurationContextFactory .createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
-        ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
+        AxisModule axisModule = deploymentEngine.buildModule(file,
                                                                     configContext.getAxisConfiguration());
-        configContext.getAxisConfiguration().addModule(moduleDesc);
+        configContext.getAxisConfiguration().addModule(axisModule);
         configContext.getAxisConfiguration().engageModule(new QName("addressing"));
         return configContext;
     }
@@ -152,10 +152,10 @@
 
         ConfigurationContext configContext = ConfigurationContextFactory
                 .createConfigurationContextFromFileSystem(clientHome,null);
-        ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
+        AxisModule axisModule = deploymentEngine.buildModule(file,
                                                                     configContext.getAxisConfiguration());
 
-        configContext.getAxisConfiguration().addModule(moduleDesc);
+        configContext.getAxisConfiguration().addModule(axisModule);
         // sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());
 
         configContext.getAxisConfiguration().addService(service);

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/Version.java Mon Jan 23 20:16:09 2006
@@ -16,16 +16,12 @@
 
 package sample.axisversion;
 
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMNamespace;
-
 public class Version {
 
 
-    public String getVersion() {
-          return   "Hello I am Axis2 version service , My version is " + org.apache.axis2.Version.getVersionText();
+    public String getVersion() throws Exception {
+        return "Hello I am Axis2 version service ," +
+                " My version is " + org.apache.axis2.Version.getVersionText();
     }
 
 

Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java Mon Jan 23 20:16:09 2006
@@ -20,7 +20,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisDescription;
-import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.modules.Module;
 
@@ -28,7 +28,7 @@
 
 
     // initialize the module
-    public void init(ConfigurationContext configContext, ModuleDescription module) throws AxisFault {
+    public void init(ConfigurationContext configContext, AxisModule module) throws AxisFault {
     }
 
     public void engageNotify(AxisDescription axisDescription) throws AxisFault {

Modified: webservices/axis2/trunk/java/modules/webapp/EngageToServiceGroup.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/EngageToServiceGroup.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/EngageToServiceGroup.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/EngageToServiceGroup.jsp Mon Jan 23 20:16:09 2006
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=iso-8859-1" language="java" import="org.apache.axis2.Constants,
                                                                              org.apache.axis2.description.AxisServiceGroup,
-                                                                             org.apache.axis2.description.ModuleDescription,
+                                                                             org.apache.axis2.description.AxisModule,
                                                                              java.util.Collection" errorPage="" %>
 <%@ page import="java.util.HashMap"%>
 <%@ page import="java.util.Iterator"%>
@@ -31,7 +31,7 @@
                 <select name="modules">
                     <%
                 for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
-                    ModuleDescription axisOperation = (ModuleDescription) iterator.next();
+                    AxisModule axisOperation = (AxisModule) iterator.next();
                     String modulename = axisOperation.getName().getLocalPart();
             %> <option  align="left" value="<%=modulename%>"><%=modulename%></option>
                     <%

Modified: webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp Mon Jan 23 20:16:09 2006
@@ -39,9 +39,8 @@
                      </tr>
                      <%
                  }
-                HashMap operations =  axisService.getOperations();
-                Collection ops = operations.values();
-                if(ops.size() >0){
+                Iterator operations =  axisService.getOperations();
+                if(operations.hasNext()){
                     %>
                     <tr>
                       <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -55,8 +54,9 @@
                 }
 
                  ArrayList op_paras ;
-                 for (Iterator iterator = ops.iterator(); iterator.hasNext();) {
-                     AxisOperation axisOperation = (AxisOperation) iterator.next();
+                        operations = axisService.getOperations();
+                 for (operations.hasNext()) {
+                     AxisOperation axisOperation = (AxisOperation) operations.next();
                      String operationName = axisOperation.getName().getLocalPart();
                      %>
                      <tr>

Modified: webservices/axis2/trunk/java/modules/webapp/ViewServiceHandlers.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/ViewServiceHandlers.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/ViewServiceHandlers.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/ViewServiceHandlers.jsp Mon Jan 23 20:16:09 2006
@@ -41,10 +41,9 @@
                     getAttribute(Constants.SERVICE_HANDLERS);
              if(axisService != null ){
                  ArrayList handlers ;
-                HashMap operations =  axisService.getOperations();
-                Collection ops = operations.values();
-                 for (Iterator iterator = ops.iterator(); iterator.hasNext();) {
-                     AxisOperation axisOperationon = (AxisOperation) iterator.next();
+                Iterator operations =  axisService.getOperations();
+                 while (operations.hasNext()) {
+                     AxisOperation axisOperationon = (AxisOperation) operations.next();
                      %><h2>Operation Name : <%=axisOperationon.getName().getLocalPart()%></h2><%
                      ArrayList phases = axisOperationon.getRemainingPhasesInFlow();
                  %>

Modified: webservices/axis2/trunk/java/modules/webapp/engagingglobally.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/engagingglobally.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/engagingglobally.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/engagingglobally.jsp Mon Jan 23 20:16:09 2006
@@ -19,7 +19,7 @@
 %>
 
 <%@ page import="org.apache.axis2.Constants,
-                 org.apache.axis2.description.ModuleDescription,
+                 org.apache.axis2.description.AxisModule,
                  java.util.Collection,
                  java.util.HashMap,
                  java.util.Iterator" %>
@@ -44,7 +44,7 @@
                         HashMap moduels = (HashMap) request.getSession().getAttribute(Constants.MODULE_MAP);
                         Collection moduleCol = moduels.values();
                         for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
-                            ModuleDescription axisOperation = (ModuleDescription) iterator.next();
+                            AxisModule axisOperation = (AxisModule) iterator.next();
                             String modulename = axisOperation.getName().getLocalPart();
                     %> <option align="left" value="<%=modulename%>"><%=modulename%></option>
                     <%

Modified: webservices/axis2/trunk/java/modules/webapp/engagingtoanoperation.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/engagingtoanoperation.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/engagingtoanoperation.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/engagingtoanoperation.jsp Mon Jan 23 20:16:09 2006
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=iso-8859-1" language="java" import="org.apache.axis2.Constants,
                                                                              org.apache.axis2.description.AxisOperation,
-                                                                             org.apache.axis2.description.ModuleDescription,
+                                                                             org.apache.axis2.description.AxisModule,
                                                                              java.util.Collection,
                                                                              java.util.HashMap,
                                                                              java.util.Iterator" errorPage="" %>
@@ -28,7 +28,7 @@
                 HashMap moduels = (HashMap)request.getSession().getAttribute(Constants.MODULE_MAP);
                 Collection moduleCol =  moduels.values();
                 for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
-                    ModuleDescription axisOperation = (ModuleDescription) iterator.next();
+                    AxisModule axisOperation = (AxisModule) iterator.next();
                     String modulename = axisOperation.getName().getLocalPart();
             %> <option  align="left" value="<%=modulename%>"><%=modulename%></option>
              <%

Modified: webservices/axis2/trunk/java/modules/webapp/engagingtoaservice.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/engagingtoaservice.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/engagingtoaservice.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/engagingtoaservice.jsp Mon Jan 23 20:16:09 2006
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=iso-8859-1" language="java" import="org.apache.axis2.Constants,
                                                                              org.apache.axis2.description.AxisService,
-                                                                             org.apache.axis2.description.ModuleDescription,
+                                                                             org.apache.axis2.description.AxisModule,
                                                                              java.util.Collection,
                                                                              java.util.HashMap,
                                                                              java.util.Iterator" errorPage="" %>
@@ -28,7 +28,7 @@
                 HashMap moduels = (HashMap)request.getSession().getAttribute(Constants.MODULE_MAP);
                 Collection moduleCol =  moduels.values();
                 for (Iterator iterator = moduleCol.iterator(); iterator.hasNext();) {
-                    ModuleDescription axisOperation = (ModuleDescription) iterator.next();
+                    AxisModule axisOperation = (AxisModule) iterator.next();
                     String modulename = axisOperation.getName().getLocalPart();
             %> <option  align="left" value="<%=modulename%>"><%=modulename%></option>
              <%

Modified: webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp Mon Jan 23 20:16:09 2006
@@ -1,7 +1,7 @@
 <%@ page import="org.apache.axis2.Constants" %>
 <%@ page import="org.apache.axis2.description.AxisOperation" %>
 <%@ page import="org.apache.axis2.description.AxisService" %>
-<%@ page import="org.apache.axis2.description.ModuleDescription" %>
+<%@ page import="org.apache.axis2.description.AxisModule" %>
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Iterator" %>
@@ -23,11 +23,9 @@
     String servicName = request.getParameter("serviceName");
     AxisService axisService = (AxisService) serviceMap.get(servicName);
     if (axisService != null) {
-        HashMap operations;
+        Iterator operations;
         String serviceName ;
-        Collection operationsList;
         operations = axisService.getOperations();
-        operationsList = operations.values();
         serviceName = axisService.getName();
 %><hr>
 
@@ -43,21 +41,22 @@
     <i>Engaged Modules for the axisService</i><ul>
     <%
         for (Iterator iteratorm = engagedModules.iterator(); iteratorm.hasNext();) {
-            ModuleDescription axisOperation = (ModuleDescription) iteratorm.next();
+            AxisModule axisOperation = (AxisModule) iteratorm.next();
             moduleName = axisOperation.getName().getLocalPart();
     %><li><%=moduleName%></li>
     <%
         }%>
 </ul>
     <%}
-        if (operationsList.size() > 0) {
+        if (operations.hasNext()) {
     %><br><i>Available operations</i><%
 } else {
 %><i> There are no operations specified</i><%
     }
 %><ul><%
-    for (Iterator iterator1 = operationsList.iterator(); iterator1.hasNext();) {
-        AxisOperation axisOperation = (AxisOperation) iterator1.next();
+    operations = axisService.getOperations();
+    while (operations.hasNext()) {
+        AxisOperation axisOperation = (AxisOperation) operations.next();
 %><li><%=axisOperation.getName().getLocalPart()%></li>
     <%
         engagedModules = axisOperation.getEngagedModules();
@@ -66,7 +65,7 @@
     <br><i>Engaged Modules for the Operation</i><ul>
     <%
         for (Iterator iterator2 = engagedModules.iterator(); iterator2.hasNext();) {
-            ModuleDescription moduleDecription = (ModuleDescription) iterator2.next();
+            AxisModule moduleDecription = (AxisModule) iterator2.next();
             moduleName = moduleDecription.getName().getLocalPart();
     %><li><%=moduleName%></li><br><%
     }

Modified: webservices/axis2/trunk/java/modules/webapp/listModules.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/listModules.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listModules.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listModules.jsp Mon Jan 23 20:16:09 2006
@@ -24,7 +24,7 @@
  */
         %>
 <%@ page import="org.apache.axis2.Constants,
-                 org.apache.axis2.description.ModuleDescription,
+                 org.apache.axis2.description.AxisModule,
                  java.util.Collection"%>
  <%@ page import="java.util.Enumeration"%>
  <%@ page import="java.util.HashMap"%>
@@ -43,7 +43,7 @@
              Collection moduleNames = moduleMap.values();
              for (Iterator iterator = moduleNames.iterator(); iterator.hasNext();) {
                  foundModules = true;
-                 ModuleDescription  moduleQName = (ModuleDescription) iterator.next();
+                 AxisModule  moduleQName = (AxisModule) iterator.next();
                  modulename = moduleQName.getName().getLocalPart();
 		if (!wroteUL){
 			wroteUL = true;

Modified: webservices/axis2/trunk/java/modules/webapp/listService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/listService.jsp?rev=371801&r1=371800&r2=371801&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listService.jsp Mon Jan 23 20:16:09 2006
@@ -1,7 +1,7 @@
 <%@ page import="org.apache.axis2.Constants,
                  org.apache.axis2.description.AxisOperation"%>
 <%@ page import="org.apache.axis2.description.AxisService"%>
-<%@ page import="org.apache.axis2.description.ModuleDescription"%>
+<%@ page import="org.apache.axis2.description.AxisModule"%>
 <%@ page import="java.util.Collection"%>
 <%@ page import="java.util.Enumeration"%>
 <%@ page import="java.util.HashMap"%>
@@ -46,14 +46,12 @@
          Hashtable errornessservice =(Hashtable)request.getSession().getAttribute(Constants.ERROR_SERVICE_MAP);
          boolean status = false;
          if (serviceMap!=null && !serviceMap.isEmpty()){
-             HashMap operations;
+             Iterator operations;
              String serviceName ;
              Collection servicecol = serviceMap.values();
-             Collection operationsList;
              for (Iterator iterator = servicecol.iterator(); iterator.hasNext();) {
                  AxisService axisService = (AxisService) iterator.next();
                  operations = axisService.getOperations();
-                 operationsList = operations.values();
                  serviceName = axisService.getName();
      %><h2><font color="blue"><a href="<%=prifix + axisService.getName()%>?wsdl"><%=serviceName%></a></font></h2>
      <font color="blue">Service EPR : <font color="black"><%=prifix + axisService.getName()%></font>
@@ -67,7 +65,7 @@
            <i>Engaged modules for the service</i>
                 <%
                      for (Iterator iteratorm = engagedModules.iterator(); iteratorm.hasNext();) {
-                         ModuleDescription axisOperation = (ModuleDescription) iteratorm.next();
+                         AxisModule axisOperation = (AxisModule) iteratorm.next();
                          moduleName = axisOperation.getName().getLocalPart();
 			if (!modules_present) {
 				modules_present=true;
@@ -82,14 +80,15 @@
 				</ul>
 			<%}
                  }
-                 if (operationsList.size() > 0) {
+                 if (operations.hasNext()) {
                 %><br><i>Available operations</i><%
                  } else {
                 %><i> There are no Operations specified</i><%
                  }
                 %><ul><%
-                 for (Iterator iterator1 = operationsList.iterator(); iterator1.hasNext();) {
-                     AxisOperation axisOperation = (AxisOperation) iterator1.next();
+         operations = axisService.getOperations();
+                 while (operations.hasNext()) {
+                     AxisOperation axisOperation = (AxisOperation) operations.next();
                 %><li><%=axisOperation.getName().getLocalPart()%></li>
 <%--                 <br>Operation EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
                  <%
@@ -99,7 +98,7 @@
                 <br><i>Engaged Modules for the Operation</i><ul>
                 <%
                          for (Iterator iterator2 = engagedModules.iterator(); iterator2.hasNext();) {
-                             ModuleDescription moduleDecription = (ModuleDescription) iterator2.next();
+                             AxisModule moduleDecription = (AxisModule) iterator2.next();
                              moduleName = moduleDecription.getName().getLocalPart();
                 %><li><%=moduleName%></li><br><%
                          }



Mime
View raw message