You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2005/08/31 10:38:03 UTC

svn commit: r264973 [1/3] - in /webservices/axis2/trunk/java/modules: addressing/test-resources/ core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/description/ core/src/org/apache/axis2/engine/ core/src/org/apache/axis2/storage/impl/ core...

Author: deepal
Date: Wed Aug 31 01:36:25 2005
New Revision: 264973

URL: http://svn.apache.org/viewcvs?rev=264973&view=rev
Log:
Fixing AXIS2-196
(Not complete need to write test case)

Modified:
    webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.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/DescriptionBuilder.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/ServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/HandlerDescription.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterImpl.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.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/AxisConfigurationImpl.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisMemoryStorage.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadConfigOrderChange/axis2.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadServer.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadService.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/Badmodule.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/ConfigWithObservers/axis2.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/SystemPhaseRemove/axis2.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/echo/META-INF/service.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/invalidservice/META-INF/service.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/service.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1/META-INF/service.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2.xml
    webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2/META-INF/service.xml
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chuncking-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
    webservices/axis2/trunk/java/modules/samples/conf/service.xml
    webservices/axis2/trunk/java/modules/samples/conf/service4withhandler.xml
    webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/service.xml
    webservices/axis2/trunk/java/modules/samples/src/sample/groovy/META-INF/service.xml
    webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/META-INF/service.xml
    webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/META-INF/service.xml
    webservices/axis2/trunk/java/modules/samples/src/userguide/example1/META-INF/service.xml
    webservices/axis2/trunk/java/modules/samples/src/userguide/example2/META-INF/service.xml
    webservices/axis2/trunk/java/modules/security/interop/service.xml
    webservices/axis2/trunk/java/modules/security/test-resources/axis2.xml
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl

Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/axis2.xml Wed Aug 31 01:36:25 2005
@@ -1,13 +1,13 @@
 <axisconfig name="AxisJava2.0">
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">true</parameter>
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <transportReceiver name="http">
     </transportReceiver>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
 
     <module ref="addressing"/>

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java Wed Aug 31 01:36:25 2005
@@ -61,7 +61,7 @@
             //Processing service level paramters
             Iterator itr = config_element.getChildrenWithName(
                     new QName(PARAMETERST));
-            processParameters(itr,axisConfiguration);
+            processParameters(itr,axisConfiguration,axisConfiguration);
 
             //process MessageReciver
 
@@ -128,7 +128,7 @@
                         // adding storage paramters
                         Iterator paramters = storageElement.getChildrenWithName(
                                 new QName(PARAMETERST));
