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/08/31 13:38:17 UTC
svn commit: r265019 - in /webservices/axis2/trunk/java/modules/core:
src/org/apache/axis2/deployment/ src/org/apache/axis2/description/
src/org/apache/axis2/engine/ src/org/apache/axis2/storage/impl/
src/org/apache/axis2/util/ test/org/apache/axis2/dep...
Author: deepal
Date: Wed Aug 31 04:37:44 2005
New Revision: 265019
URL: http://svn.apache.org/viewcvs?rev=265019&view=rev
Log:
added a test case to check parameter addition
Added:
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java
Modified:
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/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/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/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/util/Utils.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -753,7 +753,7 @@
// this);
// schme.parseServiceXML(axisService);
loadServiceProperties(axisService);
- axisConfig.addService(axisService);
+// axisConfig.addService(axisService);
} catch (AxisFault axisFault) {
throw new DeploymentException(axisFault);
}
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -159,6 +159,7 @@
new QName(PARAMETERST));
processParameters(paramters,handler,parent);
}
+ handler.setParent(parent);
return handler;
}
@@ -246,7 +247,11 @@
paramter.setLocked(false);
}
}
- parameterInclude.addParameter(paramter);
+ try {
+ parameterInclude.addParameter(paramter);
+ } catch (AxisFault axisFault) {
+ throw new DeploymentException(axisFault);
+ }
}
}
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -16,6 +16,7 @@
package org.apache.axis2.description;
import org.apache.axis2.engine.Handler;
+import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -49,6 +50,8 @@
*/
private String className;
+ private ParameterInclude parent;
+
/**
* Constructor HandlerDescription
*/
@@ -102,8 +105,12 @@
/**
* @param param
*/
- public void addParameter(Parameter param) {
- parameterInclude.addParameter(param);
+ public void addParameter(Parameter param) throws AxisFault{
+ if(isParamterLocked(param.getName())){
+ throw new AxisFault("Parmter is locked can not overide: " + param.getName());
+ } else{
+ parameterInclude.addParameter(param);
+ }
}
/**
@@ -120,6 +127,11 @@
//to check whether the paramter is locked at any levle
public boolean isParamterLocked(String paramterName) {
+ if(parent != null){
+ if(parent.isParamterLocked(paramterName)){
+ return true;
+ }
+ }
return parameterInclude.isParamterLocked(paramterName);
}
@@ -153,5 +165,13 @@
*/
public void setClassName(String className) {
this.className = className;
+ }
+
+ public ParameterInclude getParent() {
+ return parent;
+ }
+
+ public void setParent(ParameterInclude parent) {
+ this.parent = parent;
}
}
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -17,6 +17,7 @@
import org.apache.axis2.modules.Module;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -127,8 +128,12 @@
/**
* @param param
*/
- public void addParameter(Parameter param) {
- parameters.addParameter(param);
+ public void addParameter(Parameter param)throws AxisFault{
+ if(isParamterLocked(param.getName())){
+ throw new AxisFault("Parmter is locked can not overide: " + param.getName());
+ } else{
+ parameters.addParameter(param);
+ }
}
/**
@@ -187,10 +192,13 @@
this.parent = parent;
}
- //to check whether a given paramter is locked
+ //to check whether a given paramter is locked
public boolean isParamterLocked(String paramterName) {
// checking the locked value of parent
- boolean loscked = getParent().isParamterLocked(paramterName);
+ boolean loscked = false;
+ if (getParent() !=null) {
+ loscked= getParent().isParamterLocked(paramterName);
+ }
if(loscked){
return true;
} else {
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -47,8 +47,8 @@
remainingPhasesInFlow.add(
new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
Phase messageProcessing = new Phase(PhaseMetadata.PHASE_MESSAGE_PROCESSING);
- messageProcessing.addHandler(new SOAPProcessingModelChecker());
- remainingPhasesInFlow.add(messageProcessing);
+ messageProcessing.addHandler(new SOAPProcessingModelChecker());
+ remainingPhasesInFlow.add(messageProcessing);
phasesOutFlow = new ArrayList();
phasesOutFlow.add(new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
@@ -130,13 +130,17 @@
*
* @param param Parameter that will be added
*/
- public void addParameter(Parameter param) {
+ public void addParameter(Parameter param) throws AxisFault {
if (param == null) {
return;
}
- ParameterIncludeImpl paramInclude = (ParameterIncludeImpl) this
- .getComponentProperty(PARAMETER_KEY);
- paramInclude.addParameter(param);
+ if(isParamterLocked(param.getName())){
+ throw new AxisFault("Parmter is locked can not overide: " + param.getName());
+ } else{
+ ParameterIncludeImpl paramInclude = (ParameterIncludeImpl) this
+ .getComponentProperty(PARAMETER_KEY);
+ paramInclude.addParameter(param);
+ }
}
/**
@@ -201,7 +205,7 @@
if (null == operationContext) {
throw new AxisFault(Messages.getMessage("cannotCorrealteMsg",
- this.getName().toString(),msgContext.getRelatesTo().getValue()));
+ this.getName().toString(),msgContext.getRelatesTo().getValue()));
}
}
@@ -341,10 +345,13 @@
this.parent = parent;
}
- //to check whether a given paramter is locked
+ //to check whether a given paramter is locked
public boolean isParamterLocked(String paramterName) {
// checking the locked value of parent
- boolean loscked = getParent().isParamterLocked(paramterName);
+ boolean loscked = false;
+ if (getParent() !=null) {
+ loscked= getParent().isParamterLocked(paramterName);
+ }
if(loscked){
return true;
} else {
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -15,6 +15,8 @@
*/
package org.apache.axis2.description;
+import org.apache.axis2.AxisFault;
+
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -30,7 +32,7 @@
*
* @param param
*/
- public void addParameter(Parameter param);
+ public void addParameter(Parameter param) throws AxisFault;
/**
* Method getParameter
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -41,7 +41,7 @@
*
* @param param
*/
- public void addParameter(Parameter param) {
+ public void addParameter(Parameter param) {
if (param != null) {
parmeters.put(param.getName(), param);
}
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -334,13 +334,18 @@
*
* @param param
*/
- public void addParameter(Parameter param) {
+ public void addParameter(Parameter param) throws AxisFault {
if (param == null) {
return;
}
- ParameterIncludeImpl paramInclude =
- (ParameterIncludeImpl) this.getComponentProperty(PARAMETER_KEY);
- paramInclude.addParameter(param);
+
+ if(isParamterLocked(param.getName())){
+ throw new AxisFault("Parmter is locked can not overide: " + param.getName());
+ } else{
+ ParameterIncludeImpl paramInclude =
+ (ParameterIncludeImpl) this.getComponentProperty(PARAMETER_KEY);
+ paramInclude.addParameter(param);
+ }
}
/*
@@ -773,7 +778,11 @@
//to check whether a given paramter is locked
public boolean isParamterLocked(String paramterName) {
// checking the locked value of parent
- boolean loscked = getParent().isParamterLocked(paramterName);
+ boolean loscked = false;
+
+ if (getParent() !=null) {
+ loscked = getParent().isParamterLocked(paramterName);
+ }
if(loscked){
return true;
} else {
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -18,6 +18,7 @@
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -96,7 +97,7 @@
*
* @param param
*/
- public void addParameter(Parameter param) {
+ public void addParameter(Parameter param) throws AxisFault{
paramInclude.addParameter(param);
}
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -18,6 +18,7 @@
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -90,7 +91,7 @@
*
* @param param
*/
- public void addParameter(Parameter param) {
+ public void addParameter(Parameter param) throws AxisFault {
paramInclude.addParameter(param);
}
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -116,14 +116,30 @@
new Phase(PhaseMetadata.PHASE_PRE_DISPATCH));
Phase dispatch = new Phase(PhaseMetadata.PHASE_DISPATCH);
- dispatch.addHandler(new AddressingBasedDispatcher(), 0);
- dispatch.addHandler(new RequestURIBasedDispatcher(), 1);
- dispatch.addHandler(new SOAPActionBasedDispatcher(), 2);
- dispatch.addHandler(new SOAPMessageBodyBasedDispatcher(), 3);
+ AddressingBasedDispatcher add_dispatch = new AddressingBasedDispatcher();
+ add_dispatch.getHandlerDesc().setParent(this);
+ dispatch.addHandler(add_dispatch, 0);
+
+ RequestURIBasedDispatcher uri_diaptch = new RequestURIBasedDispatcher();
+ uri_diaptch.getHandlerDesc().setParent(this);
+ dispatch.addHandler(uri_diaptch, 1);
+
+ SOAPActionBasedDispatcher soapActionBased_dispatch = new SOAPActionBasedDispatcher();
+ soapActionBased_dispatch.getHandlerDesc().setParent(this);
+ dispatch.addHandler(soapActionBased_dispatch, 2);
+
+ SOAPMessageBodyBasedDispatcher soapMessageBodybased_dispatch =
+ new SOAPMessageBodyBasedDispatcher();
+ soapMessageBodybased_dispatch.getHandlerDesc().setParent(this);
+ dispatch.addHandler(soapMessageBodybased_dispatch, 3);
+
inPhasesUptoAndIncludingPostDispatch.add(dispatch);
Phase postDispatch = new Phase(PhaseMetadata.PHASE_POST_DISPATCH);
- postDispatch.addHandler(new DispatchingChecker());
+ DispatchingChecker dispatchingChecker = new DispatchingChecker();
+ dispatchingChecker.getHandlerDesc().setParent(this);
+
+ postDispatch.addHandler(dispatchingChecker);
inPhasesUptoAndIncludingPostDispatch.add(postDispatch);
}
@@ -349,8 +365,12 @@
*
* @param param
*/
- public void addParameter(Parameter param) {
- paramInclude.addParameter(param);
+ public void addParameter(Parameter param) throws AxisFault{
+ if(isParamterLocked(param.getName())){
+ throw new AxisFault("Parmter is locked can not overide: " + param.getName());
+ } else{
+ paramInclude.addParameter(param);
+ }
}
/**
@@ -388,8 +408,8 @@
} else {
throw new AxisFault(
this + " Refer to invalid module "
- + moduleref.getLocalPart() +
- " has not bean deployed yet !");
+ + moduleref.getLocalPart() +
+ " has not bean deployed yet !");
}
if (tobeEnaged) {
new PhaseResolver(this).engageModuleGlobally(module);
@@ -399,7 +419,7 @@
addMdoule(module);
}
}
-
+
public boolean isEngaged(QName moduleName) {
return engagedModules.contains(moduleName);
}
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -3,6 +3,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterIncludeImpl;
import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.AxisFault;
import java.io.File;
import java.io.FileNotFoundException;
@@ -109,7 +110,7 @@
}
- public void addParameter(Parameter param) {
+ public void addParameter(Parameter param) throws AxisFault{
paramter.addParameter(param);
}
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -3,6 +3,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterInclude;
import org.apache.axis2.description.ParameterIncludeImpl;
+import org.apache.axis2.AxisFault;
import java.util.HashMap;
import java.util.ArrayList;
@@ -63,7 +64,7 @@
}
- public void addParameter(Parameter param) {
+ public void addParameter(Parameter param) throws AxisFault {
paramter.addParameter(param);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=265019&r1=265018&r2=265019&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Wed Aug 31 04:37:44 2005
@@ -77,7 +77,7 @@
public static ServiceDescription createSimpleService(QName serviceName,
MessageReceiver messageReceiver,
String className,
- QName opName) {
+ QName opName) throws AxisFault {
ServiceDescription service = new ServiceDescription(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(
@@ -102,7 +102,7 @@
public static ServiceDescription createSimpleService(QName serviceName,
String className,
- QName opName) {
+ QName opName) throws AxisFault {
return createSimpleService(serviceName,
new RawXMLINOutMessageReceiver(),
className,
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=265019&r1=265018&r2=265019&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 04:37:44 2005
@@ -4,6 +4,7 @@
import org.apache.axis2.description.ParameterIncludeImpl;
import org.apache.axis2.engine.AxisEvent;
import org.apache.axis2.engine.AxisObserver;
+import org.apache.axis2.AxisFault;
import java.util.ArrayList;
@@ -43,7 +44,7 @@
//To change body of implemented methods use File | Settings | File Templates.
}
- public void addParameter(Parameter param) {
+ public void addParameter(Parameter param) throws AxisFault{
// paramterimpl.addParameter(param);
}
@@ -57,6 +58,6 @@
//to check whether the paramter is locked at any levle
public boolean isParamterLocked(String paramterName) {
- return false;
+ return false;
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java?rev=265019&r1=265018&r2=265019&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java Wed Aug 31 04:37:44 2005
@@ -21,12 +21,15 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
+import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.handlers.AbstractHandler;
import javax.xml.namespace.QName;
public class RegistryTest extends AbstractTestCase {
- private AxisConfiguration reg;
+ private AxisConfiguration reg = new AxisConfigurationImpl();
+ ServiceDescription service = new ServiceDescription(
+ new QName("Service1"));
public RegistryTest(String testName) {
super(testName);
@@ -55,33 +58,32 @@
}
- public void testHandlerMedatata() {
+ public void testHandlerMedatata() throws AxisFault {
HandlerDescription hmd = new HandlerDescription();
testParameteInClude(hmd);
}
- public void testService() {
- ServiceDescription service = new ServiceDescription(
- new QName("Service1"));
+ public void testService() throws AxisFault {
+ service.setParent(reg);
testParameteInClude(service);
testFlowIncludeTest(service);
-
-
}
- public void testModule() {
+ public void testModule() throws AxisFault {
ModuleDescription module = new ModuleDescription(new QName("module1"));
+ module.setParent(reg);
testParameteInClude(module);
testFlowIncludeTest(module);
}
- public void testOpeartion() {
+ public void testOpeartion() throws AxisFault {
OperationDescription op = new OperationDescription(new QName("op"));
+ op.setParent(service);
testParameteInClude(op);
}
- public void testParameteInClude(ParameterInclude parmInclude) {
+ public void testParameteInClude(ParameterInclude parmInclude) throws AxisFault {
String key = "value1";
Parameter p = new ParameterImpl(key, "value2");
parmInclude.addParameter(p);
Added: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java?rev=265019&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java (added)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParamterAddTest.java Wed Aug 31 04:37:44 2005
@@ -0,0 +1,115 @@
+package org.apache.axis2.engine;
+
+import junit.framework.TestCase;
+import org.apache.axis2.description.*;
+import org.apache.axis2.AxisFault;
+
+import javax.xml.namespace.QName;
+/*
+* 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: Aug 31, 2005
+ * Time: 4:28:03 PM
+ */
+
+/**
+ * To chcek locked is working corrcetly
+ */
+
+public class ParamterAddTest extends TestCase {
+
+ private AxisConfiguration reg = new AxisConfigurationImpl();
+ public void testAddParamterServiceLockedAtAxisConfig(){
+ try {
+ Parameter para = new ParameterImpl();
+ para.setValue(null);
+ para.setName("PARA_NAME");
+ para.setLocked(true);
+ reg.addParameter(para);
+
+ ServiceDescription service = new ServiceDescription(new QName("Service1"));
+ service.setParent(reg);
+ service.addParameter(para);
+ fail("This should fails with Parmter is locked can not overide");
+ } catch (AxisFault axisFault) {
+
+ }
+ }
+
+ public void testAddParamterModuleLockedAtAxisConfig(){
+ try {
+ Parameter para = new ParameterImpl();
+ para.setValue(null);
+ para.setName("PARA_NAME");
+ para.setLocked(true);
+ reg.addParameter(para);
+ ModuleDescription module = new ModuleDescription(new QName("Service1"));
+ module.setParent(reg);
+ module.addParameter(para);
+ fail("This should fails with Parmter is locked can not overide");
+ } catch (AxisFault axisFault) {
+
+ }
+ }
+
+ public void testAddParamterOpeartionlockedByAxisConfig(){
+ try {
+ Parameter para = new ParameterImpl();
+ para.setValue(null);
+ para.setName("PARA_NAME");
+ para.setLocked(true);
+ reg.addParameter(para);
+
+ ServiceDescription service = new ServiceDescription(new QName("Service1"));
+ service.setParent(reg);
+
+ OperationDescription opertion = new OperationDescription();
+ opertion.setParent(service);
+ opertion.addParameter(para);
+ fail("This should fails with Parmter is locked can not overide");
+
+
+ } catch (AxisFault axisFault) {
+
+ }
+ }
+
+ public void testAddParamterOpeartionLockebyService(){
+ try {
+ Parameter para = new ParameterImpl();
+ para.setValue(null);
+ para.setName("PARA_NAME");
+ para.setLocked(true);
+
+ ServiceDescription service = new ServiceDescription(new QName("Service1"));
+ service.setParent(reg);
+ service.addParameter(para);
+
+ OperationDescription opertion = new OperationDescription();
+ opertion.setParent(service);
+ opertion.addParameter(para);
+ fail("This should fails with Parmter is locked can not overide");
+ } catch (AxisFault axisFault) {
+
+ }
+ }
+
+
+}