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 2007/07/06 09:43:40 UTC
svn commit: r553773 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
description/AxisBindingMessage.java
description/WSDL11ToAxisServiceBuilder.java util/AxisPolicyLocator.java
Author: sanka
Date: Fri Jul 6 00:43:39 2007
New Revision: 553773
URL: http://svn.apache.org/viewvc?view=rev&rev=553773
Log:
Fixed: https://issues.apache.org/jira/browse/AXIS2-2907
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/AxisPolicyLocator.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?view=diff&rev=553773&r1=553772&r2=553773
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java Fri Jul 6 00:43:39 2007
@@ -200,7 +200,7 @@
// AxisBindingOperation policies
AxisBindingOperation axisBindingOperation = getAxisBindingOperation();
if (axisBindingOperation != null) {
- policyList.add(axisBindingOperation.getPolicyInclude()
+ policyList.addAll(axisBindingOperation.getPolicyInclude()
.getAttachedPolicies());
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=553773&r1=553772&r2=553773
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Fri Jul 6 00:43:39 2007
@@ -409,7 +409,7 @@
axisBinding.setName(wsdl4jBinding.getQName());
axisBinding.setParent(axisEndpoint);
axisEndpoint.setBinding(axisBinding);
- axisEndpoint.setBinding(axisBinding);
+ axisBinding.setParent(axisEndpoint);
populateBinding(axisBinding, wsdl4jBinding, isSetMessageQNames);
processedBindings.put(wsdl4jBinding.getQName(), axisBinding);
}
@@ -532,6 +532,7 @@
axisBindingInMessage.setAxisMessage(axisInMessage);
axisBindingInMessage.setDirection(axisInMessage.getDirection());
+ axisBindingInMessage.setParent(axisBindingOperation);
axisBindingOperation
.addChild(axisBindingInMessage.getDirection(), axisBindingInMessage);
}
@@ -570,6 +571,7 @@
axisBindingOutMessage.setAxisMessage(axisOutMessage);
axisBindingOutMessage.setDirection(axisOutMessage.getDirection());
+ axisBindingOutMessage.setParent(axisBindingOperation);
axisBindingOperation
.addChild(axisBindingOutMessage.getDirection(), axisBindingOutMessage);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/AxisPolicyLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/AxisPolicyLocator.java?view=diff&rev=553773&r1=553772&r2=553773
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/AxisPolicyLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/AxisPolicyLocator.java Fri Jul 6 00:43:39 2007
@@ -18,8 +18,17 @@
*/
package org.apache.axis2.util;
+import org.apache.axis2.description.AxisBinding;
+import org.apache.axis2.description.AxisBindingMessage;
+import org.apache.axis2.description.AxisBindingOperation;
import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisEndpoint;
+import org.apache.axis2.description.AxisMessage;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.PolicyInclude;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyRegistry;
@@ -27,6 +36,18 @@
AxisDescription subject = null;
+ private static final short AXIS_BINDING_MESSAGE = 1;
+ private static final short AXIS_MESSAGE = 2;
+ private static final short AXIS_BINDING_OPERATION = 3;
+ private static final short AXIS_OPERATION = 4;
+ private static final short AXIS_BINDING = 5;
+ private static final short AXIS_ENDPOINT = 6;
+ private static final short AXIS_SERVICE = 7;
+ private static final short AXIS_SERVICE_GROUP = 8;
+ private static final short AXIS_CONFIGURATION = 9;
+
+
+
public AxisPolicyLocator(AxisDescription subject) {
this.subject = subject;
}
@@ -44,23 +65,93 @@
return policy;
}
- AxisDescription parent = subject.getParent();
+ short type = getType(subject);
- if (parent == null) {
- return null;
-
- } else {
- AxisPolicyLocator locator = new AxisPolicyLocator(parent);
- return locator.lookup(key);
+ /*
+ * processing the parallel level
+ */
+ AxisDescription parallelLevel = null;
+
+ switch (type) {
+ case AXIS_BINDING_MESSAGE:
+ parallelLevel = ((AxisBindingMessage) subject).getAxisMessage();
+ break;
+ case AXIS_BINDING_OPERATION:
+ parallelLevel = ((AxisBindingOperation) subject).getAxisOperation();
+ break;
+ default:
+ break;
+ }
+
+ if (parallelLevel != null) {
+ policy = (new AxisPolicyLocator(parallelLevel)).lookup(key);
+ if (policy != null) {
+ return policy;
+ }
}
-
+
+ AxisDescription upperLevel = getUpperLevel(type, subject);
+ if (upperLevel != null) {
+ policy = (new AxisPolicyLocator(upperLevel)).lookup(key);
+ return policy;
+ }
+
+ return null;
}
-
+
public void register(String key, Policy policy) {
throw new UnsupportedOperationException();
}
public void remove(String key) {
throw new UnsupportedOperationException();
+ }
+
+
+
+ private AxisDescription getUpperLevel(short type, AxisDescription thisLevel) {
+
+ switch (type) {
+ case AXIS_BINDING_MESSAGE:
+ return ((AxisBindingMessage) thisLevel).getAxisBindingOperation();
+ case AXIS_BINDING_OPERATION:
+ return ((AxisBindingOperation) thisLevel).getAxisBinding();
+ case AXIS_BINDING:
+ return ((AxisBinding) thisLevel).getAxisEndpoint();
+ case AXIS_ENDPOINT:
+ return ((AxisEndpoint) thisLevel).getAxisService();
+ case AXIS_SERVICE:
+ return ((AxisService) thisLevel).getAxisServiceGroup();
+ case AXIS_SERVICE_GROUP:
+ return ((AxisServiceGroup) thisLevel).getAxisConfiguration();
+ default:
+ return null;
+ }
+ }
+
+ private short getType(AxisDescription description) {
+
+ if (description instanceof AxisBindingMessage) {
+ return AXIS_BINDING_MESSAGE;
+ } else if (description instanceof AxisMessage) {
+ return AXIS_MESSAGE;
+ } else if (description instanceof AxisBindingOperation) {
+ return AXIS_BINDING_OPERATION;
+ } else if (description instanceof AxisOperation) {
+ return AXIS_OPERATION;
+ } else if (description instanceof AxisBinding) {
+ return AXIS_BINDING;
+ } else if (description instanceof AxisEndpoint) {
+ return AXIS_ENDPOINT;
+ } else if (description instanceof AxisService) {
+ return AXIS_SERVICE;
+ } else if (description instanceof AxisServiceGroup) {
+ return AXIS_SERVICE_GROUP;
+ } else if (description instanceof AxisConfiguration) {
+ return AXIS_CONFIGURATION;
+ }
+
+ return -1;
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org