You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/30 04:51:42 UTC
svn commit: r523916 - in /incubator/tuscany/java/sca/scdl4j: assembly/
assembly/src/main/java/org/apache/tuscany/assembly/model/
assembly/src/main/java/org/apache/tuscany/assembly/model/impl/
assembly/src/test/java/org/apache/tuscany/assembly/model/ po...
Author: jsdelfino
Date: Thu Mar 29 19:51:41 2007
New Revision: 523916
URL: http://svn.apache.org/viewvc?view=rev&rev=523916
Log:
Changed assembly and policy models to use language independent representations of Interface and Operation from the tuscany-idl module. Added a list of Operations to Intent and PolicySet to represent which Operations an Intent or PolicySet applies to.
Removed:
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Interface.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Operation.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/InterfaceImpl.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/OperationImpl.java
Modified:
incubator/tuscany/java/sca/scdl4j/assembly/pom.xml
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java
incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ContractImpl.java
incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestInterface.java
incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestOperation.java
incubator/tuscany/java/sca/scdl4j/policy/pom.xml
incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/Intent.java
incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/PolicySet.java
incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/IntentImpl.java
incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/PolicySetImpl.java
Modified: incubator/tuscany/java/sca/scdl4j/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/pom.xml?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/pom.xml (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/pom.xml Thu Mar 29 19:51:41 2007
@@ -40,6 +40,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.tuscany.sca.idl</groupId>
+ <artifactId>tuscany-idl</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.2</version>
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractContract.java Thu Mar 29 19:51:41 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.assembly.model;
import org.apache.tuscany.policy.model.IntentAttachPoint;
+import org.apache.tuscany.sca.idl.Interface;
/**
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ContractImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ContractImpl.java?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ContractImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ContractImpl.java Thu Mar 29 19:51:41 2007
@@ -22,8 +22,8 @@
import java.util.List;
import org.apache.tuscany.assembly.model.AbstractContract;
-import org.apache.tuscany.assembly.model.Interface;
import org.apache.tuscany.policy.model.Intent;
+import org.apache.tuscany.sca.idl.Interface;
public class ContractImpl extends BaseImpl implements AbstractContract {
private Interface callbackInterface;
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestInterface.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestInterface.java?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestInterface.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestInterface.java Thu Mar 29 19:51:41 2007
@@ -18,7 +18,9 @@
*/
package org.apache.tuscany.assembly.model;
-import org.apache.tuscany.assembly.model.impl.InterfaceImpl;
+import org.apache.tuscany.sca.idl.Interface;
+import org.apache.tuscany.sca.idl.Operation;
+import org.apache.tuscany.sca.idl.impl.InterfaceImpl;
/**
* A test interface model.
@@ -29,7 +31,6 @@
public TestInterface(AssemblyFactory factory) {
- setConversational(true);
setRemotable(true);
Operation operation = new TestOperation();
Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestOperation.java?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestOperation.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestOperation.java Thu Mar 29 19:51:41 2007
@@ -18,7 +18,8 @@
*/
package org.apache.tuscany.assembly.model;
-import org.apache.tuscany.assembly.model.impl.OperationImpl;
+import org.apache.tuscany.sca.idl.Operation;
+import org.apache.tuscany.sca.idl.impl.OperationImpl;
/**
* A test operation model.
Modified: incubator/tuscany/java/sca/scdl4j/policy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/policy/pom.xml?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/policy/pom.xml (original)
+++ incubator/tuscany/java/sca/scdl4j/policy/pom.xml Thu Mar 29 19:51:41 2007
@@ -33,6 +33,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.tuscany.sca.idl</groupId>
+ <artifactId>tuscany-idl</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.2</version>
Modified: incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/Intent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/Intent.java?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/Intent.java (original)
+++ incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/Intent.java Thu Mar 29 19:51:41 2007
@@ -18,8 +18,12 @@
*/
package org.apache.tuscany.policy.model;
+import java.util.List;
+
import javax.xml.namespace.QName;
+import org.apache.tuscany.sca.idl.Operation;
+
/**
@@ -38,5 +42,11 @@
* @param name the intent name
*/
void setName(QName name);
+
+ /**
+ * Returns the list of operations that this intent applies to.
+ * @return
+ */
+ List<Operation> getOperations();
}
Modified: incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/PolicySet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/PolicySet.java?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/PolicySet.java (original)
+++ incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/PolicySet.java Thu Mar 29 19:51:41 2007
@@ -18,8 +18,12 @@
*/
package org.apache.tuscany.policy.model;
+import java.util.List;
+
import javax.xml.namespace.QName;
+import org.apache.tuscany.sca.idl.Operation;
+
/**
@@ -39,4 +43,10 @@
*/
void setName(QName name);
+ /**
+ * Returns the list of operations that this policy set applies to.
+ * @return
+ */
+ List<Operation> getOperations();
+
}
Modified: incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/IntentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/IntentImpl.java?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/IntentImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/IntentImpl.java Thu Mar 29 19:51:41 2007
@@ -18,9 +18,13 @@
*/
package org.apache.tuscany.policy.model.impl;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.xml.namespace.QName;
import org.apache.tuscany.policy.model.Intent;
+import org.apache.tuscany.sca.idl.Operation;
/**
* Represents a policy intent.
@@ -30,6 +34,7 @@
public class IntentImpl implements Intent {
private QName name;
+ private List<Operation> operations = new ArrayList<Operation>();
public QName getName() {
return name;
@@ -37,6 +42,10 @@
public void setName(QName name) {
this.name = name;
+ }
+
+ public List<Operation> getOperations() {
+ return operations;
}
}
Modified: incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/PolicySetImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/PolicySetImpl.java?view=diff&rev=523916&r1=523915&r2=523916
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/PolicySetImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/impl/PolicySetImpl.java Thu Mar 29 19:51:41 2007
@@ -18,9 +18,13 @@
*/
package org.apache.tuscany.policy.model.impl;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.xml.namespace.QName;
import org.apache.tuscany.policy.model.PolicySet;
+import org.apache.tuscany.sca.idl.Operation;
/**
* Represents a policy set.
@@ -30,6 +34,7 @@
public class PolicySetImpl implements PolicySet {
private QName name;
+ private List<Operation> operations = new ArrayList<Operation>();
public QName getName() {
return name;
@@ -37,6 +42,10 @@
public void setName(QName name) {
this.name = name;
+ }
+
+ public List<Operation> getOperations() {
+ return operations;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org