-                        processParameters(paramters,axisStorage);
+                        processParameters(paramters,axisStorage,axisConfiguration);
 
 
                     } catch (ClassNotFoundException e) {
@@ -236,7 +236,7 @@
                     //Processing service level paramters
                     Iterator itr = transport.getChildrenWithName(
                             new QName(PARAMETERST));
-                    processParameters(itr,transportout);
+                    processParameters(itr,transportout,axisConfiguration);
 
                     //process INFLOW
                     OMElement inFlow = transport.getFirstChildWithName(
@@ -250,7 +250,7 @@
                     OMElement outFlow = transport.getFirstChildWithName(
                             new QName(OUTFLOWST));
                     if(outFlow !=null){
-                        transportout.setOutFlow(processFlow(outFlow));
+                        transportout.setOutFlow(processFlow(outFlow,axisConfiguration));
                     }
 
                     OMElement inFaultFlow = transport.getFirstChildWithName(
@@ -264,7 +264,7 @@
                     OMElement outFaultFlow = transport.getFirstChildWithName(
                             new QName(OUT_FAILTFLOW));
                     if(outFaultFlow !=null){
-                        transportout.setFaultFlow(processFlow(outFaultFlow));
+                        transportout.setFaultFlow(processFlow(outFaultFlow,axisConfiguration));
                     }
 
                     //adding to axis config
@@ -322,7 +322,7 @@
                     //Processing service level paramters
                     Iterator itr = transport.getChildrenWithName(
                             new QName(PARAMETERST));
-                    processParameters(itr,transportIN);
+                    processParameters(itr,transportIN,axisConfiguration);
 
                     //process INFLOW
                     OMElement inFlow = transport.getFirstChildWithName(
@@ -336,13 +336,13 @@
                     OMElement outFlow = transport.getFirstChildWithName(
                             new QName(OUTFLOWST));
                     if(outFlow !=null){
-                        transportIN.setInFlow( processFlow(outFlow));
+                        transportIN.setInFlow( processFlow(outFlow,axisConfiguration));
                     }
 
                     OMElement inFaultFlow = transport.getFirstChildWithName(
                             new QName(IN_FAILTFLOW));
                     if(inFaultFlow !=null){
-                        transportIN.setFaultFlow(processFlow(inFaultFlow));
+                        transportIN.setFaultFlow(processFlow(inFaultFlow,axisConfiguration));
                     }
 
                     OMElement outFaultFlow = transport.getFirstChildWithName(
@@ -387,7 +387,7 @@
                 //Processing service level paramters
                 Iterator itr = observerelement.getChildrenWithName(
                         new QName(PARAMETERST));
-                processParameters(itr,observer);
+                processParameters(itr,observer,axisConfiguration);
 
                 // initilization
                 observer.init();

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=264973&r1=264972&r2=264973&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 Wed Aug 31 01:36:25 2005
@@ -546,6 +546,7 @@
                                 ServiceDescription service =
                                         archiveReader.createService(currentArchiveFile);
                                 service.setClassLoader(currentArchiveFile.getClassLoader());
+                                service.setParent(axisConfig);
                                 archiveReader.processServiceDescriptor(currentArchiveFile.getAbsolutePath(),
                                         this,
                                         service,extractServiceArchive);
@@ -595,6 +596,7 @@
                             String moduleStatus = "";
                             try {
                                 ModuleDescription metaData = new ModuleDescription();
+                                metaData.setParent(axisConfig);
                                 archiveReader.readModuleArchive(currentArchiveFile.getAbsolutePath(),
                                         this,
                                         metaData);
@@ -607,7 +609,8 @@
 //                                    metaData.getName());
                             } catch (DeploymentException e) {
 //                                e.printStackTrace();
-                                log.info(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE, currentArchiveFile.getName(),
+                                log.info(Messages.getMessage(
+                                        DeploymentErrorMsgs.INVALID_MODULE, currentArchiveFile.getName(),
                                         e.getMessage()));
 //                                    "Invalid module" +
 //                                    currentArchiveFile.getName());

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Wed Aug 31 01:36:25 2005
@@ -79,7 +79,7 @@
      * @return
      * @throws DeploymentException  <code>DeploymentException</code>
      */
-    protected Flow processFlow(OMElement flowelement) throws DeploymentException {
+    protected Flow processFlow(OMElement flowelement, ParameterInclude parent) throws DeploymentException {
         Flow flow = new FlowImpl();
         if(flowelement == null){
             return flow;
@@ -88,7 +88,7 @@
                 new QName(HANDERST));
         while (handlers.hasNext()) {
             OMElement  handlerElement =  (OMElement)handlers.next();
-            flow.addHandler(processHandler(handlerElement));
+            flow.addHandler(processHandler(handlerElement,parent));
         }
         return flow;
     }
@@ -99,7 +99,7 @@
      * @return
      * @throws DeploymentException    <code>DeploymentException</code>
      */
-    protected HandlerDescription processHandler(OMElement handler_element)
+    protected HandlerDescription processHandler(OMElement handler_element, ParameterInclude parent)
             throws DeploymentException {
         HandlerDescription handler = new HandlerDescription();
 
@@ -157,7 +157,7 @@
             }
             Iterator paramters = handler_element.getChildrenWithName(
                     new QName(PARAMETERST));
-            processParameters(paramters,handler);
+            processParameters(paramters,handler,parent);
         }
         return handler;
     }
@@ -194,10 +194,14 @@
      * To get the Paramter object out from the OM
      * @param paramters <code>Parameter</code>
      * @param parameterInclude <code>ParameterInclude</code>
+     * @param parent <code>ParameterInclude</code>
      */
-    protected void processParameters(Iterator paramters, ParameterInclude parameterInclude)
+    protected void processParameters(Iterator paramters, ParameterInclude parameterInclude,
+                                     ParameterInclude parent )
             throws DeploymentException {
         while (paramters.hasNext()) {
+            //this is to check whether some one has locked the parmter at the top level
+            boolean allowedtoadd = true;
             OMElement paramterElement = (OMElement) paramters.next();
 
             Parameter paramter = new ParameterImpl();
@@ -230,7 +234,14 @@
             if (paraLocked !=null) {
                 String lockedValue = paraLocked.getValue();
                 if("true".equals(lockedValue)){
-                    paramter.setLocked(true);
+                    //if the parameter is locked at some levle paramer value replace by that
+                    if(parent.isParamterLocked(paramter.getName())){
+                        throw new DeploymentException("The paramter " + paramter.getName() + " has" +
+                                " locked at top levle can not overide");
+                    } else{
+                        paramter.setLocked(true);
+                    }
+
                 } else {
                     paramter.setLocked(false);
                 }

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=264973&r1=264972&r2=264973&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 Wed Aug 31 01:36:25 2005
@@ -89,31 +89,31 @@
             //Processing service level paramters
             Iterator itr = moduleElement.getChildrenWithName(
                     new QName(PARAMETERST));
-            processParameters(itr,module);
+            processParameters(itr,module,module.getParent());
 
             //process INFLOW
             OMElement inFlow = moduleElement.getFirstChildWithName(
                     new QName(INFLOWST));
             if(inFlow !=null){
-                module.setInFlow(processFlow(inFlow));
+                module.setInFlow(processFlow(inFlow,module));
             }
 
             OMElement outFlow = moduleElement.getFirstChildWithName(
                     new QName(OUTFLOWST));
             if(outFlow !=null){
-                module.setOutFlow(processFlow(outFlow));
+                module.setOutFlow(processFlow(outFlow,module));
             }
 
             OMElement inFaultFlow = moduleElement.getFirstChildWithName(
                     new QName(IN_FAILTFLOW));
             if(inFaultFlow !=null){
-                module.setFaultInFlow(processFlow(inFaultFlow));
+                module.setFaultInFlow(processFlow(inFaultFlow,module));
             }
 
             OMElement outFaultFlow = moduleElement.getFirstChildWithName(
                     new QName(OUT_FAILTFLOW));
             if(outFaultFlow !=null){
-                module.setFaultOutFlow(processFlow(outFaultFlow));
+                module.setFaultOutFlow(processFlow(outFaultFlow,module));
             }
 
             //processing Operations
@@ -147,6 +147,12 @@
             OperationDescription op_descrip = new OperationDescription();
             op_descrip.setName(new QName(opname));
 
+            //Opeartion Paramters
+            Iterator paramters = operation.getChildrenWithName(
+                    new QName(PARAMETERST));
+            processParameters(paramters,op_descrip,module);
+
+
             //setting the mep of the operation
             OMAttribute op_mep_att = operation.getAttribute(
                     new QName(MEP));
@@ -167,12 +173,6 @@
                 MessageReceiver msgReceiver = loadDefaultMessageReciver();
                 op_descrip.setMessageReceiver(msgReceiver);
             }
-
-            //Opeartion Paramters
-            Iterator paramters = operation.getChildrenWithName(
-                    new QName(PARAMETERST));
-            processParameters(paramters,op_descrip);
-
             //Process Module Refs
             Iterator modules = operation.getChildrenWithName(
                     new QName(MODULEST));

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=264973&r1=264972&r2=264973&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 Wed Aug 31 01:36:25 2005
@@ -82,7 +82,7 @@
             //Processing service level paramters
             Iterator itr = service_element.getChildrenWithName(
                     new QName(PARAMETERST));
-            processParameters(itr,service);
+            processParameters(itr,service,service.getParent());
 
             //process service description
             OMElement descriptionElement = service_element.getFirstChildWithName(
@@ -110,25 +110,25 @@
             OMElement inFlow = service_element.getFirstChildWithName(
                     new QName(INFLOWST));
             if(inFlow !=null){
-                service.setInFlow(processFlow(inFlow));
+                service.setInFlow(processFlow(inFlow,service));
             }
 
             OMElement outFlow = service_element.getFirstChildWithName(
                     new QName(OUTFLOWST));
             if(outFlow !=null){
-                service.setOutFlow(processFlow(outFlow));
+                service.setOutFlow(processFlow(outFlow,service));
             }
 
             OMElement inFaultFlow = service_element.getFirstChildWithName(
                     new QName(IN_FAILTFLOW));
             if(inFaultFlow !=null){
-                service.setFaultInFlow(processFlow(inFaultFlow));
+                service.setFaultInFlow(processFlow(inFaultFlow,service));
             }
 
             OMElement outFaultFlow = service_element.getFirstChildWithName(
                     new QName(OUT_FAILTFLOW));
             if(outFaultFlow !=null){
-                service.setFaultOutFlow(processFlow(outFaultFlow));
+                service.setFaultOutFlow(processFlow(outFaultFlow,service));
             }
 
             //processing operations
@@ -182,6 +182,11 @@
                 op_descrip.setMessageExchangePattern(mep);
             }
 
+             //Opeartion Paramters
+            Iterator paramters = operation.getChildrenWithName(
+                    new QName(PARAMETERST));
+            processParameters(paramters,op_descrip,service);
+
             // loading the message recivers
             OMElement receiverElement = operation.getFirstChildWithName(
                     new QName(MESSAGERECEIVER));
@@ -194,11 +199,6 @@
                 MessageReceiver msgReceiver = loadDefaultMessageReciver();
                 op_descrip.setMessageReceiver(msgReceiver);
             }
-
-            //Opeartion Paramters
-            Iterator paramters = operation.getChildrenWithName(
-                    new QName(PARAMETERST));
-            processParameters(paramters,op_descrip);
 
             //Process Module Refs
             Iterator modules = operation.getChildrenWithName(

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml Wed Aug 31 01:36:25 2005
@@ -2,26 +2,26 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">false</parameter>
-    <parameter name="enableMTOM" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="enableMTOM" locked="false">true</parameter>
     <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="xsd:false">true</parameter>-->
+    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
 
 
-    <parameter name="userName" locked="xsd:false">admin</parameter>
-    <parameter name="password" locked="xsd:false">axis2</parameter>
+    <parameter name="userName" locked="false">admin</parameter>
+    <parameter name="password" locked="false">axis2</parameter>
 
 
     <!--if you want to extract the service archive file and work with that please uncomment this-->
     <!--else , it wont exatract archive file or does not take into consideration if someone drop-->
     <!--exploded directory into /service directory-->
-    <!--<parameter name="extract_service_archieve" locked="xsd:false">true</parameter>-->
+    <!--<parameter name="extract_service_archieve" locked="false">true</parameter>-->
 
 
 <!--    The way of adding listener to the system-->
 <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-<!--        <parameter name="RSS_URL" locked="xsd:false">http://127.0.0.1/rss</parameter>-->
+<!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
 <!--    </listener>-->
 
     <!--Registering Axis Storage Class if you comment this default one will -->
@@ -29,7 +29,7 @@
     <!--want to register new one write a class by extanding AbastractStorage-->
     <!--and put that name here-->
     <axisStorage class="org.apache.axis2.storage.impl.AxisMemoryStorage">
-        <parameter name="StoreLocation" locked="xsd:false">N:S</parameter>
+        <parameter name="StoreLocation" locked="false">N:S</parameter>
     </axisStorage>
 
 
@@ -44,20 +44,20 @@
     <!-- Transport Ins -->
     <!-- ================================================= -->
     <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="xsd:false">6060</parameter>
+        <parameter name="port" locked="false">6060</parameter>
     </transportReceiver>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
     <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
-          <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
-          <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
-          <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+          <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
+          <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
+          <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
+          <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
+          <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="xsd:false">6060</parameter>
+        <parameter name="port" locked="false">6060</parameter>
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -67,18 +67,18 @@
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
     <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
     </transportSender>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
    <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
    </transportSender>
    -->
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/HandlerDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/HandlerDescription.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/HandlerDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/HandlerDescription.java Wed Aug 31 01:36:25 2005
@@ -118,6 +118,11 @@
         return parameterInclude.getParameters();
     }
 
+    //to check whether the paramter is locked at any levle
+    public boolean isParamterLocked(String paramterName) {
+        return parameterInclude.isParamterLocked(paramterName);
+    }
+
     /**
      * @return
      */

Modified: 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/ModuleDescription.java?rev=264973&r1=264972&r2=264973&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/ModuleDescription.java Wed Aug 31 01:36:25 2005
@@ -16,6 +16,7 @@
 package org.apache.axis2.description;
 
 import org.apache.axis2.modules.Module;
+import org.apache.axis2.engine.AxisConfiguration;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
@@ -38,6 +39,8 @@
      */
     private QName name;
 
+    private AxisConfiguration parent;
+
     /**
      * Field flowInclude
      */
@@ -174,6 +177,30 @@
 
     public HashMap getOperations() {
         return opeartions;
+    }
+
+    public AxisConfiguration getParent() {
+        return parent;
+    }
+
+    public void setParent(AxisConfiguration parent) {
+        this.parent = parent;
+    }
+
+     //to check whether a given paramter is locked
+    public boolean isParamterLocked(String paramterName) {
+        // checking the locked value of parent
+        boolean loscked = getParent().isParamterLocked(paramterName);
+        if(loscked){
+            return true;
+        } else {
+            Parameter parameter = getParameter(paramterName);
+            if(parameter != null && parameter.isLocked()){
+                return true;
+            } else {
+                return false;
+            }
+        }
     }
 
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java Wed Aug 31 01:36:25 2005
@@ -33,6 +33,8 @@
 
     private int mep = MEP_CONSTANT_INVALID;
 
+    private ServiceDescription parent;
+
     //To store deploytime module refs
     private ArrayList modulerefs;
 
@@ -331,6 +333,30 @@
         return modulerefs;
     }
 
+    public ServiceDescription getParent() {
+        return parent;
+    }
+
+    public void setParent(ServiceDescription parent) {
+        this.parent = parent;
+    }
+
+     //to check whether a given paramter is locked
+    public boolean isParamterLocked(String paramterName) {
+        // checking the locked value of parent
+        boolean loscked = getParent().isParamterLocked(paramterName);
+        if(loscked){
+            return true;
+        } else {
+            Parameter parameter = getParameter(paramterName);
+            if(parameter != null && parameter.isLocked()){
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+    }
 
 }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java Wed Aug 31 01:36:25 2005
@@ -86,7 +86,7 @@
      *  Paramter can be any thing it can be XML element with number of child elements , so if some
      * one wants to access the XML elemet we need to store that , at the deployment time , to store
      * the XMLelment of the parameter can use this method it will store whole
-     * <parameter name="ServiceClass1" locked="xsd:false">org.apache.axis2.sample.echo.EchoImpl</parameter>
+     * <parameter name="ServiceClass1" locked="false">org.apache.axis2.sample.echo.EchoImpl</parameter>
      * element
      * @param element  <code>OMElement<code>
      */

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterImpl.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterImpl.java Wed Aug 31 01:36:25 2005
@@ -44,7 +44,7 @@
 
     /**
      * to store the parameter lement
-     * <parameter name="ServiceClass1" locked="xsd:false">
+     * <parameter name="ServiceClass1" locked="false">
      * org.apache.axis2.sample.echo.EchoImpl</parameter>
      */
     private OMElement parameterElement ;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java Wed Aug 31 01:36:25 2005
@@ -15,6 +15,7 @@
  */
 package org.apache.axis2.description;
 
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 
 /**
@@ -44,5 +45,8 @@
      * @return
      */
     ArrayList getParameters();
+
+    //to check whether the paramter is locked at any levle
+    boolean isParamterLocked(String paramterName);
 
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java Wed Aug 31 01:36:25 2005
@@ -66,4 +66,9 @@
         }
         return para_list;
     }
+
+    //to check whether the paramter is locked at any levle
+    public boolean isParamterLocked(String paramterName) {
+        return false;
+    }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java Wed Aug 31 01:36:25 2005
@@ -48,6 +48,8 @@
         DescriptionConstants {
 
     private Definition difDefinition = null;
+
+    private  AxisConfiguration parent;
     //to store the wsdl definition , which is build at the deployment time
 
     //to keep the time that last update time of the service
@@ -214,7 +216,7 @@
      * @param operation
      */
     public void addOperation(OperationDescription operation) {
-
+        operation.setParent(this);
         this.getServiceInterface().setOperation(operation);
     }
 
@@ -754,5 +756,34 @@
      */
     public void addMapping(String mappingKey , OperationDescription operation){
         wasaction_opeartionmap.put(mappingKey,operation);
+    }
+
+    /**
+     * To get the parent (which is AxisConfiguration in this case)
+     * @return <code>AxisConfiguration</code>
+     */
+    public AxisConfiguration getParent() {
+        return parent;
+    }
+
+    public void setParent(AxisConfiguration parent) {
+        this.parent = parent;
+    }
+
+    //to check whether a given paramter is locked
+    public boolean isParamterLocked(String paramterName) {
+        // checking the locked value of parent
+        boolean loscked = getParent().isParamterLocked(paramterName);
+        if(loscked){
+            return true;
+        } else {
+            Parameter parameter = getParameter(paramterName);
+            if(parameter != null && parameter.isLocked()){
+                return true;
+            } else {
+                return false;
+            }
+        }
+
     }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java Wed Aug 31 01:36:25 2005
@@ -86,6 +86,11 @@
         return paramInclude.getParameters();
     }
 
+    //to check whether the paramter is locked at any levle
+    public boolean isParamterLocked(String paramterName) {
+        return paramInclude.isParamterLocked(paramterName);
+    }
+
     /**
      * Method addParameter
      *

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java Wed Aug 31 01:36:25 2005
@@ -80,6 +80,11 @@
         return paramInclude.getParameters();
     }
 
+    //to check whether the paramter is locked at any levle
+    public boolean isParamterLocked(String paramterName) {
+        return paramInclude.isParamterLocked(paramterName);
+    }
+
     /**
      * Method addParameter
      *

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=264973&r1=264972&r2=264973&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 Wed Aug 31 01:36:25 2005
@@ -136,4 +136,7 @@
 
     public AxisStorage getAxisStorage();
 
+    //to check whether a given paramter is locked
+    public boolean isParamterLocked(String paramterName);
+
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Wed Aug 31 01:36:25 2005
@@ -151,6 +151,7 @@
      * @throws AxisFault
      */
     public synchronized void addMdoule(ModuleDescription module) throws AxisFault {
+        module.setParent(this);
         modules.put(module.getName(), module);
     }
 
@@ -166,6 +167,7 @@
         handlerResolver.buildchains();
         service.setLastupdate();
         notifyObserves(AxisEvent.SERVICE_DEPLOY ,service);
+        service.setParent(this);
     }
 
     /**
@@ -258,6 +260,16 @@
 
     public AxisStorage getAxisStorage() {
         return axisStorage;
+    }
+
+    //to check whether a given paramter is locked
+    public boolean isParamterLocked(String paramterName) {
+        Parameter parameter = getParameter(paramterName);
+        if(parameter != null && parameter.isLocked()){
+            return true;
+        } else {
+            return false;
+        }
     }
 
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java Wed Aug 31 01:36:25 2005
@@ -120,4 +120,9 @@
     public ArrayList getParameters() {
         return paramter.getParameters();
     }
+
+    //to check whether the paramter is locked at any levle
+    public boolean isParamterLocked(String paramterName) {
+        return paramter.isParamterLocked(paramterName);
+    }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisMemoryStorage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisMemoryStorage.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisMemoryStorage.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisMemoryStorage.java Wed Aug 31 01:36:25 2005
@@ -75,4 +75,9 @@
         return paramter.getParameters();
     }
 
+    //to check whether the paramter is locked at any levle
+    public boolean isParamterLocked(String paramterName) {
+        return paramter.isParamterLocked(paramterName);
+    }
+
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Wed Aug 31 01:36:25 2005
@@ -307,8 +307,8 @@
             ConfigurationContext confContext,
             TransportOutDescription transportOut)
             throws AxisFault {
-        //<parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter> or
-        //<parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter> is
+        //<parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter> or
+        //<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter> is
         // checked
         Parameter version =
                 transportOut.getParameter(HTTPConstants.PROTOCOL_VERSION);

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadConfigOrderChange/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadConfigOrderChange/axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadConfigOrderChange/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadConfigOrderChange/axis2.xml Wed Aug 31 01:36:25 2005
@@ -1,11 +1,11 @@
 <axisconfig name="AxisJava2.0">
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">true</parameter>
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
      <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
 
 

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadServer.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadServer.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadServer.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadServer.xml Wed Aug 31 01:36:25 2005
@@ -1,6 +1,6 @@
 <axisconfig name="AxisJava2.0">
     <parameter name="para1" locked="xsd:true">10</parameter>
-    <parameter name="para2" locked="xsd:false">Colombo</parameter>
+    <parameter name="para2" locked="false">Colombo</parameter>
     <handler name="h1" class="org.apache.axis2.engine.registry.SpeakingHandler">
         <order phase="p1" phaseFirst="true"/>
         <parameter name="para8" locked="xsd:true">123</parameter>
@@ -12,7 +12,7 @@
     <!--
       <module ref="uri">
           <parameter name="para3" locked="xsd:true">10</parameter>
-          <parameter name="para4" locked="xsd:false">LSF</parameter>
+          <parameter name="para4" locked="false">LSF</parameter>
       </module>
      -->
     <phaseOrder>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadService.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadService.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadService.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/BadService.xml Wed Aug 31 01:36:25 2005
@@ -1,7 +1,7 @@
 <service provider="xsd:anyprovider" style="xsd:anyURI" contextPath="xsd:anycontextPath">
     <!-- these are Service Parameters -->
     <parameter name="para1" locked="xsd:true">10</parameter>
-    <parameter name="para2" locked="xsd:false">Colombo</parameter>
+    <parameter name="para2" locked="false">Colombo</parameter>
 
     <!--  Service TypeMapping -->
     <typeMapping>Type mappping should come here</typeMapping>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/Badmodule.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/Badmodule.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/Badmodule.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/Badmodule.xml Wed Aug 31 01:36:25 2005
@@ -1,6 +1,6 @@
 <module name="module1" class="module1.java">
     <parameter name="para123" locked="xsd:true">10</parameter>
-    <parameter name="para245" locked="xsd:false">Colombo</parameter>
+    <parameter name="para245" locked="false">Colombo</parameter>
     <!--  Module TypeMapping -->
     <typeMapping>Type mappping should come here</typeMapping>
     <inflow>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/ConfigWithObservers/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/ConfigWithObservers/axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/ConfigWithObservers/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/ConfigWithObservers/axis2.xml Wed Aug 31 01:36:25 2005
@@ -2,18 +2,18 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">false</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">false</parameter>
     <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="xsd:false">true</parameter>-->
+    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
 
 
-    <parameter name="userName" locked="xsd:false">admin</parameter>
-    <parameter name="password" locked="xsd:false">axis2</parameter>
+    <parameter name="userName" locked="false">admin</parameter>
+    <parameter name="password" locked="false">axis2</parameter>
 
 <!--    The way of adding listener to the system-->
     <listener class="org.apache.axis2.deployment.AxisObserverImpl">
-        <parameter name="RSS_URL" locked="xsd:false">http://127.0.0.1/rss</parameter>
+        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>
     </listener>
 
 
@@ -28,20 +28,20 @@
     <!-- Transport Ins -->
     <!-- ================================================= -->
     <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="xsd:false">6060</parameter>
+        <parameter name="port" locked="false">6060</parameter>
     </transportReceiver>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
     <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
-          <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
-          <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
-          <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+          <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
+          <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
+          <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
+          <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
+          <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="xsd:false">6060</parameter>
+        <parameter name="port" locked="false">6060</parameter>
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -52,14 +52,14 @@
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
    <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
    </transportSender>
    -->
 

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/SystemPhaseRemove/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/SystemPhaseRemove/axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/SystemPhaseRemove/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/SystemPhaseRemove/axis2.xml Wed Aug 31 01:36:25 2005
@@ -1,13 +1,13 @@
 <axisconfig name="AxisJava2.0">
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">true</parameter>
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <transportReceiver name="http">
     </transportReceiver>
      <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
 
     <phaseOrder type="inflow">

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/axis2.xml Wed Aug 31 01:36:25 2005
@@ -1,17 +1,17 @@
 <axisconfig name="AxisJava2.0">
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">true</parameter>
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
      <axisStorage class="org.apache.axis2.storage.impl.AxisMemoryStorage">
-        <parameter name="StoreLocation" locked="xsd:false">N:S</parameter>
+        <parameter name="StoreLocation" locked="false">N:S</parameter>
     </axisStorage>
 
     <transportReceiver name="http">
     </transportReceiver>
      <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
 
     <phaseOrder type="inflow">

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/echo/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/echo/META-INF/service.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/echo/META-INF/service.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/echo/META-INF/service.xml Wed Aug 31 01:36:25 2005
@@ -3,6 +3,6 @@
            This service echo the given input , and this was developed to text the axis system working
             correctly
     </description>
-    <parameter name="ServiceClass" locked="xsd:false">org.apache.axis2.echo.Echo</parameter>
+    <parameter name="ServiceClass" locked="false">org.apache.axis2.echo.Echo</parameter>
     <operation name="viewVersion"/>
 </service>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/invalidservice/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/invalidservice/META-INF/service.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/invalidservice/META-INF/service.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/invalidservice/META-INF/service.xml Wed Aug 31 01:36:25 2005
@@ -1,5 +1,5 @@
 <service name="">
-    <parameter name="ServiceClass" locked="xsd:false">org.apache.axis2.InvalidService</parameter>
+    <parameter name="ServiceClass" locked="false">org.apache.axis2.InvalidService</parameter>
     <module ref="serviceModule"/>
     <operation name="echo"/>
 </service>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.xml Wed Aug 31 01:36:25 2005
@@ -2,7 +2,7 @@
     <description>
         This is a testing service , to test the system is working or not
     </description>
-    <parameter name="ServiceClass" locked="xsd:false">org.apache.axis2.services.OutService</parameter>
+    <parameter name="ServiceClass" locked="false">org.apache.axis2.services.OutService</parameter>
     <parameter name="OUTSERVICE" locked="xsd:true">true</parameter>
     <operation name="outService"/>
 </service>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/server-transport.xml Wed Aug 31 01:36:25 2005
@@ -4,7 +4,7 @@
         <parameter name="para1" locked="xsd:true">10</parameter>
     </transportReceiver>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
  
     <phaseOrder type="inflow">

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/server1.xml Wed Aug 31 01:36:25 2005
@@ -1,13 +1,13 @@
 <server name="AxisJava2.0">
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">true</parameter>
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
     <transportReceiver name="http">
     </transportReceiver>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
     <module ref="addressing"/>
 

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/service.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/service.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/service.xml Wed Aug 31 01:36:25 2005
@@ -1,7 +1,7 @@
 <service provider="xsd:anyprovider" style="rpcI" contextPath="services">
     <!-- these are Service Parameters -->
     <parameter name="para1" locked="xsd:true">10</parameter>
-    <parameter name="para2" locked="xsd:false">Colombo</parameter>
+    <parameter name="para2" locked="false">Colombo</parameter>
 
     <!--  Service TypeMapping -->
     <typeMapping>Type mappping should come here</typeMapping>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1.xml Wed Aug 31 01:36:25 2005
@@ -1,7 +1,7 @@
 <service provider="xsd:anyprovider" style="xsd:anyURI" contextPath="xsd:anycontextPath">
     <!-- these are Service Parameters -->
     <parameter name="para1" locked="xsd:true">10</parameter>
-    <parameter name="para2" locked="xsd:false">Colombo</parameter>
+    <parameter name="para2" locked="false">Colombo</parameter>
 
     <module ref="module1"></module>
     <module ref="module2"></module>
@@ -57,7 +57,7 @@
     <operation name="opname" qname="opqname" style="anyStyle" use="anyUse">
         <module ref="uri">
             <parameter name="para3" locked="xsd:true">10</parameter>
-            <parameter name="para4" locked="xsd:false">LSF</parameter>
+            <parameter name="para4" locked="false">LSF</parameter>
         </module>
 
         <inflow>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1/META-INF/service.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1/META-INF/service.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1/META-INF/service.xml Wed Aug 31 01:36:25 2005
@@ -3,7 +3,7 @@
     <description>
         This is a testing service , to test the system is working or not
     </description>
-    <parameter name="ServiceClass" locked="xsd:false">org.apache.axis2.sample.echo.EchoImpl</parameter>
+    <parameter name="ServiceClass" locked="false">org.apache.axis2.sample.echo.EchoImpl</parameter>
     <inflow>
         <handler name="logging" class="org.apache.axis2.sample.handlers.LoggingHandler">
             <order phase="userphase1" phaseFirst="true"/>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2.xml Wed Aug 31 01:36:25 2005
@@ -1,7 +1,7 @@
 <service provider="xsd:anyprovider" style="xsd:anyURI" contextPath="xsd:anycontextPath">
     <!-- these are Service Parameters -->
     <parameter name="para1" locked="xsd:true">10</parameter>
-    <parameter name="para2" locked="xsd:false">Colombo</parameter>
+    <parameter name="para2" locked="false">Colombo</parameter>
 
     <!--  Service TypeMapping -->
     <typeMapping>Type mappping should come here</typeMapping>
@@ -56,7 +56,7 @@
     <operation name="opname" qname="opqname" style="anyStyle" use="anyUse">
         <module ref="uri">
             <parameter name="para3" locked="xsd:true">10</parameter>
-            <parameter name="para4" locked="xsd:false">LSF</parameter>
+            <parameter name="para4" locked="false">LSF</parameter>
         </module>
 
         <inflow>

Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2/META-INF/service.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2/META-INF/service.xml (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2/META-INF/service.xml Wed Aug 31 01:36:25 2005
@@ -1,7 +1,7 @@
 <service name="">
     <!-- these are Service Parameters -->
     <parameter name="para1" locked="xsd:true">10</parameter>
-    <parameter name="para2" locked="xsd:false">Colombo</parameter>
+    <parameter name="para2" locked="false">Colombo</parameter>
     <description>
         This is a testing service , to test the system is working or not
     </description>

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java Wed Aug 31 01:36:25 2005
@@ -54,4 +54,9 @@
     public ArrayList getParameters() {
        return null;
     }
+
+    //to check whether the paramter is locked at any levle
+    public boolean isParamterLocked(String paramterName) {
+        return false;  
+    }
 }

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml Wed Aug 31 01:36:25 2005
@@ -1,6 +1,6 @@
 <axisconfig name="AxisJava2.0">
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">true</parameter>
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
@@ -12,12 +12,12 @@
 
     <!-- Scenario 1: Client's Configuration:START-->
 
-    <parameter name="OutAction" locked="xsd:false">UsernameToken</parameter>
-    <parameter name="user" locked="xsd:false">Chris</parameter>
-    <parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
-    <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
+    <parameter name="OutAction" locked="false">UsernameToken</parameter>
+    <parameter name="user" locked="false">Chris</parameter>
+    <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+    <parameter name="passwordType" locked="false">PasswordText</parameter>
 
-    <parameter name="InAction" locked="xsd:false">NoSecurity</parameter> 
+    <parameter name="InAction" locked="false">NoSecurity</parameter>
 
     <!-- Scenario 1: Client's Configuration:END-->
 
@@ -25,7 +25,7 @@
     <transportReceiver name="http">
     </transportReceiver>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
 
 

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.axis2.xml Wed Aug 31 01:36:25 2005
@@ -1,6 +1,6 @@
 <axisconfig name="AxisJava2.0">
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">true</parameter>
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
@@ -12,10 +12,10 @@
     <!-- Scenario 1: Service's Configuration: START-->
     <!-- Also we can switch back to hte normal parameter names when we can seperately assign them to the flows -->
 
-    <parameter name="InAction" locked="xsd:false">UsernameToken</parameter>
-    <parameter name="InPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
+    <parameter name="InAction" locked="false">UsernameToken</parameter>
+    <parameter name="InPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
 
-    <parameter name="OutAction" locked="xsd:false">NoSecurity</parameter> -->
+    <parameter name="OutAction" locked="false">NoSecurity</parameter> -->
 
     <!-- Scenario 1: Service's Configuration: END-->
 
@@ -23,20 +23,20 @@
     <!-- Transport Ins -->
     <!-- ================================================= -->
     <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="xsd:false">6060</parameter>
+        <parameter name="port" locked="false">6060</parameter>
     </transportReceiver>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
     <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
-          <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
-          <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
-          <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+          <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
+          <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
+          <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
+          <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
+          <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="xsd:false">6060</parameter>
+        <parameter name="port" locked="false">6060</parameter>
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -46,18 +46,18 @@
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>
     <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
     </transportSender>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
    <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
    </transportSender>
    -->
 

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml?rev=264973&r1=264972&r2=264973&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml Wed Aug 31 01:36:25 2005
@@ -1,6 +1,6 @@
 <axisconfig name="AxisJava2.0">
-    <parameter name="hotdeployment" locked="xsd:false">true</parameter>
-    <parameter name="hotupdate" locked="xsd:false">true</parameter>
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">true</parameter>
 
     <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
 
@@ -12,17 +12,17 @@
 
     <!-- Scenario 2: Client's Configuration:START-->
 
-    <parameter name="OutAction" locked="xsd:false">UsernameToken Encrypt</parameter>
-    <parameter name="user" locked="xsd:false">Chris</parameter>
-    <parameter name="addUTElements" locked="xsd:false">Nonce Created</parameter>
-    <parameter name="encryptionParts" locked="xsd:false">{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken</parameter>
-    <parameter name="encryptionUser" locked="xsd:false">bob</parameter>
-    <parameter name="encryptionPropFile" locked="xsd:false">interop.properties</parameter>
-    <parameter name="OutPasswordCallbackClass" locked="xsd:false">org.apache.axis2.security.PWCallback</parameter>
-    <parameter name="passwordType" locked="xsd:false">PasswordText</parameter>
-    <parameter name="encryptionKeyIdentifier" locked="xsd:false">SKIKeyIdentifier</parameter>
+    <parameter name="OutAction" locked="false">UsernameToken Encrypt</parameter>
+    <parameter name="user" locked="false">Chris</parameter>
+    <parameter name="addUTElements" locked="false">Nonce Created</parameter>
+    <parameter name="encryptionParts" locked="false">{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken</parameter>
+    <parameter name="encryptionUser" locked="false">bob</parameter>
+    <parameter name="encryptionPropFile" locked="false">interop.properties</parameter>
+    <parameter name="OutPasswordCallbackClass" locked="false">org.apache.axis2.security.PWCallback</parameter>
+    <parameter name="passwordType" locked="false">PasswordText</parameter>
+    <parameter name="encryptionKeyIdentifier" locked="false">SKIKeyIdentifier</parameter>
 
-    <parameter name="InAction" locked="xsd:false">NoSecurity</parameter> 
+    <parameter name="InAction" locked="false">NoSecurity</parameter>
 
     <!-- Scenario 2: Client's Configuration:END-->
 
@@ -31,7 +31,7 @@
     <transportReceiver name="http">
     </transportReceiver>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.0</parameter>
+        <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
     </transportSender>