You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/09/10 12:06:25 UTC
svn commit: r813344 - in /tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly: AssemblyFactory.java ConfiguredOperation.java OperationsConfigurator.java impl/AssemblyFactoryImpl.java impl/ConfiguredOperationImpl.java

Author: antelder
Date: Thu Sep 10 10:06:25 2009
New Revision: 813344

URL: http://svn.apache.org/viewvc?rev=813344&view=rev
Log:
Merge ConfiguredOperation Assembly methods from 1.x to 2.x

Added:
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java   (contents, props changed)
      - copied, changed from r813324, tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java   (props changed)
      - copied unchanged from r813324, tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java   (contents, props changed)
      - copied, changed from r813335, tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
Modified:
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java?rev=813344&r1=813343&r2=813344&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java Thu Sep 10 10:06:25 2009
@@ -163,4 +163,11 @@
      * @return a new endpoint reference
      */
     EndpointReference createEndpointReference();
+
+    /** 
+     * Create a new configured operation.
+     * 
+     * @return a new ConfiguredOperation 
+     */
+    ConfiguredOperation createConfiguredOperation();
 }

Copied: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java (from r813324, tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java?p2=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java&p1=tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java&r1=813324&r2=813344&rev=813344&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java Thu Sep 10 10:06:25 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.assembly;
 
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.PolicySubject;
 
 /**
  * Represents an Operation. Typically Operation elements are used when there is a
@@ -27,7 +27,7 @@
  *
  * @version $Rev$ $Date$
  */
-public interface ConfiguredOperation extends Base, PolicySetAttachPoint {
+public interface ConfiguredOperation extends Base, PolicySubject {
     /**
      * Returns the name of the operation.
      * 

Propchange: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
------------------------------------------------------------------------------
    eol-style = native

Propchange: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 10 10:06:25 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java:671193

Propchange: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
------------------------------------------------------------------------------
    eol-style = native

Propchange: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 10 10:06:25 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java:671193

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java?rev=813344&r1=813343&r2=813344&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java Thu Sep 10 10:06:25 2009
@@ -32,6 +32,7 @@
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.CompositeReference;
 import org.apache.tuscany.sca.assembly.CompositeService;
+import org.apache.tuscany.sca.assembly.ConfiguredOperation;
 import org.apache.tuscany.sca.assembly.ConstrainingType;
 import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.assembly.EndpointReference;
@@ -135,4 +136,8 @@
     public EndpointReference createEndpointReference() {
         return new EndpointReferenceImpl(registry);
     }
+
+    public ConfiguredOperation createConfiguredOperation() {
+        return new ConfiguredOperationImpl();
+    }
 }

Copied: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java (from r813335, tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java?p2=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java&p1=tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java&r1=813335&r2=813344&rev=813344&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java Thu Sep 10 10:06:25 2009
@@ -23,8 +23,8 @@
 import java.util.List;
 
 import org.apache.tuscany.sca.assembly.ConfiguredOperation;
+import org.apache.tuscany.sca.policy.ExtensionType;
 import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
 import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
@@ -39,6 +39,7 @@
     
     private String name;
     private String contractName;
+    private ExtensionType type;
 
     /**
      * Constructs a new Operation.
@@ -78,15 +79,16 @@
         this.contractName = contractName;
     }
 
-    public IntentAttachPointType getType() {
-        return null;
+    public List<PolicySet> getApplicablePolicySets() {
+        return applicablePolicySets;
     }
 
-    public void setType(IntentAttachPointType type) {
+    public ExtensionType getExtensionType() {
+        return type;
     }
 
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
+    public void setExtensionType(ExtensionType type) {
+        this.type = type;
     }
     
     

Propchange: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
------------------------------------------------------------------------------
    eol-style = native

Propchange: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 10 10:06:25 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java:671193