svn commit: r511500 - in /incubator/tuscany/java/sca/kernel: core/src/main/java/org/apache/tuscany/core/builder/ spi/src/main/java/org/apache/tuscany/spi/builder/ spi/src/main/java/org/apache/tuscany/spi/model/physical/

[me...@apache.org]

Author: meerajk
Date: Sun Feb 25 05:06:21 2007
New Revision: 511500

URL: http://svn.apache.org/viewvc?view=rev&rev=511500
Log:
renamed WireDefinition to PhysicalWireDefinition and InterceptorDefinition to PhysicalInterceptorDefinition

Added:
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalInterceptorDefinition.java
      - copied, changed from r511488, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java
      - copied, changed from r511488, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java
Removed:
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java
Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=511500&r1=511499&r2=511500
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Sun Feb 25 05:06:21 2007
@@ -48,7 +48,7 @@
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.model.ServiceContract;
 import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.spi.model.physical.WireDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
 import org.apache.tuscany.spi.services.work.WorkScheduler;
 import org.apache.tuscany.spi.util.UriHelper;
 import org.apache.tuscany.spi.wire.InvocationChain;
@@ -97,7 +97,7 @@
      * @param definition the wire definition
      * @throws WiringException
      */
-    public void connect(WireDefinition definition) throws WiringException {
+    public void connect(PhysicalWireDefinition definition) throws WiringException {
         URI sourceUri = definition.getSourceUri();
         assert sourceUri != null;
         URI targetUri = definition.getTargetUri();

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java?view=diff&rev=511500&r1=511499&r2=511500
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java Sun Feb 25 05:06:21 2007
@@ -20,7 +20,7 @@
 
 import org.apache.tuscany.spi.model.ComponentDefinition;
 import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.model.physical.WireDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
 
 /**
  * Implementations are responsible for creating a wires between source and target artifacts
@@ -45,6 +45,6 @@
      * @param definition metadata describing the wire to create
      * @throws WiringException
      */
-    void connect(WireDefinition definition) throws WiringException;
+    void connect(PhysicalWireDefinition definition) throws WiringException;
 
 }

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java?view=diff&rev=511500&r1=511499&r2=511500
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java Sun Feb 25 05:06:21 2007
@@ -33,7 +33,7 @@
     private Set<PhysicalComponentDefinition> physicalComponentDefinitions = new HashSet<PhysicalComponentDefinition>();
     
     // Set of wire definitions
-    private Set<WireDefinition> wireDefinitions = new HashSet<WireDefinition>();
+    private Set<PhysicalWireDefinition> wireDefinitions = new HashSet<PhysicalWireDefinition>();
 
     /**
      * Get all the physical component definitions.
@@ -55,7 +55,7 @@
      * Get all the wire definitions.
      * @return Wire definitions in the changeset.
      */
-    public Set<? extends WireDefinition> getWireDefinitions() {
+    public Set<? extends PhysicalWireDefinition> getWireDefinitions() {
         return wireDefinitions;
     }
 
@@ -63,7 +63,7 @@
      * Adds a wire definition to the physical change set.
      * @param wireDefinition Wire definition.
      */
-    public void addWireDefinition(WireDefinition wireDefinition) {
+    public void addWireDefinition(PhysicalWireDefinition wireDefinition) {
         wireDefinitions.add(wireDefinition);
     }
 

Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalInterceptorDefinition.java (from r511488, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalInterceptorDefinition.java?view=diff&rev=511500&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java&r1=511488&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalInterceptorDefinition.java&r2=511500
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/InterceptorDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalInterceptorDefinition.java Sun Feb 25 05:06:21 2007
@@ -30,7 +30,7 @@
  * @version $Rev$ $Date$
  *
  */
-public class InterceptorDefinition extends ModelObject {
+public class PhysicalInterceptorDefinition extends ModelObject {
     
     // The qualified name of the interceptor builder
     private QName builder;

Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java (from r511488, incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java?view=diff&rev=511500&p1=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java&r1=511488&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java&r2=511500
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java Sun Feb 25 05:06:21 2007
@@ -32,14 +32,14 @@
  *
  * @version $Rev$ $Date$
  */
-public class WireDefinition extends ModelObject {
+public class PhysicalWireDefinition extends ModelObject {
     private QName bindingType;
     // The resolved source URI of the wire
     private URI sourceUri;
     // The resolved source URI of the wire
     private URI targetUri;
     // Interceptors defined against the wire
-    private final Set<InterceptorDefinition> interceptors = new HashSet<InterceptorDefinition>();
+    private final Set<PhysicalInterceptorDefinition> interceptors = new HashSet<PhysicalInterceptorDefinition>();
 
     /**
      * Returns the wire binding type.
@@ -64,7 +64,7 @@
      *
      * @return List of interceptors available on the wire.
      */
-    public Set<InterceptorDefinition> getInterceptors() {
+    public Set<PhysicalInterceptorDefinition> getInterceptors() {
         return Collections.unmodifiableSet(interceptors);
     }
 
@@ -73,7 +73,7 @@
      *
      * @param interceptorDefinition Interceptor definition to add to the wire.
      */
-    public void addInterceptor(InterceptorDefinition interceptorDefinition) {
+    public void addInterceptor(PhysicalInterceptorDefinition interceptorDefinition) {
 
         if (interceptorDefinition == null) {
             throw new IllegalArgumentException("Interceptor definition is null");



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org