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 az...@apache.org on 2006/04/21 22:42:50 UTC
svn commit: r396000 - in /webservices/axis2/trunk/java/modules/core:
src/org/apache/axis2/description/ test/org/apache/axis2/deployment/
Author: azeez
Date: Fri Apr 21 13:42:49 2006
New Revision: 396000
URL: http://svn.apache.org/viewcvs?rev=396000&view=rev
Log:
Added facility to remove parameters
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/HandlerDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleConfiguration.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/TransportInDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescription.java?rev=396000&r1=395999&r2=396000&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescription.java Fri Apr 21 13:42:49 2006
@@ -39,6 +39,10 @@
parameterInclude.addParameter(param);
}
+ public void removeParameter(Parameter param) throws AxisFault {
+ parameterInclude.removeParameter(param);
+ }
+
public void deserializeParameters(OMElement parameterElement)
throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java?rev=396000&r1=395999&r2=396000&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisModule.java Fri Apr 21 13:42:49 2006
@@ -52,7 +52,7 @@
private Module module;
private ClassLoader moduleClassLoader;
// To keep the File that moduel came from
- private URL fileName ;
+ private URL fileName;
/**
* Field name
@@ -103,6 +103,14 @@
throw new AxisFault(Messages.getMessage("paramterlockedbyparent", param.getName()));
} else {
parameters.addParameter(param);
+ }
+ }
+
+ public void removeParameter(Parameter param) throws AxisFault {
+ if (isParameterLocked(param.getName())) {
+ throw new AxisFault(Messages.getMessage("paramterlockedbyparent", param.getName()));
+ } else {
+ parameters.removeParameter(param);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=396000&r1=395999&r2=396000&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Fri Apr 21 13:42:49 2006
@@ -1013,10 +1013,6 @@
}
}
- public void removeParameter(String paramName){
- getParameters().remove(new Parameter(paramName, null));
- }
-
public Map getNameSpacesMap() {
return nameSpacesMap;
}
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=396000&r1=395999&r2=396000&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 Fri Apr 21 13:42:49 2006
@@ -79,9 +79,17 @@
*/
public void addParameter(Parameter param) throws AxisFault {
if (isParameterLocked(param.getName())) {
- throw new AxisFault(Messages.getMessage("paramterlockedbyparent",param.getName()));
+ throw new AxisFault(Messages.getMessage("paramterlockedbyparent", param.getName()));
} else {
parameterInclude.addParameter(param);
+ }
+ }
+
+ public void removeParameter(Parameter param) throws AxisFault {
+ if (isParameterLocked(param.getName())) {
+ throw new AxisFault(Messages.getMessage("paramterlockedbyparent", param.getName()));
+ } else {
+ parameterInclude.removeParameter(param);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleConfiguration.java?rev=396000&r1=395999&r2=396000&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleConfiguration.java Fri Apr 21 13:42:49 2006
@@ -30,11 +30,11 @@
* <parameter> ....</parameter>
* </moduleConfig>
* <p/>
- * Right now this just keeps stores the set of parameters
+ * Right now this just keeps stores the set of parameters
*/
public class ModuleConfiguration implements ParameterInclude {
private QName moduleName;
- private ParameterInclude parameterinclude;
+ private ParameterInclude parameterInclude;
// to keep the pointer to its parent , only to access parameters
private ParameterInclude parent;
@@ -42,19 +42,27 @@
public ModuleConfiguration(QName moduleName, ParameterInclude parent) {
this.moduleName = moduleName;
this.parent = parent;
- parameterinclude = new ParameterIncludeImpl();
+ parameterInclude = new ParameterIncludeImpl();
}
public void addParameter(Parameter param) throws AxisFault {
if (isParameterLocked(param.getName())) {
- throw new AxisFault(Messages.getMessage("paramterlockedbyparent",param.getName()));
+ throw new AxisFault(Messages.getMessage("paramterlockedbyparent", param.getName()));
} else {
- parameterinclude.addParameter(param);
+ parameterInclude.addParameter(param);
+ }
+ }
+
+ public void removeParameter(Parameter param) throws AxisFault {
+ if (isParameterLocked(param.getName())) {
+ throw new AxisFault(Messages.getMessage("paramterlockedbyparent", param.getName()));
+ } else {
+ parameterInclude.removeParameter(param);
}
}
public void deserializeParameters(OMElement parameterElement) throws AxisFault {
- this.parameterinclude.deserializeParameters(parameterElement);
+ this.parameterInclude.deserializeParameters(parameterElement);
}
public QName getModuleName() {
@@ -62,11 +70,11 @@
}
public Parameter getParameter(String name) {
- return parameterinclude.getParameter(name);
+ return parameterInclude.getParameter(name);
}
public ArrayList getParameters() {
- return parameterinclude.getParameters();
+ return parameterInclude.getParameters();
}
public boolean isParameterLocked(String parameterName) {
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=396000&r1=395999&r2=396000&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 Fri Apr 21 13:42:49 2006
@@ -34,6 +34,8 @@
*/
public void addParameter(Parameter param) throws AxisFault;
+ public void removeParameter(Parameter param) throws AxisFault;
+
public void deserializeParameters(OMElement parameterElement) throws AxisFault;
/**
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=396000&r1=395999&r2=396000&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 Fri Apr 21 13:42:49 2006
@@ -56,6 +56,10 @@
}
}
+ public void removeParameter(Parameter param) throws AxisFault {
+ parameters.remove(param.getName());
+ }
+
/**
* Since at runtime it parameters may be modified
* to get the original state this method can be used
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=396000&r1=395999&r2=396000&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 Fri Apr 21 13:42:49 2006
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.i18n.Messages;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.transport.TransportListener;
@@ -39,7 +40,7 @@
// Stores handler Fault in inFlow
private Phase faultPhase;
- /**
+ /**
* Field flowInclude
*/
private Flow inFlow;
@@ -77,6 +78,10 @@
*/
public void addParameter(Parameter param) throws AxisFault {
paramInclude.addParameter(param);
+ }
+
+ public void removeParameter(Parameter param) throws AxisFault {
+ paramInclude.removeParameter(param);
}
public void deserializeParameters(OMElement parameterElement) throws AxisFault {
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=396000&r1=395999&r2=396000&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 Fri Apr 21 13:42:49 2006
@@ -75,6 +75,10 @@
paramInclude.addParameter(param);
}
+ public void removeParameter(Parameter param) throws AxisFault {
+ paramInclude.removeParameter(param);
+ }
+
public void deserializeParameters(OMElement parameterElement) throws AxisFault {
this.paramInclude.deserializeParameters(parameterElement);
}
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=396000&r1=395999&r2=396000&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 Fri Apr 21 13:42:49 2006
@@ -47,6 +47,9 @@
public void addParameter(Parameter param) throws AxisFault {
}
+ public void removeParameter(Parameter param) throws AxisFault {
+ }
+
public Parameter getParameter(String name) {
return null;
}