You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2008/04/07 11:24:46 UTC
svn commit: r645424 - in /webservices/sandesha/branches/sandesha2/java/1_4:
modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
pom.xml
Author: davidillsley
Date: Mon Apr 7 02:24:44 2008
New Revision: 645424
URL: http://svn.apache.org/viewvc?rev=645424&view=rev
Log:
Merge changes from HEAD and update pom to build against the Axis2 1.4 RC4 Maven2 Repo.
Modified:
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
webservices/sandesha/branches/sandesha2/java/1_4/pom.xml
Modified: webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=645424&r1=645423&r2=645424&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Mon Apr 7 02:24:44 2008
@@ -576,7 +576,7 @@
try {
worker.run();
} catch(Exception e) {
- log.error("Caught exception running SandeshaWorker", e);
+ log.debug("Caught exception running SandeshaWorker", e);
}
}
Modified: webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java?rev=645424&r1=645423&r2=645424&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_4/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java Mon Apr 7 02:24:44 2008
@@ -22,10 +22,12 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Collection;
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.PolicySubject;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.sandesha2.Sandesha2Constants;
@@ -147,43 +149,46 @@
public static SandeshaPolicyBean loadPropertiesFromModuleDescPolicy(AxisModule desc,
SandeshaPolicyBean parentPropertyBean) throws SandeshaException {
- Policy policy = desc.getPolicyInclude().getEffectivePolicy();
+ boolean found = false;
+ Assertion assertion = null;
- if (policy == null) {
- return null; // no pilicy is available in the module description
- }
-
- Iterator iterator = policy.getAlternatives();
- if (! iterator.hasNext()) {
- throw new SandeshaException("No Policy Alternative found");
+ PolicySubject policySubject = desc.getPolicySubject();
+ if (policySubject == null) {
+ return null;
}
-
- List assertionList = (List) iterator.next();
- Assertion assertion = null;
-
- boolean found = false;
-
- for (Iterator assertions = assertionList.iterator(); assertions.hasNext();) {
- assertion = (Assertion) assertions.next();
-
- if (assertion instanceof SandeshaPolicyBean) {
- found = true;
- break;
+ Collection policyComponents = policySubject.getAttachedPolicyComponents();
+ if (policyComponents == null) {
+ return null;
+ }
+ Iterator policies = policyComponents.iterator();
+ while (!found && policies.hasNext()) {
+ Policy policy = (Policy) policies.next();
+ Iterator iterator = policy.getAlternatives();
+ while (!found && iterator.hasNext()) {
+ List assertionList = (List) iterator.next();
+ Iterator assertions = assertionList.iterator();
+ while (!found && assertions.hasNext()) {
+ assertion = (Assertion) assertions.next();
+ if (assertion instanceof SandeshaPolicyBean) {
+ found = true;
+ break;
+ }
+ }
}
}
-
- if (! found) {
- // no RMAssertion found
+
+ // no RMAssertion found
+ if (!found) {
return null;
}
-
+
SandeshaPolicyBean propertyBean = (SandeshaPolicyBean) assertion;
propertyBean.setParent(parentPropertyBean);
- return propertyBean;
- }
+ return propertyBean;
+ }
- public static SandeshaPolicyBean loadPropertiesFromAxisDescription(AxisDescription desc,
+ public static SandeshaPolicyBean loadPropertiesFromAxisDescription(AxisDescription desc,
SandeshaPolicyBean parentPropertyBean) throws SandeshaException {
Policy policy = desc.getPolicyInclude().getEffectivePolicy();
Modified: webservices/sandesha/branches/sandesha2/java/1_4/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_4/pom.xml?rev=645424&r1=645423&r2=645424&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_4/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_4/pom.xml Mon Apr 7 02:24:44 2008
@@ -160,6 +160,21 @@
<name>Apache ws.zones - 2</name>
<url>http://ws.zones.apache.org/repository2</url>
</repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>axis2-rc4</id>
+ <name>Axis2 RC4 Repo</name>
+ <url>http://people.apache.org/~dims/axis2-1.4/RC4/m2-repo</url>
+ </repository>
</repositories>
<pluginRepositories>
@@ -187,6 +202,18 @@
</releases>
</pluginRepository>
+ <pluginRepository>
+ <id>axis2-rc4</id>
+ <name>Axis2 RC4 Repo</name>
+ <url>http://people.apache.org/~dims/axis2-1.4/RC4/m2-repo</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+
</pluginRepositories>
<dependencies>
@@ -285,9 +312,9 @@
<properties>
<sandesha2.version>1.4-RC1</sandesha2.version>
- <axis2.version>SNAPSHOT</axis2.version>
- <axiom.version>SNAPSHOT</axiom.version>
- <neethi.version>SNAPSHOT</neethi.version>
+ <axis2.version>1.4</axis2.version>
+ <axiom.version>1.2.6</axiom.version>
+ <neethi.version>2.0.3</neethi.version>
<commons.logging.version>1.1.1</commons.logging.version>
<stax.api.version>1.0.1</stax.api.version>
<stax.impl.artifactid>wstx-asl</stax.impl.artifactid>
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org