Author: svkrish
Date: Thu Aug 16 03:46:22 2007
New Revision: 566652
URL: http://svn.apache.org/viewvc?view=rev&rev=566652
Log:
removing IntentAttachPoint and PolicyAttachPoint as superinterfaces, making
only those sca artifact impls that must implement policy support to support
these interfaces and fixing processors to execute policy related operations on
sca artifacts only if they are instances of PolicySetAttachPoint
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java?view=diff&rev=566652&r1=566651&r2=566652
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
Thu Aug 16 03:46:22 2007
@@ -223,8 +223,7 @@
intent.setName(qname);
if (operation != null) {
//intent.getOperations().add(operation);
- operation.getRequiredIntents().add(intent);
- }
+}
requiredIntents.add(intent);
}
}
@@ -235,8 +234,10 @@
* @param attachPoint
* @param reader
*/
- protected void readPolicies(PolicySetAttachPoint attachPoint,
XMLStreamReader reader) {
- readPolicies(attachPoint, null, reader);
+ protected void readPolicies(Object attachPoint, XMLStreamReader reader) {
+ if ( attachPoint instanceof PolicySetAttachPoint ) {
+ readPolicies((PolicySetAttachPoint)attachPoint, null, reader);
+ }
}
/**
@@ -257,7 +258,6 @@
policySet.setName(qname);
if (operation != null) {
//policySet.getOperations().add(operation);
- operation.getPolicySets().add(policySet);
}
policySets.add(policySet);
}
@@ -409,8 +409,10 @@
}
}
- resolveIntents(implementation.getRequiredIntents(), resolver);
- resolvePolicySets(implementation.getPolicySets(), resolver);
+ if ( implementation instanceof PolicySetAttachPoint ) {
+
resolveIntents(((PolicySetAttachPoint)implementation).getRequiredIntents(),
resolver);
+
resolvePolicySets(((PolicySetAttachPoint)implementation).getPolicySets(),
resolver);
+ }
}
}
return implementation;
@@ -433,8 +435,14 @@
for (int i = 0, n = contract.getBindings().size(); i < n; i++) {
Binding binding = contract.getBindings().get(i);
extensionProcessor.resolve(binding, resolver);
- resolveIntents(binding.getRequiredIntents(), resolver);
- resolvePolicySets(binding.getPolicySets(), resolver);
+ if ( binding instanceof IntentAttachPoint ) {
+ IntentAttachPoint policiedBinding =
(IntentAttachPoint)binding;
+ resolveIntents(policiedBinding.getRequiredIntents(),
resolver);
+ }
+ if ( binding instanceof PolicySetAttachPoint ) {
+ PolicySetAttachPoint policiedBinding =
(PolicySetAttachPoint)binding;
+ resolvePolicySets(policiedBinding.getPolicySets(),
resolver);
+ }
}
// Resolve callback bindings
@@ -444,8 +452,15 @@
for (int i = 0, n =
contract.getCallback().getBindings().size(); i < n; i++) {
Binding binding =
contract.getCallback().getBindings().get(i);
extensionProcessor.resolve(binding, resolver);
- resolveIntents(binding.getRequiredIntents(), resolver);
- resolvePolicySets(binding.getPolicySets(), resolver);
+
+ if ( binding instanceof IntentAttachPoint ) {
+ IntentAttachPoint policiedBinding =
(IntentAttachPoint)binding;
+ resolveIntents(policiedBinding.getRequiredIntents(),
resolver);
+ }
+ if ( binding instanceof PolicySetAttachPoint ) {
+ PolicySetAttachPoint policiedBinding =
(PolicySetAttachPoint)binding;
+ resolvePolicySets(policiedBinding.getPolicySets(),
resolver);
+ }
}
}
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java?view=diff&rev=566652&r1=566651&r2=566652
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
Thu Aug 16 03:46:22 2007
@@ -47,6 +47,7 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
/**
* A componentType processor.
@@ -317,8 +318,10 @@
// Resolve component type services and references
resolveContracts(componentType.getServices(), resolver);
resolveContracts(componentType.getReferences(), resolver);
- resolveIntents(componentType.getRequiredIntents(), resolver);
- resolvePolicySets(componentType.getPolicySets(), resolver);
+ if ( componentType instanceof PolicySetAttachPoint ) {
+
resolveIntents(((PolicySetAttachPoint)componentType).getRequiredIntents(),
resolver);
+
resolvePolicySets(((PolicySetAttachPoint)componentType).getPolicySets(),
resolver);
+ }
}
public QName getArtifactType() {
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?view=diff&rev=566652&r1=566651&r2=566652
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Thu Aug 16 03:46:22 2007
@@ -58,6 +58,7 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
/**
* A composite processor.
@@ -632,8 +633,10 @@
// Resolve composite services and references
resolveContracts(composite.getServices(), resolver);
resolveContracts(composite.getReferences(), resolver);
- resolveIntents(composite.getRequiredIntents(), resolver);
- resolvePolicySets(composite.getPolicySets(), resolver);
+ if ( composite instanceof PolicySetAttachPoint ) {
+
resolveIntents(((PolicySetAttachPoint)composite).getRequiredIntents(),
resolver);
+
resolvePolicySets(((PolicySetAttachPoint)composite).getPolicySets(), resolver);
+ }
}
public QName getArtifactType() {
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java?view=diff&rev=566652&r1=566651&r2=566652
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
Thu Aug 16 03:46:22 2007
@@ -178,11 +178,19 @@
implementation.getReferences().addAll(componentType.getReferences());
implementation.getProperties().addAll(componentType.getProperties());
implementation.setConstrainingType(componentType.getConstrainingType());
- if (implementation.getPolicySets() != null) {
-
implementation.getPolicySets().addAll(componentType.getPolicySets());
- }
- if (implementation.getRequiredIntents() != null) {
-
implementation.getRequiredIntents().addAll(componentType.getRequiredIntents());
+
+ if (implementation instanceof PolicySetAttachPoint &&
+ componentType instanceof PolicySetAttachPoint )
+ {
+ PolicySetAttachPoint policiedImpl =
(PolicySetAttachPoint)implementation;
+ PolicySetAttachPoint policiedCompType =
(PolicySetAttachPoint)componentType;
+
+ if ( policiedImpl.getPolicySets() != null) {
+
policiedImpl.getPolicySets().addAll(policiedCompType.getPolicySets());
+ }
+ if (policiedImpl.getRequiredIntents() != null) {
+
policiedImpl.getRequiredIntents().addAll(policiedCompType.getRequiredIntents());
+ }
}
}
}
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java?view=diff&rev=566652&r1=566651&r2=566652
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
Thu Aug 16 03:46:22 2007
@@ -47,6 +47,7 @@
import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -84,9 +85,9 @@
assertEquals(composite.getConstrainingType().getName(), new
QName("http://calc";, "CalculatorComponent"));
assertTrue(composite.isLocal());
assertFalse(composite.isAutowire());
- assertEquals(composite.getRequiredIntents().get(0).getName(), new
QName("http://test";,
+
assertEquals(((PolicySetAttachPoint)composite).getRequiredIntents().get(0).getName(),
new QName("http://test";,
"confidentiality"));
- assertEquals(composite.getPolicySets().get(0).getName(), new
QName("http://test";, "SecureReliablePolicy"));
+
assertEquals(((PolicySetAttachPoint)composite).getPolicySets().get(0).getName(),
new QName("http://test";, "SecureReliablePolicy"));
Composite include = composite.getIncludes().get(0);
assertEquals(include.getName(), new QName("http://calc";,
"TestAllDivide"));
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java?view=diff&rev=566652&r1=566651&r2=566652
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
Thu Aug 16 03:46:22 2007
@@ -42,6 +42,7 @@
import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.apache.tuscany.sca.policy.SCADefinitions;
import org.apache.tuscany.sca.policy.xml.PolicySetProcessor;
import org.apache.tuscany.sca.policy.xml.ProfileIntentProcessor;
@@ -125,8 +126,8 @@
}
private void preResolvePolicyTests(Composite composite) {
- assertNull(composite.getRequiredIntents().get(0).getDescription());
-
assertTrue(composite.getPolicySets().get(0).getProvidedIntents().isEmpty());
+
assertNull(((PolicySetAttachPoint)composite).getRequiredIntents().get(0).getDescription());
+
assertTrue(((PolicySetAttachPoint)composite).getPolicySets().get(0).getProvidedIntents().isEmpty());
assertNull(composite.getServices().get(0).getRequiredIntents().get(0).getDescription());
assertTrue(composite.getServices().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
@@ -147,9 +148,9 @@
}
private void postResolvePolicyTests(Composite composite) {
- assertNotNull(composite.getRequiredIntents().get(0).getDescription());
-
assertFalse(composite.getPolicySets().get(0).getProvidedIntents().isEmpty());
-
assertNotNull(composite.getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
+
assertNotNull(((PolicySetAttachPoint)composite).getRequiredIntents().get(0).getDescription());
+
assertFalse(((PolicySetAttachPoint)composite).getPolicySets().get(0).getProvidedIntents().isEmpty());
+
assertNotNull(((PolicySetAttachPoint)composite).getPolicySets().get(0).getProvidedIntents().get(1).getDescription());
assertNotNull(composite.getServices().get(0).getRequiredIntents().get(0).getDescription());
assertFalse(composite.getServices().get(0).getPolicySets().get(0).getProvidedIntents().isEmpty());
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java?view=diff&rev=566652&r1=566651&r2=566652
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
Thu Aug 16 03:46:22 2007
@@ -37,26 +37,13 @@
public class TestSCABindingImpl implements SCABinding, WireableBinding {
private String name;
private String uri;
- private List<PolicySet> policySets = new ArrayList<PolicySet>();
- private List<Intent> requiredIntents = new ArrayList<Intent>();
private List<Object> extensions = new ArrayList<Object>();
private Component targetComponent;
private ComponentService targetComponentService;
private Binding targetBinding;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();
private boolean isRemote = false;
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
-
-
/**
* Constructs a new SCA binding.
*/
@@ -77,14 +64,6 @@
public void setURI(String uri) {
this.uri = uri;
- }
-
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
}
public List<Object> getExtensions() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
