You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/03/20 05:33:24 UTC

svn commit: r387135 [1/2] - in /webservices/axis2/trunk/java: modules/core/src/org/apache/axis2/ modules/core/src/org/apache/axis2/context/ modules/core/src/org/apache/axis2/deployment/ modules/core/src/org/apache/axis2/deployment/repository/util/ modu...

Author: deepal
Date: Sun Mar 19 20:33:20 2006
New Revision: 387135

URL: http://svn.apache.org/viewcvs?rev=387135&view=rev
Log:
-fixed the problem of removing module operations
-exclude operations done
-fixing webapp JIRAs
-removed un used methods
-clone operation chain as well in Dispatching phase
-cookie handling

Added:
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/services/
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/services/excludeService/
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/services/excludeService/META-INF/
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/services/excludeService/META-INF/services.xml
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ExcludeService.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/OperationExcludeTest.java
    webservices/axis2/trunk/java/modules/webapp/ActivateService.jsp
    webservices/axis2/trunk/java/modules/webapp/InActivateService.jsp
      - copied, changed from r386841, webservices/axis2/trunk/java/modules/webapp/RemoveService.jsp
Removed:
    webservices/axis2/trunk/java/modules/webapp/RemoveService.jsp
    webservices/axis2/trunk/java/modules/webapp/happy_axis.jsp
Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.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/DeploymentConstants.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/ServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.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/deployment/util/PhasesInfo.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/AxisService2WOM.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/AxisEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseMetadata.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
    webservices/axis2/trunk/java/modules/webapp/LeftFrame.jsp
    webservices/axis2/trunk/java/modules/webapp/ViewContexts.jsp
    webservices/axis2/trunk/java/modules/webapp/conf/web.xml
    webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp
    webservices/axis2/trunk/java/modules/webapp/listService.jsp
    webservices/axis2/trunk/java/modules/webapp/listServices.jsp
    webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp
    webservices/axis2/trunk/java/xdocs/latest/userguide3.html

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Sun Mar 19 20:33:20 2006
@@ -133,7 +133,8 @@
     public static final String SERVICE_GROUP_MAP = "serviceGroupmap";
     public static final String SERVICE = "service";
     public static final String SELECT_SERVICE_TYPE = "SELECT_SERVICE_TYPE";
-    public static final String REMOVE_SERVICE = "removeService";
+    public static final String IN_ACTIVATE_SERVICE = "inActivateService";
+    public static final String ACTIVATE_SERVICE = "activateService";
     public static final String PHASE_LIST = "phaseList";
     public static final String PASSWORD = "password";
     public static final String OPERATION_MAP = "operationmap";

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=387135&r1=387134&r2=387135&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 Sun Mar 19 20:33:20 2006
@@ -38,16 +38,12 @@
     private EndpointReference myEPR;
 
     private transient AxisService axisService;
