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 2005/09/01 06:47:03 UTC
svn commit: r265647 - in /webservices/axis2/trunk/java/modules/core:
src/org/apache/axis2/deployment/ test-resources/deployment/ParaLockedRepo/
test/org/apache/axis2/engine/
Author: deepal
Date: Wed Aug 31 21:46:48 2005
New Revision: 265647
URL: http://svn.apache.org/viewcvs?rev=265647&view=rev
Log:
Fixing AXIS2-196
Added:
webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/
webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/Op_overide_Service_para.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/axis2.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_global_non_locked_para.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_locked_para.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/op_overide_global_para.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_locked_para.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_non_locked_para.xml
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java
Modified:
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
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=265647&r1=265646&r2=265647&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 21:46:48 2005
@@ -81,7 +81,9 @@
if(moduleClassAtt !=null){
String moduleClass = moduleClassAtt.getValue();
if(moduleClass !=null && !"".equals(moduleClass)){
- engine.getCurrentFileItem().setModuleClass(moduleClass);
+ if (engine !=null) {
+ engine.getCurrentFileItem().setModuleClass(moduleClass);
+ }
}
}
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=265647&r1=265646&r2=265647&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 21:46:48 2005
@@ -206,8 +206,10 @@
processOpeasrtionModuleRefs(modules, op_descrip);
//setting Operation phase
- PhasesInfo info = engine.getPhasesinfo();
- info.setOperationPhases(op_descrip);
+ if (engine !=null) {
+ PhasesInfo info = engine.getPhasesinfo();
+ info.setOperationPhases(op_descrip);
+ }
//adding the opeartion
operations.add(op_descrip);
Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/Op_overide_Service_para.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/Op_overide_Service_para.xml?rev=265647&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/Op_overide_Service_para.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/Op_overide_Service_para.xml Wed Aug 31 21:46:48 2005
@@ -0,0 +1,7 @@
+<service name="Service1">
+ <parameter name="Servicep" locked="true">org.apache.axis2.sample.echo.EchoImpl</parameter>
+ <parameter name="ServicePara2" locked="true">org.apache.axis2.sample.echo.EchoImpl</parameter>
+ <operation name="echoString">
+ <parameter name="Servicep" locked="true">value</parameter>
+ </operation>
+</service>
\ No newline at end of file
Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/axis2.xml?rev=265647&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/axis2.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/axis2.xml Wed Aug 31 21:46:48 2005
@@ -0,0 +1,34 @@
+<axisconfig name="AxisJava2.0">
+
+ <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+
+ <parameter name="ServicePara1" locked="false">true</parameter>
+ <parameter name="ServicePara2" locked="true">true</parameter>
+
+ <parameter name="modulePara1" locked="false">true</parameter>
+ <parameter name="modulePara2" locked="true">true</parameter>
+
+ <phaseOrder type="inflow">
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch"/>
+ <phase name="PostDispatch"/>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="outflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="INfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="Outfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+</axisconfig>
+
Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_global_non_locked_para.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_global_non_locked_para.xml?rev=265647&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_global_non_locked_para.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_global_non_locked_para.xml Wed Aug 31 21:46:48 2005
@@ -0,0 +1,3 @@
+<module name="module1" class="org.apache.module.Module1Impl">
+ <parameter name="modulePara1" locked="true">org.apache.axis2.sample.echo.EchoImpl</parameter>
+</module>
\ No newline at end of file
Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_locked_para.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_locked_para.xml?rev=265647&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_locked_para.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/module_overide_locked_para.xml Wed Aug 31 21:46:48 2005
@@ -0,0 +1,3 @@
+<module name="module1" class="org.apache.module.Module1Impl">
+ <parameter name="modulePara2" locked="true">org.apache.axis2.sample.echo.EchoImpl</parameter>
+</module>
\ No newline at end of file
Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/op_overide_global_para.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/op_overide_global_para.xml?rev=265647&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/op_overide_global_para.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/op_overide_global_para.xml Wed Aug 31 21:46:48 2005
@@ -0,0 +1,9 @@
+<service name="Service1">
+ <description>
+ This is a testing service , to test the system is working or not
+ </description>
+ <parameter name="ServicePara2" locked="true">org.apache.axis2.sample.echo.EchoImpl</parameter>
+ <operation name="echoString">
+ <parameter name="ServicePara2" locked="true">org.apache.axis2.sample.echo.EchoImpl</parameter>
+ </operation>
+</service>
\ No newline at end of file
Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_locked_para.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_locked_para.xml?rev=265647&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_locked_para.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_locked_para.xml Wed Aug 31 21:46:48 2005
@@ -0,0 +1,6 @@
+<service name="Service1">
+ <description>
+ This is a testing service , to test the system is working or not
+ </description>
+ <parameter name="ServicePara2" locked="true">org.apache.axis2.sample.echo.EchoImpl</parameter>
+</service>
\ No newline at end of file
Added: webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_non_locked_para.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_non_locked_para.xml?rev=265647&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_non_locked_para.xml (added)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/ParaLockedRepo/service_overide_non_locked_para.xml Wed Aug 31 21:46:48 2005
@@ -0,0 +1,6 @@
+<service name="Service1">
+ <description>
+ This is a testing service , to test the system is working or not
+ </description>
+ <parameter name="ServicePara1" locked="true">org.apache.axis2.sample.echo.EchoImpl</parameter>
+</service>
\ No newline at end of file
Added: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java?rev=265647&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java (added)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterLocked.java Wed Aug 31 21:46:48 2005
@@ -0,0 +1,146 @@
+package org.apache.axis2.engine;
+
+import junit.framework.TestCase;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.deployment.ServiceBuilder;
+import org.apache.axis2.deployment.ModuleBuilder;
+import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.ModuleDescription;
+
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+/*
+* 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.
+*
+*
+*/
+
+/**
+ * Author: Deepal Jayasinghe
+ * Date: Sep 1, 2005
+ * Time: 9:49:19 AM
+ */
+public class ParamterLocked extends TestCase {
+
+ AxisConfiguration ar;
+ String repo ="./test-resources/deployment/ParaLockedRepo";
+
+
+
+ protected void setUp() throws Exception {
+ ConfigurationContextFactory builder = new ConfigurationContextFactory();
+ ar = builder.buildConfigurationContext(repo).getAxisConfiguration();
+ }
+
+ public void testOveride_Non_locked_Para_Service(){
+ try {
+ assertNotNull(ar);
+ ServiceDescription service = new ServiceDescription();
+ service.setParent(ar);
+ InputStream in = new FileInputStream(repo + "/service_overide_non_locked_para.xml");
+ ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
+ sbuilder.populateService();
+ assertNotNull(sbuilder);
+
+ }catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e) ;
+ } catch (DeploymentException e) {
+ fail("This can not fail with this DeploymentException " + e) ;
+ }
+ }
+
+ public void testOveride_locked_Para_Service(){
+ try {
+ assertNotNull(ar);
+ ServiceDescription service = new ServiceDescription();
+ service.setParent(ar);
+ InputStream in = new FileInputStream(repo + "/service_overide_locked_para.xml");
+ ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
+ sbuilder.populateService();
+ assertNotNull(sbuilder);
+ fail("Parmter is locked can not overide" ) ;
+ }catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e) ;
+ } catch (DeploymentException e) {
+
+ }
+ }
+
+ public void testOveride_locked_Para_Operation(){
+ try {
+ assertNotNull(ar);
+ ServiceDescription service = new ServiceDescription();
+ service.setParent(ar);
+ InputStream in = new FileInputStream(repo + "/op_overide_global_para.xml");
+ ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
+ sbuilder.populateService();
+ assertNotNull(sbuilder);
+ fail("Parmter is locked can not overide" ) ;
+ }catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e) ;
+ } catch (DeploymentException e) {
+
+ }
+ }
+
+ public void testOveride_Service_locked_Para_Operation(){
+ try {
+ assertNotNull(ar);
+ ServiceDescription service = new ServiceDescription();
+ service.setParent(ar);
+ InputStream in = new FileInputStream(repo + "/Op_overide_Service_para.xml");
+ ServiceBuilder sbuilder = new ServiceBuilder(in,null,service);
+ sbuilder.populateService();
+ fail("Parmter is locked can not overide" ) ;
+ }catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e) ;
+ } catch (DeploymentException e) {
+
+ }
+ }
+
+ public void testOveride_Non_locked_Para_Module(){
+ try {
+ assertNotNull(ar);
+ ModuleDescription module = new ModuleDescription();
+ module.setParent(ar);
+ InputStream in = new FileInputStream(repo + "/module_overide_global_non_locked_para.xml");
+ ModuleBuilder mbuilder = new ModuleBuilder(in,null,module);
+ mbuilder.populateModule();
+ }catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e) ;
+ } catch (DeploymentException e) {
+
+ }
+ }
+
+ public void testOveride_locked_Para_Module(){
+ try {
+ assertNotNull(ar);
+ ModuleDescription module = new ModuleDescription();
+ module.setParent(ar);
+ InputStream in = new FileInputStream(repo + "/module_overide_locked_para.xml");
+ ModuleBuilder mbuilder = new ModuleBuilder(in,null,module);
+ mbuilder.populateModule();
+ fail("Parmter is locked can not overide" ) ;
+ }catch (FileNotFoundException e) {
+ fail("This can not fail with this FileNotFoundException " + e) ;
+ } catch (DeploymentException e) {
+
+ }
+ }
+}