Author: lresende
Date: Tue Jul 8 16:58:47 2008
New Revision: 675063
URL: http://svn.apache.org/viewvc?rev=675063&view=rev
Log:
TUSCANY-2466 - Merging changes from trunk to only apply resolve algorithm to
unresolved policies
Modified:
tuscany/branches/sca-java-1.3/modules/ (props changed)
tuscany/branches/sca-java-1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/ (props changed)
Propchange: tuscany/branches/sca-java-1.3/modules/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 8 16:58:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules:673298,674894-674933,675006
+/tuscany/java/sca/modules:673298,674894-674933,675006,675061
Modified:
tuscany/branches/sca-java-1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=675063&r1=675062&r2=675063&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
(original)
+++
tuscany/branches/sca-java-1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
Tue Jul 8 16:58:47 2008
@@ -740,8 +740,12 @@
List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();
PolicySet resolvedPolicySet = null;
for (PolicySet policySet : policySets) {
- resolvedPolicySet = resolver.resolveModel(PolicySet.class,
policySet);
- resolvedPolicySets.add(resolvedPolicySet);
+ if (policySet.isUnresolved()) {
+ resolvedPolicySet = resolver.resolveModel(PolicySet.class,
policySet);
+ resolvedPolicySets.add(resolvedPolicySet);
+ } else {
+ resolvedPolicySets.add(policySet);
+ }
}
policySets.clear();
policySets.addAll(resolvedPolicySets);
Propchange: tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 8 16:58:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-ws-wsdlgen:673298,675013
+/tuscany/java/sca/modules/binding-ws-wsdlgen:673298,675013,675061