-    private String serviceInstanceID;
     private ServiceGroupContext serviceGroupContext;
 
     public ServiceContext(AxisService serviceConfig, ServiceGroupContext serviceGroupContext) {
         super(serviceGroupContext);
         this.serviceGroupContext = serviceGroupContext;
         this.axisService = serviceConfig;
-        if (serviceConfig != null) {
-            serviceInstanceID = serviceConfig.getName();
-        }
     }
 
     public OperationContext createOperationContext(QName name) {
@@ -62,24 +58,6 @@
 
     public ConfigurationContext getConfigurationContext() {
         return (ConfigurationContext) parent.getParent();
-    }
-
-    /**
-     * @return Returns the serviceInstanceID.
-     */
-    public String getServiceInstanceID() {
-        return serviceInstanceID;
-    }
-
-    /**
-     * Sets service instance id.
-     *
-     * @param serviceInstanceID
-     */
-    public void setServiceInstanceID(String serviceInstanceID) {
-
-        // todo we do not need this , this ID should equal to serviceName
-        this.serviceInstanceID = serviceInstanceID;
     }
 
     public ServiceGroupContext getServiceGroupContext() {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Sun Mar 19 20:33:20 2006
@@ -51,6 +51,7 @@
     String TAG_PHASE_FIRST = "phaseFirst";
     String TAG_ORDER = "order";           // to resolve the order tag
     String TAG_OPERATION = "operation";       // operation start tag
+    String TAG_EXCLUDE_OPERATIONS="excludeOperations";
     String TAG_MESSAGE_RECEIVER = "messageReceiver";
     String TAG_MESSAGE_RECEIVERS = "messageReceivers";
     String TAG_TRANSPORTS = "transports";

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=387135&r1=387134&r2=387135&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 Sun Mar 19 20:33:20 2006
@@ -31,7 +31,6 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.modules.Module;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -296,16 +295,18 @@
     }
 
     /**
-     * Builds ModuleDescription for a given module archive file.
-     *
-     * @param modulearchive
-     * @return Returns ModuleDescription.
+     * Builds ModuleDescription for a given module archive file. This does not
+     * called the init method since there is no refernce to configuration context
+     * so who ever create module usieng this has to called module.init if it is
+     * required
+     * @param modulearchive  : Actual module archive file
+     * @param config : AxisConfiguration : for get classs loders etc..
+     * @return
      * @throws DeploymentException
      */
     public AxisModule buildModule(File modulearchive, AxisConfiguration config)
             throws DeploymentException {
         AxisModule axismodule;
-
         try {
             this.setPhasesinfo(config.getPhasesInfo());
             currentArchiveFile = new ArchiveFileData(modulearchive, TYPE_MODULE);
@@ -340,15 +341,6 @@
             if (faultOutFlow != null) {
                 Utils.addFlowHandlers(faultOutFlow, moduleClassLoader);
             }
-
-            //initilization Module
-            Module module = axismodule.getModule();
-
-            if (module != null) {
-                //TODO : Need to fix this , I just comment this to remove compile errors
-//                module.init(axisConfig, null);
-            }
-
         } catch (AxisFault axisFault) {
             throw new DeploymentException(axisFault);
         }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Sun Mar 19 20:33:20 2006
@@ -20,6 +20,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.deployment.util.PhasesInfo;
+import org.apache.axis2.deployment.util.Utils;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
@@ -62,6 +63,17 @@
             // Processing service level parameters
             Iterator itr = service_element.getChildrenWithName(new QName(TAG_PARAMETER));
             processParameters(itr, service, service.getParent());
+
+            // Generating schema for the service if the imple class is JAVA
+            if (!service.isWsdlfound()) {
+                //trying to generate WSDL for the service using JAM  and Java refelection
+                try {
+                    Utils.fillAxisService(service, axisConfig);
+                } catch (Exception e) {
+                    log.info(Messages.getMessage("errorinscheamgen", e.getMessage()));
+                }
+            }
+
             // process service description
             OMElement descriptionElement =
                     service_element.getFirstChildWithName(new QName(TAG_DESCRIPTION));
@@ -175,10 +187,16 @@
                     String mapping = (String) wsamappings.get(j);
                     service.mapActionToOperation(mapping, operationDesc);
                 }
-
                 service.addOperation(operationDesc);
             }
 
+            //Removing exclude operations
+            OMElement excludeOperations = service_element.getFirstChildWithName(
+                    new QName(TAG_EXCLUDE_OPERATIONS));
+            if (excludeOperations != null) {
+                processExcludeOperations(excludeOperations);
+            }
+
             // Set the default message receiver for the operations that were 
             // not listed in the services.xml
             Iterator operations = service.getPublishedOperations().iterator();
@@ -199,6 +217,25 @@
                             DeploymentErrorMsgs.OPERATION_PROCESS_ERROR, axisFault.getMessage()));
         }
         return service;
+    }
+
+    /**
+     * If there is <excludeOperations>
+     * <operation>foo</operation>
+     * </excludeOperations>
+     * <p/>
+     * Then the operation object will be removed from the AxisService , so that
+     * the operation wont be exposed
+     *
+     * @param exculeOperations
+     */
+    private void processExcludeOperations(OMElement exculeOperations) {
+        Iterator excludeOp_itr = exculeOperations.getChildrenWithName(new QName(TAG_OPERATION));
+        while (excludeOp_itr.hasNext()) {
+            OMElement opName = (OMElement) excludeOp_itr.next();
+            service.removeOeration(new QName(opName.getText()));
+            log.info("removed the operation:" + opName.getText());
+        }
     }
 
     private void processMessages(Iterator messages, AxisOperation operation)

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Sun Mar 19 20:33:20 2006
@@ -92,14 +92,6 @@
 
                     ServiceBuilder serviceBuilder = new ServiceBuilder(axisConfig, axisService);
                     AxisService as = serviceBuilder.populateService(service);
