Author: svkrish
Date: Thu Mar 27 10:04:24 2008
New Revision: 641896
URL: http://svn.apache.org/viewvc?rev=641896&view=rev
Log:
http://issues.apache.org/jira/browse/TUSCANY-2134
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java?rev=641896&r1=641895&r2=641896&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
Thu Mar 27 10:04:24 2008
@@ -158,6 +158,7 @@
assertEquals(composite.getComponents().get(0).getRequiredIntents().size(), 3);
assertEquals(composite.getComponents().get(0).getRequiredIntents().get(2).getName(),
new QName(namespaceUri, "tuscanyIntent_1"));
assertEquals(composite.getComponents().get(0).getServices().get(0).getRequiredIntents().size(),
4);
+
assertEquals(composite.getComponents().get(0).getServices().get(0).getCallback().getRequiredIntents().size(),
4);
assertEquals(composite.getComponents().get(0).getServices().get(0).getConfiguredOperations().get(0).getRequiredIntents().size(),
5);
assertEquals(composite.getComponents().get(0).getReferences().get(0).getRequiredIntents().size(),
5);
assertEquals(composite.getComponents().get(0).getReferences().get(0).getConfiguredOperations().get(0).getRequiredIntents().size(),
5);
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite?rev=641896&r1=641895&r2=641896&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
Thu Mar 27 10:04:24 2008
@@ -52,6 +52,8 @@
<operation name="add" requires="cns:tuscanyIntent_6
cns:tuscanyIntent_7"/>
<binding.ws name="CalculatorCallbackWS" policySets="" port=""
requires="cns:tuscanyIntent_4" uri="http://calc/callback/ws";>
</binding.ws>
+ <callback>
+ </callback>
</service>
<reference name="addService" target="AddServiceComponent/AddService"
autowire="false" multiplicity="1..1"
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java?rev=641896&r1=641895&r2=641896&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
Thu Mar 27 10:04:24 2008
@@ -921,14 +921,6 @@
componentService.getConfiguredOperations().addAll(opsFromComponentType);
}
- if ( componentService.getCallback() != null ) {
-
PolicyComputationUtils.addInheritedIntents(componentService.getRequiredIntents(),
-
componentService.getCallback().getRequiredIntents());
-
PolicyComputationUtils.addInheritedPolicySets(componentService.getPolicySets(),
-
componentService.getCallback().getPolicySets(),
- false);
- }
-
try {
//compute the intents for operations under service element
bindingPolicyComputer.computeIntentsForOperations(componentService);
@@ -937,13 +929,6 @@
bindingPolicyComputer.computeBindingIntentsAndPolicySets(componentService);
bindingPolicyComputer.determineApplicableBindingPolicySets(componentService,
null);
- if ( componentService.getCallback() != null ) {
-
PolicyComputationUtils.addInheritedIntents(componentService.getRequiredIntents(),
-
componentService.getCallback().getRequiredIntents());
-
PolicyComputationUtils.addInheritedPolicySets(componentService.getPolicySets(),
-
componentService.getCallback().getPolicySets(),
- false);
- }
} catch ( Exception e ) {
warning("Policy related exception: " + e, e);
//throw new RuntimeException(e);
@@ -958,14 +943,7 @@
PolicyComputationUtils.addInheritedPolicySets(reference.getPolicySets(),
componentReference.getPolicySets(), true);
}
- if ( componentReference.getCallback() != null ) {
-
PolicyComputationUtils.addInheritedIntents(componentReference.getRequiredIntents(),
-
componentReference.getCallback().getRequiredIntents());
-
PolicyComputationUtils.addInheritedPolicySets(componentReference.getPolicySets(),
-
componentReference.getCallback().getPolicySets(),
- false);
- }
-
+
try {
//compute the intents for operations under reference
element
bindingPolicyComputer.computeIntentsForOperations(componentReference);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
