Author: svkrish
Date: Mon Dec 10 10:34:08 2007
New Revision: 602988
URL: http://svn.apache.org/viewvc?rev=602988&view=rev
Log:
fixed BaseAssemblyProcessor.java for breaking echobinding sample, regenerated
the keystore with higher validity period for cert (400 days)
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=602988&r1=602987&r2=602988&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
Mon Dec 10 10:34:08 2007
@@ -659,20 +659,22 @@
IntentAttachPointType attachPointType = policySetAttachPoint.getType();
String scdlFragment = ""; //need to write the 'parent' as scdl xml
string
- //validate policysets specified for the attachPoint
- for (PolicySet policySet : policySetAttachPoint.getPolicySets()) {
- appliesTo = policySet.getAppliesTo();
- if ( !policySet.isUnresolved() ) {
- if (!PolicyValidationUtils.isPolicySetApplicable(scdlFragment,
appliesTo, attachPointType)) {
+ if ( attachPointType != null ) {
+ //validate policysets specified for the attachPoint
+ for (PolicySet policySet : policySetAttachPoint.getPolicySets()) {
+ appliesTo = policySet.getAppliesTo();
+ if ( !policySet.isUnresolved() ) {
+ if
(!PolicyValidationUtils.isPolicySetApplicable(scdlFragment, appliesTo,
attachPointType)) {
+ throw new ContributionResolveException("Policy Set '"
+ policySet.getName()
+ + "' does not apply to binding type "
+ + attachPointType.getName());
+
+ } }
+ else {
throw new ContributionResolveException("Policy Set '" +
policySet.getName()
- + "' does not apply to binding type "
- + attachPointType.getName());
-
- } }
- else {
- throw new ContributionResolveException("Policy Set '" +
policySet.getName()
- + "' is not defined in this domain ");
-
+ + "' is not defined in this domain ");
+
+ }
}
}
}
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks?rev=602988&r1=602987&r2=602988&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks?rev=602988&r1=602987&r2=602988&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