-                    if (!as.isWsdlfound()) {
-                        //trying to generate WSDL for the service using JAM  and Java refelection
-                        try {
-                            Utils.fillAxisService(as,axisConfig);
-                        } catch (Exception e) {
-                            log.info("Error in schema generating :" + e.getMessage());
-                        }
-                    }
                     serviceList.add(as);
                 }
             }

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=387135&r1=387134&r2=387135&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 Sun Mar 19 20:33:20 2006
@@ -73,15 +73,6 @@
             AxisService service = serviceBuilder.populateService(rootElement);
 
             ArrayList serviceList = new ArrayList();
-
-            if (!axisService.isWsdlfound()) {
-                //trying to generate WSDL for the service using JAM  and Java refelection
-                try {
-                    Utils.fillAxisService(service, axisConfig);
-                } catch (Exception e) {
-                    log.info(Messages.getMessage("errorinscheamgen", e.getMessage()));
-                }
-            }
             serviceList.add(service);
             return serviceList;
         } else if (TAG_SERVICE_GROUP.equals(elementName)) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java Sun Mar 19 20:33:20 2006
@@ -207,10 +207,8 @@
             Phase phase = (Phase) OUTPhases.get(i);
             String phaseName = phase.getPhaseName();
 
-            if (PhaseMetadata.PHASE_POLICY_DETERMINATION.equals(phaseName)
-                    || PhaseMetadata.PHASE_MESSAGE_OUT.equals(phaseName)) {
-                // todo pls check this
-            } else {
+            if (!(PhaseMetadata.PHASE_POLICY_DETERMINATION.equals(phaseName)
+                    || PhaseMetadata.PHASE_MESSAGE_OUT.equals(phaseName))) {
                 oprationOUTPhases.add(copyPhase(phase));
             }
         }

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=387135&r1=387134&r2=387135&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 Sun Mar 19 20:33:20 2006
@@ -144,10 +144,20 @@
                         phaseResolver.disEngageModulefromGlobalChains(module);
                     }
                     phaseResolver.disEngageModulefromOperationChian(module, this);
+                    //removing operations added at the time of module engagemnt
+                    HashMap moduleOperations = module.getOperations();
+                    if (moduleOperations != null) {
+                        Iterator moduleOperations_itr = moduleOperations.values().iterator();
+                        while (moduleOperations_itr.hasNext()) {
+                            AxisOperation operation = (AxisOperation) moduleOperations_itr.next();
+                            service.removeOeration(operation.getName());
+                        }
+                    }
                 }
             }
             engagedModules.remove(module);
