Author: rfeng
Date: Wed Mar 4 17:26:22 2009
New Revision: 750084
URL: http://svn.apache.org/viewvc?rev=750084&view=rev
Log:
Make Endpoint2/Endpoint2Reference extend from PolicySubject
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java?rev=750084&r1=750083&r2=750084&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
Wed Mar 4 17:26:22 2009
@@ -18,9 +18,8 @@
*/
package org.apache.tuscany.sca.assembly;
-import java.util.List;
-
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.policy.PolicySubject;
/**
* Represents a service endpoint which is what results from having a
configured
@@ -30,7 +29,7 @@
*
* @version $Rev$ $Date$
*/
-public interface Endpoint2 extends Base, Cloneable {
+public interface Endpoint2 extends Base, PolicySubject, Cloneable {
/**
* Get the component model object
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java?rev=750084&r1=750083&r2=750084&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
Wed Mar 4 17:26:22 2009
@@ -18,9 +18,8 @@
*/
package org.apache.tuscany.sca.assembly;
-import java.util.List;
-
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.policy.PolicySubject;
/**
* Represents an endpoint reference. An SCA reference can reference service
enpoints in a
@@ -29,7 +28,7 @@
*
* @version $Rev$ $Date$
*/
-public interface EndpointReference2 extends Base, Cloneable {
+public interface EndpointReference2 extends Base, PolicySubject, Cloneable {
/**
* Get the name of the target service that this endpoint reference refers
to
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java?rev=750084&r1=750083&r2=750084&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
Wed Mar 4 17:26:22 2009
@@ -23,11 +23,13 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.assembly.Endpoint2;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.policy.ExtensionType;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.PolicySubject;
/**
* The assembly model object for an endpoint.
@@ -35,17 +37,19 @@
* @version $Rev$ $Date$
*/
public class Endpoint2Impl implements Endpoint2 {
-
+
private Component component;
private ComponentService service;
private Binding binding;
- private Binding callbackBinding;
+ private Binding callbackBinding;
private InterfaceContract interfaceContract;
private String uri;
-
+ private List<PolicySet> policySets = new ArrayList<PolicySet>();
+ private List<Intent> requiredIntents = new ArrayList<Intent>();
+
protected Endpoint2Impl() {
}
-
+
@Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
@@ -55,11 +59,11 @@
// TODO Auto-generated method stub
return false;
}
-
+
public void setUnresolved(boolean unresolved) {
// TODO Auto-generated method stub
}
-
+
public Component getComponent() {
return component;
}
@@ -74,29 +78,48 @@
public void setService(ComponentService service) {
this.service = service;
- }
-
+ }
+
public Binding getBinding() {
return binding;
}
public void setBinding(Binding binding) {
this.binding = binding;
- }
-
+ }
+
public InterfaceContract getInterfaceContract() {
return interfaceContract;
}
-
+
public void setInterfaceContract(InterfaceContract interfaceContract) {
this.interfaceContract = interfaceContract;
}
-
+
public String getURI() {
return uri;
}
-
+
public void setURI(String uri) {
this.uri = uri;
}
+
+ public List<PolicySet> getPolicySets() {
+ return policySets;
+ }
+
+ public List<Intent> getRequiredIntents() {
+ return requiredIntents;
+ }
+
+ public ExtensionType getType() {
+ if (binding instanceof PolicySubject) {
+ return ((PolicySubject)binding).getType();
+ }
+ return null;
+ }
+
+ public void setType(ExtensionType type) {
+ throw new UnsupportedOperationException();
+ }
}
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java?rev=750084&r1=750083&r2=750084&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java
Wed Mar 4 17:26:22 2009
@@ -24,11 +24,13 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.assembly.Endpoint2;
import org.apache.tuscany.sca.assembly.EndpointReference2;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.policy.ExtensionType;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.PolicySubject;
/**
* The assembly model object for an endpoint.
@@ -36,7 +38,7 @@
* @version $Rev$ $Date$
*/
public class EndpointReference2Impl implements EndpointReference2 {
-
+
private String targetName;
private Component component;
private ComponentReference reference;
@@ -45,29 +47,31 @@
private Endpoint2 endpoint;
private InterfaceContract interfaceContract;
private String uri;
-
+ private List<PolicySet> policySets = new ArrayList<PolicySet>();
+ private List<Intent> requiredIntents = new ArrayList<Intent>();
+
protected EndpointReference2Impl() {
}
-
+
@Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
-
+
public boolean isUnresolved() {
// TODO Auto-generated method stub
return false;
}
-
+
public void setUnresolved(boolean unresolved) {
// TODO Auto-generated method stub
}
-
- public String getTargetName(){
+
+ public String getTargetName() {
return targetName;
}
-
- public void setTargetName(String targetName){
+
+ public void setTargetName(String targetName) {
this.targetName = targetName;
}
@@ -85,8 +89,8 @@
public void setReference(ComponentReference reference) {
this.reference = reference;
- }
-
+ }
+
public Binding getBinding() {
return binding;
}
@@ -98,24 +102,43 @@
public Endpoint2 getEndpoint() {
return endpoint;
}
-
+
public void setEndpoint(Endpoint2 endpoint) {
this.endpoint = endpoint;
}
-
+
public InterfaceContract getInterfaceContract() {
return interfaceContract;
}
-
+
public void setInterfaceContract(InterfaceContract interfaceContract) {
this.interfaceContract = interfaceContract;
}
-
+
public String getURI() {
return uri;
}
-
+
public void setURI(String uri) {
this.uri = uri;
- }
+ }
+
+ public List<PolicySet> getPolicySets() {
+ return policySets;
+ }
+
+ public List<Intent> getRequiredIntents() {
+ return requiredIntents;
+ }
+
+ public ExtensionType getType() {
+ if (binding instanceof PolicySubject) {
+ return ((PolicySubject)binding).getType();
+ }
+ return null;
+ }
+
+ public void setType(ExtensionType type) {
+ throw new UnsupportedOperationException();
+ }
}
