Author: svkrish
Date: Thu Aug 16 03:51:58 2007
New Revision: 566654
URL: http://svn.apache.org/viewvc?view=rev&rev=566654
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/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java
incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/HTTPResourceBinding.java
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
Modified:
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
Thu Aug 16 03:51:58 2007
@@ -34,16 +34,7 @@
private String name;
private String uri;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
public String getName() {
return name;
@@ -61,15 +52,6 @@
this.uri = uri;
}
- public List<PolicySet> getPolicySets() {
- // The binding does not support policies
- return Collections.emptyList();
- }
-
- public List<Intent> getRequiredIntents() {
- // The binding does not support policies
- return Collections.emptyList();
- }
public List<Object> getExtensions() {
// The binding does not support extensions
Modified:
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
Thu Aug 16 03:51:58 2007
@@ -34,16 +34,6 @@
private String name;
private String uri;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
public String getName() {
return name;
@@ -59,16 +49,6 @@
public void setURI(String uri) {
this.uri = uri;
- }
-
- public List<PolicySet> getPolicySets() {
- // The sample binding does not support policies
- return Collections.emptyList();
- }
-
- public List<Intent> getRequiredIntents() {
- // The binding does not support policies
- return Collections.emptyList();
}
public List<Object> getExtensions() {
Modified:
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
Thu Aug 16 03:51:58 2007
@@ -43,21 +43,8 @@
private String uri = null;
private String name = null;
private boolean unresolved = false;
- private List<PolicySet> policySets = new ArrayList<PolicySet>();
- private List<Intent> requiredIntents = new ArrayList<Intent>();
private List<Object> extensions = new ArrayList<Object>();
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
-
-
// Properties required to describe the JMS
// binding model
@@ -240,9 +227,6 @@
this.name = name;
}
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
public boolean isUnresolved() {
return this.unresolved;
@@ -252,10 +236,6 @@
this.unresolved = unresolved;
}
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
-
public List<Object> getExtensions() {
return extensions;
}
Modified:
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
Thu Aug 16 03:51:58 2007
@@ -127,7 +127,9 @@
JMSBinding jmsBinding = new JMSBinding();
// Read policies
- readPolicies(jmsBinding, reader);
+ if ( jmsBinding instanceof PolicySetAttachPoint ) {
+ readPolicies((PolicySetAttachPoint)jmsBinding, reader);
+ }
// Read binding name
String name = reader.getAttributeValue(null, "name");
Modified:
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
Thu Aug 16 03:51:58 2007
@@ -32,20 +32,8 @@
public class NotificationBindingImpl extends BaseImpl implements
NotificationBinding {
private String name;
private String uri;
- private List<PolicySet> policySets = new ArrayList<PolicySet>();
- private List<Intent> requiredIntents = new ArrayList<Intent>();
protected String ntmAddress;
protected URI notificationType;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
public Object clone() {
return this;
@@ -67,14 +55,6 @@
this.uri = uri;
}
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
-
public String getNtmAddress() {
return ntmAddress;
}
Modified:
incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
Thu Aug 16 03:51:58 2007
@@ -86,7 +86,9 @@
SCABinding scaBinding = scaBindingFactory.createSCABinding();
// Read policies
- readPolicies(scaBinding, reader);
+ if ( scaBinding instanceof IntentAttachPoint && scaBinding
instanceof PolicySetAttachPoint ) {
+ readPolicies((PolicySetAttachPoint)scaBinding, reader);
+ }
// Read binding name
String name = reader.getAttributeValue(null, NAME);
@@ -165,7 +167,6 @@
policySet.setName(qname);
if (operation != null) {
//policySet.getOperations().add(operation);
- operation.getPolicySets().add(policySet);
}
policySets.add(policySet);
}
@@ -188,7 +189,6 @@
intent.setName(qname);
if (operation != null) {
//intent.getOperations().add(operation);
- operation.getRequiredIntents().add(intent);
}
requiredIntents.add(intent);
}
Modified:
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
Thu Aug 16 03:51:58 2007
@@ -39,13 +39,6 @@
private SCABinding scaBinding;
- public List<Intent> getComputedIntents() {
- return null;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return null;
- }
public Component getComponent() {
return null;
@@ -66,14 +59,6 @@
}
public void setURI(String uri) {
- }
-
- public List<Intent> getRequiredIntents() {
- return null;
- }
-
- public List<PolicySet> getPolicySets() {
- return null;
}
public List<Object> getExtensions() {
Modified:
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
Thu Aug 16 03:51:58 2007
@@ -38,15 +38,11 @@
public class SCABindingImpl 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;
private DistributedSCADomain distributedDomain;
@@ -60,15 +56,7 @@
return distributedDomain;
}
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
-
-
+
/**
* Constructs a new SCA binding.
*/
@@ -91,13 +79,6 @@
this.uri = uri;
}
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
public List<Object> getExtensions() {
return extensions;
Modified:
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
Thu Aug 16 03:51:58 2007
@@ -75,7 +75,9 @@
wsBinding.setUnresolved(true);
// Read policies
- readPolicies(wsBinding, reader);
+ if ( wsBinding instanceof PolicySetAttachPoint ) {
+ readPolicies((PolicySetAttachPoint)wsBinding, reader);
+ }
// Read the binding name
String name = reader.getAttributeValue(null, NAME);
Modified:
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
Thu Aug 16 03:51:58 2007
@@ -43,20 +43,8 @@
public class WebServiceBindingImpl implements WebServiceBinding {
private String name;
private String uri;
- private List<PolicySet> policySets = new ArrayList<PolicySet>();
- private List<Intent> requiredIntents = new ArrayList<Intent>();
private boolean unresolved;
private List<Object> extensions = new ArrayList<Object>();
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
private String location;
private Binding binding;
@@ -90,14 +78,6 @@
this.uri = uri;
}
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
-
public boolean isUnresolved() {
return unresolved;
}
Modified:
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
Thu Aug 16 03:51:58 2007
@@ -28,6 +28,7 @@
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.ChildBeanDefinition;
@@ -39,7 +40,17 @@
* @version $Rev$ $Date$
*/
public class BeanComponentImpl extends ChildBeanDefinition implements
Component, Cloneable {
- private static final long serialVersionUID = 1L;
+ public IntentAttachPointType getType() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setType(IntentAttachPointType type) {
+ // TODO Auto-generated method stub
+
+ }
+
+ private static final long serialVersionUID = 1L;
private ConstrainingType constrainingType;
private Implementation implementation;
Modified:
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
Thu Aug 16 03:51:58 2007
@@ -27,6 +27,7 @@
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.implementation.java.BaseJavaImplementation;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -41,23 +42,11 @@
private static final long serialVersionUID = 1L;
private List<Service> services = new ArrayList<Service>();
- private List<Intent> requiredIntents = new ArrayList<Intent>();
- private List<PolicySet> policySets = new ArrayList<PolicySet>();
private ConstrainingType constrainingType;
private List<Object> extensions = new ArrayList<Object>();
private boolean unresolved;
private BeanDefinitionRegistry beanRegistry;
private String uri;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new
ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
protected BeanBaseJavaImplementationImpl(BeanDefinitionRegistry
beanRegistry) {
this.beanRegistry = beanRegistry;
@@ -180,13 +169,4 @@
public void setUnresolved(boolean unresolved) {
this.unresolved = unresolved;
}
-
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
-
}
Modified:
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java
(original)
+++
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractBinding.java
Thu Aug 16 03:51:58 2007
@@ -36,10 +36,6 @@
private String uri;
private List<Object> extensions;
private boolean unresolved;
- private List<Intent> requiredIntents = new ArrayList<Intent>();
- private List<PolicySet> policySets = new ArrayList<PolicySet>();
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
public String getName() {
return name;
@@ -69,19 +65,4 @@
this.unresolved = unresolved;
}
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
}
Modified:
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java
(original)
+++
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/utils/AbstractImplementation.java
Thu Aug 16 03:51:58 2007
@@ -28,6 +28,7 @@
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
/**
@@ -42,18 +43,6 @@
private ConstrainingType constrainingType;
private String uri;
private boolean unresolved = true;
- private List<Intent> intents = new ArrayList<Intent>();
- private List<PolicySet> policySets = new ArrayList<PolicySet>();;
- private List<Intent> computedIntents = new ArrayList<Intent>();
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
public AbstractImplementation() {
}
@@ -86,14 +75,6 @@
this.constrainingType = constrainingType;
}
- public List<Intent> getRequiredIntents() {
- return intents;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
-
public List<Object> getExtensions() {
// TODO what is this for?
return null;
@@ -133,5 +114,4 @@
}
return null;
}
-
}
Modified:
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
Thu Aug 16 03:51:58 2007
@@ -32,6 +32,7 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
import crud.CRUD;
@@ -47,17 +48,7 @@
private Service crudService;
private String directory;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
-
+
/**
* Constructs a new CRUD implementation.
*/
@@ -120,15 +111,6 @@
// The sample CRUD implementation does not have a URI
}
- public List<PolicySet> getPolicySets() {
- // The sample CRUD implementation does not support policy sets
- return Collections.emptyList();
- }
-
- public List<Intent> getRequiredIntents() {
- // The sample CRUD implementation does not support intents
- return Collections.emptyList();
- }
public List<Object> getExtensions() {
// The sample CRUD implementation does not support extensions
@@ -143,5 +125,4 @@
public void setUnresolved(boolean unresolved) {
// The sample CRUD implementation is always resolved
}
-
}
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
Thu Aug 16 03:51:58 2007
@@ -43,6 +43,7 @@
import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
import org.w3c.dom.Node;
@@ -57,16 +58,6 @@
private QName _processName;
private byte[] _compiledProcess;
private boolean unresolved;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
/**
* Constructs a new BPEL implementation.
@@ -132,16 +123,7 @@
// The sample BPEL implementation does not have a URI
}
- public List<PolicySet> getPolicySets() {
- // The sample BPEL implementation does not support policy sets
- return Collections.emptyList();
- }
-
- public List<Intent> getRequiredIntents() {
- // The sample BPEL implementation does not support intents
- return Collections.emptyList();
- }
-
+
public List<Object> getExtensions() {
// The sample BPEL implementation does not support extensions
return Collections.emptyList();
Modified:
incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java
Thu Aug 16 03:51:58 2007
@@ -33,6 +33,7 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -117,31 +118,11 @@
// The sample DAS implementation does not have a URI
}
- public List<PolicySet> getPolicySets() {
- // The sample DAS implementation does not support policy sets
- return Collections.emptyList();
- }
-
- public List<Intent> getRequiredIntents() {
- // The sample DAS implementation does not support intents
- return Collections.emptyList();
- }
-
public List<Object> getExtensions() {
// The sample DAS implementation does not support extensions
return Collections.emptyList();
}
- public List<Intent> getComputedIntents() {
- //The sample DAS implementation does not support computed intents
- return Collections.emptyList();
- }
-
- public List<PolicySet> getComputedPolicySets() {
- //The sample DAS implementation does not support computed policysets
- return Collections.emptyList();
- }
-
public boolean isUnresolved() {
// The sample DAS implementation is always resolved
return false;
@@ -150,5 +131,4 @@
public void setUnresolved(boolean unresolved) {
// The sample DAS implementation is always resolved
}
-
}
Modified:
incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java
Thu Aug 16 03:51:58 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.sca.implementation.data;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -33,6 +34,7 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -117,25 +119,6 @@
// The sample DATA implementation does not have a URI
}
- public List<PolicySet> getPolicySets() {
- // The sample DATA implementation does not support policy sets
- return Collections.emptyList();
- }
-
- public List<Intent> getRequiredIntents() {
- // The sample DATA implementation does not support intents
- return Collections.emptyList();
- }
-
- public List<Intent> getComputedIntents() {
- //The sample DATA implementation does not support intents
- return Collections.emptyList();
- }
-
- public List<PolicySet> getComputedPolicySets() {
- //The sample DATA implementation does not support policy sets
- return Collections.emptyList();
- }
public List<Object> getExtensions() {
// The sample DATA implementation does not support extensions
@@ -149,5 +132,5 @@
public void setUnresolved(boolean unresolved) {
// The sample DATA implementation is always resolved
- }
+ }
}
Modified:
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
Thu Aug 16 03:51:58 2007
@@ -69,7 +69,9 @@
javaImplementation.setName(reader.getAttributeValue(null, CLASS));
// Read policies
- readPolicies(javaImplementation, reader);
+ if ( javaImplementation instanceof PolicySetAttachPoint ) {
+ readPolicies((PolicySetAttachPoint)javaImplementation, reader);
+ }
// Skip to end element
while (reader.hasNext()) {
Modified:
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
Thu Aug 16 03:51:58 2007
@@ -51,16 +51,6 @@
private long maxAge = -1;
private long maxIdleTime = -1;
private JavaScopeImpl scope = JavaScopeImpl.STATELESS;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
protected JavaImplementationImpl() {
super();
Modified:
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
Thu Aug 16 03:51:58 2007
@@ -34,6 +34,7 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.osoa.sca.annotations.Requires;
/**
@@ -101,7 +102,6 @@
Intent intent = policyFactory.createIntent();
intent.setName(getQName(intentName));
//intent.getOperations().add(operation);
- operation.getRequiredIntents().add(intent);
requiredIntents.add(intent);
}
}
@@ -111,7 +111,9 @@
public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws
IntrospectionException {
// Read intents on the Java implementation class
- readIntents(clazz, type.getRequiredIntents());
+ if ( type instanceof PolicySetAttachPoint ) {
+ readIntents(clazz,
((PolicySetAttachPoint)type).getRequiredIntents());
+ }
// Process annotations on the service interfaces
//TODO This will have to move to a JavaInterface introspector later
@@ -160,6 +162,8 @@
public void visitMethod(Method method, JavaImplementation type) throws
IntrospectionException {
// Read the intents specified on the given implementation method
- readIntents(method, type.getRequiredIntents());
+ if ( type instanceof PolicySetAttachPoint ) {
+ readIntents(method,
((PolicySetAttachPoint)type).getRequiredIntents());
+ }
}
}
Modified:
incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
Thu Aug 16 03:51:58 2007
@@ -33,6 +33,7 @@
import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.osoa.sca.annotations.Requires;
import org.osoa.sca.annotations.Service;
@@ -87,11 +88,13 @@
}
private void verifyIntents(Class serviceImplClass, JavaImplementation
type) {
-
+ if ( !(type instanceof PolicySetAttachPoint) ) {
+ fail("No Intents on the service ");
+ }
Requires serviceImplIntentAnnotation =
(Requires)serviceImplClass.getAnnotation(Requires.class);
if (serviceImplIntentAnnotation != null) {
String[] serviceImplIntents = serviceImplIntentAnnotation.value();
- List<Intent> requiredIntents = type.getRequiredIntents();
+ List<Intent> requiredIntents =
((PolicySetAttachPoint)type).getRequiredIntents();
if (serviceImplIntents.length > 0) {
if (requiredIntents == null || requiredIntents.size() == 0) {
fail("No Intents on the service ");
@@ -188,7 +191,7 @@
if (methodIntentAnnotation != null) {
String[] methodIntents = methodIntentAnnotation.value();
if (methodIntents.length > 0) {
- List<Intent> requiredIntents =
type.getRequiredIntents();
+ List<Intent> requiredIntents =
((PolicySetAttachPoint)type).getRequiredIntents();
if (requiredIntents.size() == 0) {
fail("No Intents on operation " +
method.getName());
}
Modified:
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
Thu Aug 16 03:51:58 2007
@@ -40,16 +40,7 @@
private String componentTypeName;
private String implementationType;
private ComponentType componentType;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
public NotificationImplementationImpl() {
// Without this, the loader's resolve is not called
Modified:
incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
Thu Aug 16 03:51:58 2007
@@ -49,16 +49,6 @@
private boolean needsPropertyInjection;
private Hashtable<String, List<ComponentProperty>> referenceProperties;
private Hashtable<String, List<ComponentProperty>> serviceProperties;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
private Hashtable<String, List<ComponentProperty>>
referenceCallbackProperties;
private Hashtable<String, List<ComponentProperty>>
serviceCallbackProperties;
Modified:
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/HTTPResourceBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/HTTPResourceBinding.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/HTTPResourceBinding.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/HTTPResourceBinding.java
Thu Aug 16 03:51:58 2007
@@ -36,16 +36,6 @@
private String name;
private String uri;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
public String getName() {
return name;
@@ -63,15 +53,6 @@
this.uri = uri;
}
- public List<PolicySet> getPolicySets() {
- // The sample binding does not support policies
- return Collections.emptyList();
- }
-
- public List<Intent> getRequiredIntents() {
- // The sample binding does not support policies
- return Collections.emptyList();
- }
public List<Object> getExtensions() {
// The sample binding does not support extensions
Modified:
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
Thu Aug 16 03:51:58 2007
@@ -34,6 +34,7 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -47,16 +48,6 @@
private String location;
private URL url;
private boolean unresolved;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
/**
* Constructs a new resource implementation.
@@ -129,15 +120,6 @@
this.location = uri;
}
- public List<PolicySet> getPolicySets() {
- // The resource implementation does not support policy sets
- return Collections.emptyList();
- }
-
- public List<Intent> getRequiredIntents() {
- // The resource implementation does not support intents
- return Collections.emptyList();
- }
public List<Object> getExtensions() {
// The resource implementation does not support extensions
@@ -150,6 +132,5 @@
public void setUnresolved(boolean unresolved) {
this.unresolved = unresolved;
- }
-
+ }
}
Modified:
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
Thu Aug 16 03:51:58 2007
@@ -49,16 +49,6 @@
private Hashtable<String, SpringBeanElement> serviceMap;
// Mapping of property names to Java class
private Hashtable<String, Class> propertyMap;
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
protected SpringImplementation() {
this.springLocation = null;
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
Thu Aug 16 03:51:58 2007
@@ -178,33 +178,4 @@
*/
Object clone() throws CloneNotSupportedException;
- /**
- * Returns the list of computed/applicable policy intents for this binding
- *
- * @return list of applicable/computed policy intents
- */
- List<Intent> getComputedIntents();
-
- /**
- * Returns the list of computed/applicable policysets for this binding
- *
- * @return list of applicable/computed policysets
- */
- List<PolicySet> getComputedPolicySets();
-
- /**
- * Returns a list of policy intents. See the Policy Framework specification
- * for a description of this attribute.
- *
- * @return a list of policy intents.
- */
- List<Intent> getRequiredIntents();
-
- /**
- * Returns a list of policy sets. See the Policy Framework specification
for
- * a description of this attribute.
- *
- * @return a list of policy sets.
- */
- List<PolicySet> getPolicySets();
}
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java?view=diff&rev=566654&r1=566653&r2=566654
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
Thu Aug 16 03:51:58 2007
@@ -48,11 +48,6 @@
private WrapperInfo wrapper;
private String dataBinding;
private boolean dynamic;
- private List<Intent> requiredIntents = new ArrayList<Intent>();
- private List<PolicySet> policySets = new ArrayList<PolicySet>();
- private List<Intent> computedIntents = new ArrayList<Intent>();;
- private List<PolicySet> computedPolicySets = new ArrayList<PolicySet>();;
-
/**
* @param name
@@ -320,20 +315,4 @@
return copy;
}
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
-
- public List<Intent> getComputedIntents() {
- return computedIntents;
- }
-
- public List<PolicySet> getComputedPolicySets() {
- return computedPolicySets;
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