-            log.info("remove mdoule from engage module list " + module.getName().getLocalPart());
+            log.info("remove mdoule from engage module list "
+                    + module.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=387135&r1=387134&r2=387135&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 Sun Mar 19 20:33:20 2006
@@ -826,6 +826,7 @@
         if (axisConfig != null) {
             PhaseResolver phaseResolver = new PhaseResolver(axisConfig);
             if (axisConfig.isEngaged(module.getName())) {
+                removeModuleOperations(module);
                 Iterator operations = getChildren();
                 while (operations.hasNext()) {
                     AxisOperation axisOperation = (AxisOperation) operations.next();
@@ -835,6 +836,7 @@
             } else {
                 if (isEngaged(module.getName())) {
                     phaseResolver.disEngageModulefromGlobalChains(module);
+                    removeModuleOperations(module);
                     Iterator operations = getChildren();
                     while (operations.hasNext()) {
                         AxisOperation axisOperation = (AxisOperation) operations.next();
@@ -847,6 +849,20 @@
         engagedModules.remove(module);
     }
 
+    /**
+     * To remove module operations added at the time of engagement
+     */
+    private void removeModuleOperations(AxisModule module) {
+        HashMap moduleOerations = module.getOperations();
+        if (moduleOerations != null) {
+            Iterator moduleOperations_itr = moduleOerations.values().iterator();
+            while (moduleOperations_itr.hasNext()) {
+                AxisOperation operation = (AxisOperation) moduleOperations_itr.next();
+                removeOeration(operation.getName());
+            }
+        }
+    }
+
     public boolean isEngaged(QName moduleName) {
         Iterator engagedModuleItr = engagedModules.iterator();
         while (engagedModuleItr.hasNext()) {
@@ -1067,5 +1083,20 @@
 
         return createService(implClass, axisConfig, clazz);
 
+    }
+
+    public void removeOeration(QName opName) {
+        AxisOperation operation = getOperation(opName);
+        if (operation != null) {
+            removeChild(opName);
+            ArrayList mappingList = operation.getWsamappingList();
+            if (mappingList != null) {
+                for (int i = 0; i < mappingList.size(); i++) {
+                    String actionMapping = (String) mappingList.get(i);
+                    operationsAliasesMap.remove(actionMapping);
+                }
+            }
+            operationsAliasesMap.remove(operation.getName().getLocalPart());
+        }
     }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java Sun Mar 19 20:33:20 2006
@@ -340,7 +340,6 @@
                 SOAPBody requestSoapbody = (SOAPBody) extensionFactory
                         .getExtensionElement(ExtensionConstants.SOAP_11_BODY);
                 requestSoapbody.setUse(use);
-                // TODO need to fix this
                 requestSoapbody.setNamespaceURI(namespeceURI);
                 bindingInMessage.addExtensibilityElement(requestSoapbody);
 

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=387135&r1=387134&r2=387135&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 Sun Mar 19 20:33:20 2006
@@ -401,23 +401,17 @@
 
         public void run() {
             try {
-
                 // send the request and wait for reponse
                 MessageContext response = send(msgctx);
-
                 // call the callback
                 SOAPEnvelope resenvelope = response.getEnvelope();
-                resenvelope.build();
                 SOAPBody body = resenvelope.getBody();
-
                 if (body.hasFault()) {
                     Exception ex = body.getFault().getException();
 
                     if (ex != null) {
                         callback.onError(ex);
                     } else {
-
-                        // todo this needs to be fixed
                         callback.onError(new Exception(body.getFault()
                                 .getReason().getText()));
                     }

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=387135&r1=387134&r2=387135&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 Sun Mar 19 20:33:20 2006
@@ -607,7 +607,7 @@
     }
 
     public Object getKey() {
-        return getAxis2HomeDirectory(); // TODO CheckMe
+        return toString();
     }
 
     public void stopService(String serviceName) throws AxisFault {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Sun Mar 19 20:33:20 2006
@@ -64,24 +64,18 @@
     }
 
     private void checkMustUnderstand(MessageContext msgContext) throws AxisFault {
-        // todo : need to move this to pre-condition of the MessageReceiver Phase
         SOAPEnvelope se = msgContext.getEnvelope();
-
         if (se.getHeader() == null) {
             return;
         }
-
         Iterator hbs = se.getHeader().examineAllHeaderBlocks();
-
         while (hbs.hasNext()) {
             SOAPHeaderBlock hb = (SOAPHeaderBlock) hbs.next();
-
             // if this header block has been processed or mustUnderstand isn't
             // turned on then its cool
             if (hb.isProcessed() || !hb.getMustUnderstand()) {
                 continue;
             }
-
             // if this header block is not targetted to me then its not my
             // problem. Currently this code only supports the "next" role; we
             // need to fix this to allow the engine/service to be in one or more
@@ -419,7 +413,6 @@
             msgContext.setCurrentHandlerIndex(0);
         }
         while (msgContext.getCurrentHandlerIndex() < msgContext.getExecutionChain().size()) {
-            //todo : This might cause for performance drawback
             Handler currentHandler = (Handler) msgContext.getExecutionChain().
                     get(msgContext.getCurrentHandlerIndex());
             currentHandler.invoke(msgContext);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java Sun Mar 19 20:33:20 2006
@@ -45,7 +45,7 @@
         } else if (msgContext.getAxisOperation() == null) {
             throw new AxisFault(Messages.getMessage("operationnotfoundforepr",
                     ((toEPR != null) ? toEPR.getAddress()
-                    : ""), msgContext.getWSAAction()));
+                            : ""), msgContext.getWSAAction()));
         }
 
         validateTransport(msgContext);
@@ -64,11 +64,8 @@
         if ((msgContext.getAxisService() == null) && (msgContext.getServiceContext() != null)) {
             msgContext.setAxisService(msgContext.getServiceContext().getAxisService());
         }
-
-        // TODO : do post-dispatch execution chain setup...
         ArrayList operationChain = msgContext.getAxisOperation().getRemainingPhasesInFlow();
-
-        msgContext.setExecutionChain(operationChain);
+        msgContext.setExecutionChain((ArrayList) operationChain.clone());
     }
 
     /**
@@ -92,7 +89,7 @@
             }
         }
         EndpointReference toEPR = msgctx.getTo();
-       throw new AxisFault(Messages.getMessage("servicenotfoundforepr",
-                    ((toEPR != null) ? toEPR.getAddress() : "")));
+        throw new AxisFault(Messages.getMessage("servicenotfoundforepr",
+                ((toEPR != null) ? toEPR.getAddress() : "")));
     }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseMetadata.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseMetadata.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseMetadata.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseMetadata.java Sun Mar 19 20:33:20 2006
@@ -38,10 +38,5 @@
     public static final String PHASE_DISPATCH = "Dispatch";
     public static final String PHASE_TRANSPORT_OUT = "TransportOut";
 
-    /**
-     * todo  I think thi shas to be change
-     * All the handlers inside transportsender and TranportRecievre in axis2.xml gose
-     * to this phase
-     */
     public static final String TRANSPORT_PHASE = "TRANSPORT";
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Sun Mar 19 20:33:20 2006
@@ -227,7 +227,7 @@
             ServletContext context = config.getServletContext();
             String repoDir = context.getRealPath("/WEB-INF");
             //adding weblocation property
-//            setWebLocationProperty(context);
+            setWebLocationProperty(context);
             ConfigurationContext configContext =
                     ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoDir, null);
             configContext.setProperty(Constants.CONTAINER_MANAGED, Constants.VALUE_TRUE);
@@ -318,7 +318,6 @@
         //RUNNING_PORT
         String port = System.getProperty(ListingAgent.RUNNING_PORT);
         if (port == null) {
-            // TODO : Need to fix this
             port = "8080";
         }
         return new EndpointReference("http://" + ip + ":" + port + "/axis2/services/" + serviceName);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Sun Mar 19 20:33:20 2006
@@ -47,7 +47,8 @@
     private static final String LIST_SERVICE_GROUP_JSP = "ListServiceGroup.jsp";
     private static final String LIST_SERVICES_JSP_NAME = "listService.jsp";
     private static final String SELECT_SERVICE_JSP_NAME = "SelectService.jsp";
-    private static final String REMOVE_SERVICE_JSP_NAME = "RemoveService.jsp";
+    private static final String IN_ACTIVATE_SERVICE_JSP_NAME = "InActivateService.jsp";
+    private static final String ACTIVATE_SERVICE_JSP_NAME = "ActivateService.jsp";
 
     /**
      * Field LIST_SINGLE_SERVICE_JSP_NAME
@@ -357,8 +358,12 @@
             engageModulesToOperation(httpServletRequest, httpServletResponse);
 
             return;
-        } else if ((filePart != null) && filePart.endsWith(Constants.REMOVE_SERVICE)) {
-            removeService(httpServletRequest, httpServletResponse);
+        } else if ((filePart != null) && filePart.endsWith(Constants.IN_ACTIVATE_SERVICE)) {
+            inActivateService(httpServletRequest, httpServletResponse);
+
+            return;
+        } else if ((filePart != null) && filePart.endsWith(Constants.ACTIVATE_SERVICE)) {
+            activateService(httpServletRequest, httpServletResponse);
 
             return;
         } else if ((filePart != null)
@@ -545,32 +550,40 @@
         res.sendRedirect(SELECT_SERVICE_JSP_NAME);
     }
 
-    private void removeService(HttpServletRequest req, HttpServletResponse res) throws IOException {
+    private void activateService(HttpServletRequest req, HttpServletResponse res) throws IOException {
         if (req.getParameter("submit") != null) {
-            String serviceName = req.getParameter("service");
-            String turnoff = req.getParameter("turnoff");
-
+            String serviceName = req.getParameter("axisService");
+            String turnon = req.getParameter("turnon");
             if (serviceName != null) {
-                if (turnoff != null) {
-                    configContext.getAxisConfiguration().removeService(serviceName);
-                    res.setContentType("text/css");
-
-                    PrintWriter out_writer = new PrintWriter(out);
+                if (turnon != null) {
+                    AxisService service = configContext.getAxisConfiguration().getServiceForActivation(serviceName);
+                    service.setActive(true);
+                }
+            }
+        } else {
+            HashMap services = configContext.getAxisConfiguration().getServices();
+            req.getSession().setAttribute(Constants.SERVICE_MAP, services);
+        }
 
-                    out_writer.println("Service removed from the system Successfully");
-                    out_writer.flush();
-                    out_writer.close();
+        res.sendRedirect(ACTIVATE_SERVICE_JSP_NAME);
+    }
 
-                    return;
+    private void inActivateService(HttpServletRequest req, HttpServletResponse res) throws IOException {
+        if (req.getParameter("submit") != null) {
+            String serviceName = req.getParameter("axisService");
+            String turnoff = req.getParameter("turnoff");
+            if (serviceName != null) {
+                if (turnoff != null) {
+                    AxisService service = configContext.getAxisConfiguration().getService(serviceName);
+                    service.setActive(false);
                 }
             }
         } else {
             HashMap services = configContext.getAxisConfiguration().getServices();
-
             req.getSession().setAttribute(Constants.SERVICE_MAP, services);
         }
 
-        res.sendRedirect(REMOVE_SERVICE_JSP_NAME);
+        res.sendRedirect(IN_ACTIVATE_SERVICE_JSP_NAME);
     }
 
     private void selectService(HttpServletRequest req, HttpServletResponse res) throws IOException {

Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/services/excludeService/META-INF/services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/services/excludeService/META-INF/services.xml?rev=387135&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/services/excludeService/META-INF/services.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/exculeRepo/services/excludeService/META-INF/services.xml Sun Mar 19 20:33:20 2006
@@ -0,0 +1,6 @@
+<service>
+    <parameter name="ServiceClass">org.apache.axis2.deployment.ExcludeService</parameter>
+    <excludeOperations>
+        <operation>add</operation>
+    </excludeOperations>
+</service>
\ No newline at end of file

Added: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ExcludeService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ExcludeService.java?rev=387135&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ExcludeService.java (added)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ExcludeService.java Sun Mar 19 20:33:20 2006
@@ -0,0 +1,34 @@
+package org.apache.axis2.deployment;
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*
+*/
+
+public class ExcludeService {
+    public int add(int a, int b) {
+        return a + b;
+    }
+
+    public int deduc(int a, int b) {
+        return a - b;
+    }
+
+    public int devide(int a, int b) {
+        return a / b;
+    }
+
+}
+

Added: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/OperationExcludeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/OperationExcludeTest.java?rev=387135&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/OperationExcludeTest.java (added)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/OperationExcludeTest.java Sun Mar 19 20:33:20 2006
@@ -0,0 +1,47 @@
+package org.apache.axis2.deployment;
+
+import junit.framework.TestCase;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.phaseresolver.PhaseException;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*
+*/
+
+public class OperationExcludeTest extends TestCase {
+    AxisConfiguration er;
+
+    public void testExcludeOperations() throws PhaseException,
+            DeploymentException,
+            AxisFault,
+            XMLStreamException {
+        String filename = "./test-resources/deployment/exculeRepo";
+        er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, null)
+                .getAxisConfiguration();
+        AxisService service = er.getService("excludeService");
+        assertNotNull(service);
+        assertNotNull(service.getOperation(new QName("deduc")));
+        assertNull(service.getOperation(new QName("add")));
+    }
+
+}
+

Added: webservices/axis2/trunk/java/modules/webapp/ActivateService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/ActivateService.jsp?rev=387135&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/ActivateService.jsp (added)
+++ webservices/axis2/trunk/java/modules/webapp/ActivateService.jsp Sun Mar 19 20:33:20 2006
@@ -0,0 +1,51 @@
+<%@ page import="org.apache.axis2.Constants,
+                 org.apache.axis2.description.AxisService,
+                 java.util.Collection,
+                 java.util.HashMap,
+                 java.util.Iterator"%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:include page="include/adminheader.jsp"></jsp:include>
+<h1>Turn off axisService</h1>
+<form method="get" name="serviceActivate" action="activateService">
+  <table width="100%"  border="0">
+<tr>
+  <td colspan="2" >
+     <p>The axisService will be marked as active , and only display the inactive services</p>
+<%--    <b>Remove Service :</b> The selected axisService will be removed from the file system and if the--%>
+<%--    &nbsp; system restart it wont be there next time--%>
+  </td>
+  </tr>
+  <tr>
+    <td width="20%"> Select Service : </td>
+    <td width="80%">
+       <select name="axisService" class="selectBoxes" >
+
+                           <%
+                       HashMap services = (HashMap)request.getSession().getAttribute(Constants.SERVICE_MAP);
+                       Collection col = services.values();
+                       for (Iterator iterator = col.iterator(); iterator.hasNext();) {
+                           AxisService axisServices = (AxisService) iterator.next();
+                           if(!axisServices.isActive()){
+                               %> <option value="<%=axisServices.getName()%>">
+                           <%=axisServices.getName()%></option> <%
+                           }
+                       }
+                           %>
+                  </td>
+  </tr>
+  <tr>
+    <td width="20%">Activate Service </td>
+    <td width="80%"><input type="checkbox" name="turnon">
+    </td>
+  </tr>
+  <tr>
+  <td>&nbsp;</td>
+  <td>
+    <input name="submit" type="submit" value=" Activate " >
+   <input name="reset" type="reset" value=" Clear " >
+  </td>
+  </tr>
+
+</table>
+</form>
+<jsp:include page="include/adminfooter.jsp"></jsp:include>

Copied: webservices/axis2/trunk/java/modules/webapp/InActivateService.jsp (from r386841, webservices/axis2/trunk/java/modules/webapp/RemoveService.jsp)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/InActivateService.jsp?p2=webservices/axis2/trunk/java/modules/webapp/InActivateService.jsp&p1=webservices/axis2/trunk/java/modules/webapp/RemoveService.jsp&r1=386841&r2=387135&rev=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/RemoveService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/InActivateService.jsp Sun Mar 19 20:33:20 2006
@@ -6,11 +6,11 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <jsp:include page="include/adminheader.jsp"></jsp:include>
 <h1>Turn off axisService</h1>
-<form method="get" name="serviceRemove" action="removeService">
+<form method="get" name="serviceInActivate" action="inActivateService">
   <table width="100%"  border="0">
 <tr>
   <td colspan="2" >
-     <p>The axisService will be removed the from the running system, but if the system restarts then the axisService will be available again</p>
+     <p>The axisService will be marked as in active , but if the system restarts then the axisService will be active again</p>
 <%--    <b>Remove Service :</b> The selected axisService will be removed from the file system and if the--%>
 <%--    &nbsp; system restart it wont be there next time--%>
   </td>
@@ -25,21 +25,23 @@
                        Collection col = services.values();
                        for (Iterator iterator = col.iterator(); iterator.hasNext();) {
                            AxisService axisServices = (AxisService) iterator.next();
-                   %> <option value="<%=axisServices.getName()%>">
+                           if(axisServices.isActive()){
+                               %> <option value="<%=axisServices.getName()%>">
                            <%=axisServices.getName()%></option> <%
+                           }
                        }
                            %>
                   </td>
   </tr>
   <tr>
-    <td width="20%">Turn Off Service </td>
+    <td width="20%">In activate Service </td>
     <td width="80%"><input type="checkbox" name="turnoff">
     </td>
   </tr>
   <tr>
   <td>&nbsp;</td>
   <td>
-    <input name="submit" type="submit" value=" Save " >
+    <input name="submit" type="submit" value=" InActivate " >
    <input name="reset" type="reset" value=" Clear " >
   </td>
   </tr>

Modified: webservices/axis2/trunk/java/modules/webapp/LeftFrame.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/LeftFrame.jsp?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/LeftFrame.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/LeftFrame.jsp Sun Mar 19 20:33:20 2006
@@ -154,7 +154,15 @@
        &nbsp;&nbsp;&nbsp;&nbsp;
        </td>
        <td>
-         <a href="removeService">Undeploy Service</a>
+         <a href="inActivateService">In Activate Service</a>
+       </td>
+    </tr>
+    <tr>
+       <td>
+       &nbsp;&nbsp;&nbsp;&nbsp;
+       </td>
+       <td>
+         <a href="activateService">Activate Service</a>
        </td>
     </tr>
     <tr>

Modified: webservices/axis2/trunk/java/modules/webapp/ViewContexts.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/ViewContexts.jsp?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/ViewContexts.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/ViewContexts.jsp Sun Mar 19 20:33:20 2006
@@ -36,7 +36,7 @@
             %><ul><%
         while (serviceContextItr.hasNext()) {
             ServiceContext serviceContext = (ServiceContext)serviceContextItr.next();
-             String serviceConID = serviceContext.getServiceInstanceID();
+             String serviceConID = serviceContext.getAxisService().getName();
         %>
             <li><%=serviceConID%><font color="blue"><a href="viewServiceContext.jsp?TYPE=VIEW&ID=<%=serviceConID%>&PID=<%=groupContextID%>">
                     View</a></font></li>

Modified: webservices/axis2/trunk/java/modules/webapp/conf/web.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/conf/web.xml?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/conf/web.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/conf/web.xml Sun Mar 19 20:33:20 2006
@@ -86,7 +86,11 @@
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>AxisServlet</servlet-name>
-        <url-pattern>/removeService</url-pattern>
+        <url-pattern>/inActivateService</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>AxisServlet</servlet-name>
+        <url-pattern>/activateService</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>AxisServlet</servlet-name>

Modified: webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp Sun Mar 19 20:33:20 2006
@@ -33,6 +33,7 @@
 </font></h2>
 <font color="blue">Service EPR : <font color="black"><%=prifix + axisService.getName()%></font>
     <h4>Service Description : <font color="black"><%=axisService.getServiceDescription()%></h4>
+    <i><font color="blue">Service Status : <%=axisService.isActive()?"Active":"InActive"%></font></i></br>
     <%
         Collection engagedModules = axisService.getEngagedModules();
         String moduleName;

Modified: webservices/axis2/trunk/java/modules/webapp/listService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/listService.jsp?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listService.jsp Sun Mar 19 20:33:20 2006
@@ -56,6 +56,7 @@
      %><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>
      <h4>Service Description : <font color="black"><%=axisService.getServiceDescription()%></h4>
+     <i><font color="blue">Service Status : <%=axisService.isActive()?"Active":"InActive"%></font></i></br>
            <%
                  Collection engagedModules = axisService.getEngagedModules();
                  String moduleName;

Modified: webservices/axis2/trunk/java/modules/webapp/listServices.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/listServices.jsp?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listServices.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listServices.jsp Sun Mar 19 20:33:20 2006
@@ -55,7 +55,8 @@
             %><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>
            <h4>Service Description : <font color="black"><%=axisService.getServiceDescription()%></h4>
-           <%
+            <i><font color="blue">Service Status : <%=axisService.isActive()?"Active":"InActive"%></font></i></br>
+               <%
             if (opItr.hasNext()) {
                 %><i>Available operations</i><%
             } else {

Modified: webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp?rev=387135&r1=387134&r2=387135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp Sun Mar 19 20:33:20 2006
@@ -37,6 +37,7 @@
             %><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>
            <h4>Service Description : <font color="black"><%=axisService.getServiceDescription()%></h4>
+           <i><font color="blue">Service Status : <%=axisService.isActive()?"Active":"InActive"%></font></i></br>
            <%
             if (opItr.hasNext()) {
                 %><i>Available operations</i><%