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 sa...@apache.org on 2006/01/27 08:10:17 UTC
svn commit: r372772 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/deployment/
core/src/org/apache/axis2/description/ samples/src/userguide/loggingmodule/
Author: sanka
Date: Thu Jan 26 23:09:53 2006
New Revision: 372772
URL: http://svn.apache.org/viewcvs?rev=372772&view=rev
Log:
Adding String[] getSupportedPolicyNamespace() method to AxisModule. We need to know the domain specific policy namespaces which the module is capable of handling
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.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/description/AxisModule.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PolicyInclude.java
webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=372772&r1=372771&r2=372772&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Thu Jan 26 23:09:53 2006
@@ -54,6 +54,7 @@
String TAG_MESSAGE_RECEIVERS = "messageReceivers";
String TAG_MEP = "mep";
String TAG_DEFAULT_MODULE_VERSION = "defaultModuleVersions";
+
String TAG_FLOW_OUT_FAULT = "Outfaultflow"; // faultflow start tag
String TAG_FLOW_OUT = "outflow"; // outflow start tag
@@ -68,6 +69,8 @@
String TAG_CLASS_NAME = "class";
String TAG_AFTER = "after";
String TAG_BEFORE = "before";
+ String TAG_SUPPORTED_POLICY_NAMESPACES = "supported-policy-namespaces";
+ String TAG_NAMESPACES = "namespaces";
// for parameters
String ATTRIBUTE_NAME = "name";
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=372772&r1=372771&r2=372772&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 Thu Jan 26 23:09:53 2006
@@ -202,6 +202,17 @@
return flow;
}
+
+ protected String[] processSupportedPolicyNamespaces(OMElement supportedPolicyElements) {
+ OMAttribute namespaces = supportedPolicyElements.getAttribute(new QName(TAG_NAMESPACES));
+ if (namespaces != null) {
+ String value = namespaces.getAttributeValue();
+ if (! value.trim().equals("")) {
+ return value.split(" ");
+ }
+ }
+ return null;
+ }
/**
* Processes Handler element.
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=372772&r1=372771&r2=372772&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 Thu Jan 26 23:09:53 2006
@@ -155,6 +155,14 @@
if (outFaultFlow != null) {
module.setFaultOutFlow(processFlow(outFaultFlow, module));
}
+
+ OMElement supportedPolicyNamespaces = moduleElement.getFirstChildWithName(new QName(TAG_SUPPORTED_POLICY_NAMESPACES));
+
+ if (supportedPolicyNamespaces != null) {
+ module.setSupportedPolicyNamespaces(processSupportedPolicyNamespaces(supportedPolicyNamespaces));
+
+ System.out.println("done");
+ }
// processing Operations
Iterator op_itr = moduleElement.getChildrenWithName(new QName(TAG_OPERATION));
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=372772&r1=372771&r2=372772&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 Thu Jan 26 23:09:53 2006
@@ -68,6 +68,8 @@
// Small description about the module
private String moduleDescription;
+ private String[] supportedPolicyNames;
+
/**
* Constructor ModuleDescription.
*/
@@ -251,6 +253,14 @@
public void setModuleDescription(String moduleDescription) {
this.moduleDescription = moduleDescription;
+ }
+
+ public String[] getSupportedPolicyNamespaces() {
+ return supportedPolicyNames;
+ }
+
+ public void setSupportedPolicyNamespaces(String[] supportedPolicyNamespaces) {
+ this.supportedPolicyNames = supportedPolicyNamespaces;
}
public String getFileName() {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PolicyInclude.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PolicyInclude.java?rev=372772&r1=372771&r2=372772&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PolicyInclude.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PolicyInclude.java Thu Jan 26 23:09:53 2006
@@ -25,7 +25,7 @@
public class PolicyInclude {
- public static final String ANON_POLICY = "anonymous";
+ public static final int ANON_POLICY = 100;
public static final int AXIS_POLICY = 1;
@@ -97,7 +97,9 @@
}
public void setPolicy(Policy policy) {
- this.policy = policy;
+ wrapperElements = new ArrayList();
+ Wrapper wrapper = new Wrapper(PolicyInclude.ANON_POLICY, policy);
+ wrapperElements.add(wrapper);
}
public void setEffectivePolicy(Policy effectivePolicy) {
@@ -144,10 +146,8 @@
result = (result == null) ? (Policy) p.normalize(reg)
: (Policy) result.merge(p, reg);
}
- setPolicy(result);
+ this.policy = result;
useCacheP(true);
-
- calculateEffectivePolicy();
}
private void calculateEffectivePolicy() {
@@ -160,7 +160,13 @@
result = getPolicy();
} else {
- result = (Policy) parentPolicy.merge(getPolicy(), reg);
+
+ if (getPolicy() != null) {
+ result = (Policy) parentPolicy.merge(getPolicy(), reg);
+
+ } else {
+ result = parentPolicy;
+ }
}
} else {
@@ -182,7 +188,8 @@
public Policy getEffectivePolicy() {
if (! useCacheE) {
- calculateEffectivePolicy();
+ calculateEffectivePolicy();
+ useCacheE(true);
}
return effectivePolicy;
}
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java?rev=372772&r1=372771&r2=372772&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java Thu Jan 26 23:09:53 2006
@@ -37,4 +37,8 @@
// shutdown the module
public void shutdown(AxisConfiguration axisSystem) throws AxisFault {
}
+
+ public String[] getPolicyNamespaces() {
+ return null;
+ }
}