tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r524718 [1/2] - in /incubator/tuscany/java/sca/scdl4j/assembly/src: main/java/org/apache/tuscany/assembly/model/ main/java/org/apache/tuscany/assembly/model/impl/ main/java/org/apache/tuscany/assembly/util/ test/java/org/apache/tuscany/asse...
Date Mon, 02 Apr 2007 03:53:59 GMT
Author: jsdelfino
Date: Sun Apr  1 20:53:56 2007
New Revision: 524718

URL: http://svn.apache.org/viewvc?view=rev&rev=524718
Log:
Formatted code according to Tuscany formatting rules. Added Visitor and Visitable interfaces to the model.

Added:
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/util/Visitable.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/util/Visitor.java   (with props)
Modified:
    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/AbstractProperty.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/SCABinding.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractPropertyImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractReferenceImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractServiceImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BindingImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentPropertyImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentReferenceImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentServiceImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeReferenceImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeServiceImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ConstrainingTypeImpl.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/main/java/org/apache/tuscany/assembly/model/impl/DefaultAssemblyFactory.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/PropertyImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ReferenceImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/SCABindingImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ServiceImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/WireImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/util/PrintUtil.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/AssemblyFactoryTestCase.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestBinding.java
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/TestImplementation.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

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=524718&r1=524717&r2=524718
==============================================================================
--- 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 Sun Apr  1 20:53:56 2007
@@ -21,46 +21,59 @@
 import org.apache.tuscany.policy.model.IntentAttachPoint;
 import org.apache.tuscany.sca.idl.Interface;
 
-
 /**
- * Interface contracts define one or more business functions.  These business functions are
- * provided by services and are used by references.
+ * Interface contracts define one or more business functions. These business
+ * functions are provided by services and are used by references.
  */
 public interface AbstractContract extends Base, IntentAttachPoint {
 
     /**
      * Returns the name of the contract.
+     * 
      * @return the name of the contract
      */
     String getName();
 
     /**
      * Sets the name of the contract.
+     * 
      * @param name the name of the contract
      */
     void setName(String name);
 
     /**
-     * Returns the interface definition representing the interface for invocations from the requestor to the provider.
-     * @return the interface definition representing the interface for invocations from the requestor to the provider
+     * Returns the interface definition representing the interface for
+     * invocations from the requestor to the provider.
+     * 
+     * @return the interface definition representing the interface for
+     *         invocations from the requestor to the provider
      */
     Interface getInterface();
 
     /**
-     * Sets the interface definition representing the interface for invocations from the requestor to the provider.
-     * @param callInterface the interface definition representing the interface for invocations from the requestor to the provider
+     * Sets the interface definition representing the interface for invocations
+     * from the requestor to the provider.
+     * 
+     * @param callInterface the interface definition representing the interface
+     *            for invocations from the requestor to the provider
      */
     void setInterface(Interface callInterface);
-    
+
     /**
-     * Returns the interface definition representing the interface for invocations from the provider to the requestor.
-     * @return the interface definition representing the interface for invocations from the provider to the requestor.
+     * Returns the interface definition representing the interface for
+     * invocations from the provider to the requestor.
+     * 
+     * @return the interface definition representing the interface for
+     *         invocations from the provider to the requestor.
      */
     Interface getCallbackInterface();
 
     /**
-     * Sets the interface definition representing the interface for invocations from the provider to the requestor.
-     * @param callbackInterface the interface definition representing the interface for invocations from the provider to the requestor.
+     * Sets the interface definition representing the interface for invocations
+     * from the provider to the requestor.
+     * 
+     * @param callbackInterface the interface definition representing the
+     *            interface for invocations from the provider to the requestor.
      */
     void setCallbackInterface(Interface callbackInterface);
 

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractProperty.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractProperty.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractProperty.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractProperty.java Sun Apr  1 20:53:56 2007
@@ -22,82 +22,99 @@
 
 import org.apache.tuscany.policy.model.IntentAttachPoint;
 
-
 /**
- * A property allows for the configuration of an implementation with externally set data values.
- * An implementation can have zero or more properties.  Each property has a data type, which may be
-  * either simple or complex.  An implementation may also define a default value for a property.
+ * A property allows for the configuration of an implementation with externally
+ * set data values. An implementation can have zero or more properties. Each
+ * property has a data type, which may be either simple or complex. An
+ * implementation may also define a default value for a property.
  */
 public interface AbstractProperty extends Base, IntentAttachPoint {
 
     /**
      * Returns the property name.
+     * 
      * @return the property name
      */
     String getName();
 
     /**
      * Sets the property name.
+     * 
      * @param name the property name
      */
     void setName(String name);
 
     /**
      * Returns the default value of the property.
+     * 
      * @return the default value of ths property
      */
     Object getDefaultValue();
 
     /**
      * Sets the default value of the property.
+     * 
      * @param defaultValue the default value of ths property
      */
     void setDefaultValue(Object defaultValue);
 
     /**
      * Returns true if the property allows multiple values.
+     * 
      * @return true if the property allows multiple values
      */
     boolean isMany();
 
     /**
      * Sets whether or not the property allows multiple values.
+     * 
      * @param many true if the property should allow multiple values
      */
     void setMany(boolean many);
 
     /**
      * Returns true if a value must be supplied for the property.
+     * 
      * @return true is a value must be supplied for the property
      */
     boolean isMustSupply();
 
     /**
      * Sets whether a value must be supplied for the property.
-     * @param mustSupply set to true to require that a value be supplied for uses of this property
+     * 
+     * @param mustSupply set to true to require that a value be supplied for
+     *            uses of this property
      */
     void setMustSupply(boolean mustSupply);
 
     /**
-     * Returns the data type of this property. This is the qualified name of an XML schema type.
+     * Returns the data type of this property. This is the qualified name of an
+     * XML schema type.
+     * 
      * @return the type of this property
      */
     QName getXSDType();
 
     /**
-     * Sets the data type of this property. This is the qualified name of an XML schema type.
+     * Sets the data type of this property. This is the qualified name of an XML
+     * schema type.
+     * 
      * @param type the type of this property
      */
     void setXSDType(QName type);
 
     /**
-     * Returns the element defining the data type of this property. This is the qualified name of an XML schema element.
+     * Returns the element defining the data type of this property. This is the
+     * qualified name of an XML schema element.
+     * 
      * @return the element defining the type of this property
      */
     QName getXSDElement();
 
     /**
-     * Sets the element defining the data type of this property. This is the qualified name of an XML schema element.
+     * Sets the element defining the data type of this property. This is the
+     * qualified name of an XML schema element.
+     * 
      * @param type the element defining the type of this property
      */
     void setXSDElement(QName element);

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractReference.java Sun Apr  1 20:53:56 2007
@@ -18,9 +18,6 @@
  */
 package org.apache.tuscany.assembly.model;
 
-
-
-
 /**
  * Represents a reference contract.
  */
@@ -28,13 +25,16 @@
 
     /**
      * Returns the multiplicity allowed for wires connected to this reference.
+     * 
      * @return the multiplicity allowed for wires connected to this reference
      */
     Multiplicity getMultiplicity();
 
     /**
      * Sets the multiplicity allowed for wires connected to this reference.
-     * @param multiplicity the multiplicity allowed for wires connected to this reference
+     * 
+     * @param multiplicity the multiplicity allowed for wires connected to this
+     *            reference
      */
     void setMultiplicity(Multiplicity multiplicity);
 

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AbstractService.java Sun Apr  1 20:53:56 2007
@@ -18,9 +18,6 @@
  */
 package org.apache.tuscany.assembly.model;
 
-
-
-
 /**
  * Represents a service contract.
  */

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/AssemblyFactory.java Sun Apr  1 20:53:56 2007
@@ -25,118 +25,137 @@
  */
 public interface AssemblyFactory {
 
-	/**
-	 * Create a new abstract property.
-	 * @return a new abstract property
-	 */
-	AbstractProperty createAbstractProperty();
-	
-	/**
-	 * Create a new abstract reference.
-	 * @return a new abstract reference
-	 */
-	AbstractReference createAbstractReference();
-	
-	/**
-	 * Create a new abstract service.
-	 * @return a new abstract service
-	 */
-	AbstractService createAbstractService();
-
-	/**
-	 * Create a new callback.
-	 * @return
-	 */
-	Callback createCallback();
-	
-	/**
-	 * Create a new component.
-	 * @return a new component
-	 */
-	Component createComponent();
-	
-	/**
-	 * Create a new component property.
-	 * @return a new component property
-	 */
-	ComponentProperty createComponentProperty();
-	
-	/**
-	 * Create a new component reference.
-	 * @return a new component reference
-	 */
-	ComponentReference createComponentReference();
-	
-	/**
-	 * Create a new component service.
-	 * @return a new component service
-	 */
-	ComponentService createComponentService();
-	
-	/**
-	 * Create a new component type
-	 * @return a new component type
-	 */
-	ComponentType createComponentType();
-	
-	/**
-	 * Create a new composite.
-	 * @return a new composite
-	 */
-	Composite createComposite();
-	
-	/**
-	 * Create a new composite reference.
-	 * @return a new composite reference
-	 */
-	CompositeReference createCompositeReference();
-	
-	/**
-	 * Create a new composite service.
-	 * @return a new composite service
-	 */
-	CompositeService createCompositeService();
-	
-	/**
-	 * Create a new constraining type.
-	 * @return a new constraining type
-	 */
-	ConstrainingType createConstrainingType();
-	
-	/**
-	 * Create a new property.
-	 * @return a new property
-	 */
-	Property createProperty();
-	
-	/**
-	 * Create a new reference.
-	 * @return a new reference
-	 */
-	Reference createReference();
-	
-	/**
-	 * Create a new service.
-	 * @return a new service
-	 */
-	Service createService();
-	
-	/**
-	 * Create a new wire.
-	 * @return a new wire
-	 */
-	Wire createWire();
-
-	/**
-	 * Create a new SCA binding.
-	 * @return a new SCA binding
-	 */
-	SCABinding createSCABinding();
-
-	/**
-	 * Create a new operation.
-	 * @return a new operation
-	 */
-	Operation createOperation();
-	
+    /**
+     * Create a new abstract property.
+     * 
+     * @return a new abstract property
+     */
+    AbstractProperty createAbstractProperty();
+
+    /**
+     * Create a new abstract reference.
+     * 
+     * @return a new abstract reference
+     */
+    AbstractReference createAbstractReference();
+
+    /**
+     * Create a new abstract service.
+     * 
+     * @return a new abstract service
+     */
+    AbstractService createAbstractService();
+
+    /**
+     * Create a new callback.
+     * 
+     * @return
+     */
+    Callback createCallback();
+
+    /**
+     * Create a new component.
+     * 
+     * @return a new component
+     */
+    Component createComponent();
+
+    /**
+     * Create a new component property.
+     * 
+     * @return a new component property
+     */
+    ComponentProperty createComponentProperty();
+
+    /**
+     * Create a new component reference.
+     * 
+     * @return a new component reference
+     */
+    ComponentReference createComponentReference();
+
+    /**
+     * Create a new component service.
+     * 
+     * @return a new component service
+     */
+    ComponentService createComponentService();
+
+    /**
+     * Create a new component type
+     * 
+     * @return a new component type
+     */
+    ComponentType createComponentType();
+
+    /**
+     * Create a new composite.
+     * 
+     * @return a new composite
+     */
+    Composite createComposite();
+
+    /**
+     * Create a new composite reference.
+     * 
+     * @return a new composite reference
+     */
+    CompositeReference createCompositeReference();
+
+    /**
+     * Create a new composite service.
+     * 
+     * @return a new composite service
+     */
+    CompositeService createCompositeService();
+
+    /**
+     * Create a new constraining type.
+     * 
+     * @return a new constraining type
+     */
+    ConstrainingType createConstrainingType();
+
+    /**
+     * Create a new property.
+     * 
+     * @return a new property
+     */
+    Property createProperty();
+
+    /**
+     * Create a new reference.
+     * 
+     * @return a new reference
+     */
+    Reference createReference();
+
+    /**
+     * Create a new service.
+     * 
+     * @return a new service
+     */
+    Service createService();
+
+    /**
+     * Create a new wire.
+     * 
+     * @return a new wire
+     */
+    Wire createWire();
+
+    /**
+     * Create a new SCA binding.
+     * 
+     * @return a new SCA binding
+     */
+    SCABinding createSCABinding();
+
+    /**
+     * Create a new operation.
+     * 
+     * @return a new operation
+     */
+    Operation createOperation();
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Base.java Sun Apr  1 20:53:56 2007
@@ -27,18 +27,21 @@
 
     /**
      * Returns a list of extension objects contained in this model object.
+     * 
      * @return a list of extension objects container in this model object
      */
     List<Object> getExtensions();
 
     /**
      * Returns true if the model element is unresolved.
+     * 
      * @return true if the model element is unresolved.
      */
     boolean isUnresolved();
-    
+
     /**
      * Sets whether the model element is unresolved.
+     * 
      * @param unresolved whether the model element is unresolved
      */
     void setUnresolved(boolean unresolved);

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Binding.java Sun Apr  1 20:53:56 2007
@@ -21,7 +21,6 @@
 import org.apache.tuscany.policy.model.IntentAttachPoint;
 import org.apache.tuscany.policy.model.PolicySetAttachPoint;
 
-
 /**
  * Represents a binding.
  */
@@ -29,24 +28,28 @@
 
     /**
      * Returns the binding URI.
+     * 
      * @return the binding uri
      */
     String getURI();
 
     /**
      * Sets the binding URI.
+     * 
      * @param uri the binding uri
      */
     void setURI(String uri);
 
     /**
      * Returns the binding name.
+     * 
      * @return the binding name
      */
     String getName();
-    
+
     /**
      * Sets the binding name.
+     * 
      * @param name the binding name
      */
     void setName(String name);

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Callback.java Sun Apr  1 20:53:56 2007
@@ -23,16 +23,16 @@
 import org.apache.tuscany.policy.model.IntentAttachPoint;
 import org.apache.tuscany.policy.model.PolicySetAttachPoint;
 
-
 /**
  * Represents a callback object describing the bindings to use for callbacks.
  */
 public interface Callback extends Base, IntentAttachPoint, PolicySetAttachPoint {
-    
+
     /**
-     * Returns the bindings supported for callbacks. 
+     * Returns the bindings supported for callbacks.
+     * 
      * @return the bindings supported for callbacks
      */
     List<Binding> getBindings();
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Component.java Sun Apr  1 20:53:56 2007
@@ -23,76 +23,86 @@
 import org.apache.tuscany.policy.model.IntentAttachPoint;
 import org.apache.tuscany.policy.model.PolicySetAttachPoint;
 
-
-
 /**
- * Represents a component. A component is a configured instance of an implementation.
+ * Represents a component. A component is a configured instance of an
+ * implementation.
  */
 public interface Component extends Base, IntentAttachPoint, PolicySetAttachPoint {
 
     /**
      * Returns the name of the component.
+     * 
      * @return the name of the component
      */
     String getName();
 
     /**
      * Sets the name of the component.
+     * 
      * @param name the name of the component
      */
     void setName(String name);
 
     /**
      * Returns the component implementation.
+     * 
      * @return the component implementation
      */
     Implementation getImplementation();
 
     /**
      * Sets the component implementation
+     * 
      * @param implementation the component implementation
      */
     void setImplementation(Implementation implementation);
 
     /**
      * Returns a list of references used by the component.
+     * 
      * @return a list of references used by the component
      */
     List<ComponentReference> getReferences();
 
     /**
      * Returns a list of services exposed by the component.
+     * 
      * @return a list of services exposed by the component
      */
     List<ComponentService> getServices();
 
     /**
      * Returns a list of properties for the component.
+     * 
      * @return a list of properties
      */
     List<ComponentProperty> getProperties();
 
-	/**
-	 * Returns a constraining type defining the shape of the component.
-	 * @return a constraining type
-	 */
-	ConstrainingType getConstrainingType();
-
-	/**
-	 * Sets a constraining type defining the shape of the component.
-	 * @param constrainingType the constraining type
-	 */
-	void setConstrainingType(ConstrainingType constrainingType);
-
-	/**
-	 * Returns true if the component references should be autowired.
-	 * @return whether component references should be autowired.
-	 */
-	boolean isAutowire();
-
-	/**
-	 * Sets whether component references should be autowired.
-	 * @param autowire whether component references should be autowired
-	 */
-	void setAutowire(boolean autowire);
+    /**
+     * Returns a constraining type defining the shape of the component.
+     * 
+     * @return a constraining type
+     */
+    ConstrainingType getConstrainingType();
+
+    /**
+     * Sets a constraining type defining the shape of the component.
+     * 
+     * @param constrainingType the constraining type
+     */
+    void setConstrainingType(ConstrainingType constrainingType);
+
+    /**
+     * Returns true if the component references should be autowired.
+     * 
+     * @return whether component references should be autowired.
+     */
+    boolean isAutowire();
+
+    /**
+     * Sets whether component references should be autowired.
+     * 
+     * @param autowire whether component references should be autowired
+     */
+    void setAutowire(boolean autowire);
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentProperty.java Sun Apr  1 20:53:56 2007
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.assembly.model;
 
-
 /**
  * Represents a configured property of a component.
  */
@@ -26,38 +25,48 @@
 
     /**
      * Returns the property defined by the component implementation.
+     * 
      * @return the property defined by the component implementation
      */
     Property getProperty();
 
     /**
      * Sets the property type that defines this property.
+     * 
      * @param type the property that defines this property
      */
     void setProperty(Property property);
 
     /**
-     * Returns an xpath expression referencing a property of the enclosing composite.
-     * @return an xpath expression referencing a property of the enclosing composite
+     * Returns an xpath expression referencing a property of the enclosing
+     * composite.
+     * 
+     * @return an xpath expression referencing a property of the enclosing
+     *         composite
      */
     String getSource();
-    
+
     /**
-     * Sets an xpath expression referencing a property of the enclosing composite.
-     * @param source an xpath expression referencing a property of the enclosing composite
+     * Sets an xpath expression referencing a property of the enclosing
+     * composite.
+     * 
+     * @param source an xpath expression referencing a property of the enclosing
+     *            composite
      */
     void setSource(String source);
-    
+
     /**
      * Returns a URI to a file containing the property value.
+     * 
      * @return a URI to a file containing the property value
      */
     String getFile();
-    
+
     /**
      * Sets a URI to a file containing the property value.
+     * 
      * @param file a URI to a file containing the property value
      */
     void setFile(String file);
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentReference.java Sun Apr  1 20:53:56 2007
@@ -18,24 +18,23 @@
  */
 package org.apache.tuscany.assembly.model;
 
-
-
-
 /**
  * An instance of a reference associated with a particular component.
  */
 public interface ComponentReference extends Reference {
-	
-	/**
-	 * Returns the reference defined by the implementation for this reference.
-	 * @return
-	 */
-	Reference getReference();
 
-	/**
-	 * Sets the reference defined by the implementation for this reference.
-	 * @param reference
-	 */
-	void setReference(Reference reference);
+    /**
+     * Returns the reference defined by the implementation for this reference.
+     * 
+     * @return
+     */
+    Reference getReference();
+
+    /**
+     * Sets the reference defined by the implementation for this reference.
+     * 
+     * @param reference
+     */
+    void setReference(Reference reference);
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentService.java Sun Apr  1 20:53:56 2007
@@ -18,24 +18,23 @@
  */
 package org.apache.tuscany.assembly.model;
 
-
-
-
 /**
  * An addressable instance of a service associated with a particular component.
  */
 public interface ComponentService extends Service {
-    
-	/**
-	 * Returns the service defined by the implementation for this service.
-	 * @return
-	 */
-	Service getService();
 
-	/**
-	 * Sets the service defined by the implementation for this service.
-	 * @param service
-	 */
-	void setService(Service service);
+    /**
+     * Returns the service defined by the implementation for this service.
+     * 
+     * @return
+     */
+    Service getService();
+
+    /**
+     * Sets the service defined by the implementation for this service.
+     * 
+     * @param service
+     */
+    void setService(Service service);
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ComponentType.java Sun Apr  1 20:53:56 2007
@@ -23,7 +23,6 @@
 import org.apache.tuscany.policy.model.IntentAttachPoint;
 import org.apache.tuscany.policy.model.PolicySetAttachPoint;
 
-
 /**
  * Describes an implementation and represents its configurable aspects.
  */
@@ -31,30 +30,35 @@
 
     /**
      * Returns a list of services that are offered.
+     * 
      * @return a list of services that are offered
      */
     List<Service> getServices();
 
     /**
      * Returns the list of reference types that are used.
+     * 
      * @return the list of reference types that are used
      */
     List<Reference> getReferences();
 
     /**
      * Returns the list of properties that can be set.
+     * 
      * @return the list of properties that can be set
      */
     List<Property> getProperties();
 
     /**
      * Returns a constraining type defining the shape of the implementation.
+     * 
      * @return a constraining type
      */
     ConstrainingType getConstrainingType();
-    
+
     /**
      * Sets a constraining type defining the shape of the implementation.
+     * 
      * @param constrainingType the constraining type to set
      */
     void setConstrainingType(ConstrainingType constrainingType);

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Composite.java Sun Apr  1 20:53:56 2007
@@ -22,7 +22,6 @@
 
 import javax.xml.namespace.QName;
 
-
 /**
  * Represents a composite.
  */
@@ -30,56 +29,69 @@
 
     /**
      * Returns the name of the composite.
+     * 
      * @return the name of the composite
      */
     QName getName();
 
     /**
      * Sets the name of the composite.
+     * 
      * @param name the name of the composite
      */
     void setName(QName name);
 
     /**
      * Returns a list of composites included in this composite.
+     * 
      * @return a list of composites included in this composite.
      */
     List<Composite> getIncludes();
-    
+
     /**
      * Returns a list of components contained in this composite.
+     * 
      * @return a list of components contained in this composite
      */
     List<Component> getComponents();
 
     /**
      * Returns a list of wires contained in this composite.
+     * 
      * @return a list of wires contained in this composite
      */
     List<Wire> getWires();
 
     /**
-     * Returns true if all the components within the composite must run in the same process.
-     * @return true if all the components within the composite must run in the same process
+     * Returns true if all the components within the composite must run in the
+     * same process.
+     * 
+     * @return true if all the components within the composite must run in the
+     *         same process
      */
     boolean isLocal();
 
     /**
-     * Sets whether all the components within the composite must run in the same process.
-     * @param local whether all the components within the composite must run in the same process
+     * Sets whether all the components within the composite must run in the same
+     * process.
+     * 
+     * @param local whether all the components within the composite must run in
+     *            the same process
      */
     void setLocal(boolean local);
-    
+
     /**
      * Returns true if autowiring is enabled in the composite.
+     * 
      * @return true if autowiring is enabled in the composite
      */
     boolean isAutowire();
 
     /**
      * Sets whether autowiring is enabled in the composite.
+     * 
      * @param autowire whether autowiring is enabled in the composite
      */
     void setAutowire(boolean autowire);
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeReference.java Sun Apr  1 20:53:56 2007
@@ -20,8 +20,6 @@
 
 import java.util.List;
 
-
-
 /**
  * Represents composite reference.
  */
@@ -29,8 +27,9 @@
 
     /**
      * Returns the promoted composite references.
+     * 
      * @return the promoted composite references
      */
     List<ComponentReference> getPromotedReferences();
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/CompositeService.java Sun Apr  1 20:53:56 2007
@@ -18,23 +18,23 @@
  */
 package org.apache.tuscany.assembly.model;
 
-
-
 /**
  * Represents a composite service.
  */
 public interface CompositeService extends Service {
-    
+
     /**
      * Returns the promoted component service .
+     * 
      * @return the promoted component service.
      */
     ComponentService getPromotedService();
-    
+
     /**
      * Sets the promoted component service
+     * 
      * @param promotedService the promoted component service.
      */
     void setPromotedService(ComponentService promotedService);
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/ConstrainingType.java Sun Apr  1 20:53:56 2007
@@ -24,41 +24,45 @@
 
 import org.apache.tuscany.policy.model.IntentAttachPoint;
 
-
-
 /**
- * A constrainingType provides the "shape" for a component and its implementation.
- * Any component configuration that points to a constrainingType is constrained by this shape.
- * The constrainingType specifies the services, references and properties that must be implemented.
+ * A constrainingType provides the "shape" for a component and its
+ * implementation. Any component configuration that points to a constrainingType
+ * is constrained by this shape. The constrainingType specifies the services,
+ * references and properties that must be implemented.
  */
 public interface ConstrainingType extends Base, IntentAttachPoint {
-	
+
     /**
      * Returns the name of the constrainingType.
+     * 
      * @return the name of the constrainingType
      */
     QName getName();
 
     /**
      * Sets the name of the constrainingType.
+     * 
      * @param name the name of the constrainingType
      */
     void setName(QName name);
 
     /**
      * Returns a list of services that are offered.
+     * 
      * @return a list of services that are offered
      */
     List<AbstractService> getServices();
 
     /**
      * Returns the list of references that are used.
+     * 
      * @return the list of references that are used
      */
     List<AbstractReference> getReferences();
 
     /**
      * Returns the list of properties that can be set.
+     * 
      * @return the list of properties that can be set
      */
     List<AbstractProperty> getProperties();

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Contract.java Sun Apr  1 20:53:56 2007
@@ -22,37 +22,40 @@
 
 import org.apache.tuscany.policy.model.PolicySetAttachPoint;
 
-
 /**
  * Represents a contract. A contract can be either a service or a reference.
  */
 public interface Contract extends AbstractContract, PolicySetAttachPoint {
-    
+
     /**
      * Returns the bindings supported by this contract.
+     * 
      * @return the bindings supported by this contract
      */
     List<Binding> getBindings();
-    
+
     /**
-     * Returns a binding of the specified type or null if there is no such binding
-     * configured on this contract.
+     * Returns a binding of the specified type or null if there is no such
+     * binding configured on this contract.
+     * 
      * @param <B> the binding type
      * @param bindingClass the binding type class
      * @return the binding or null if there is no binding of the specified type
      */
     <B> B getBinding(Class<B> bindingClass);
-    
+
     /**
-     * Returns a callback definition of the bindings to use for callbacks. 
+     * Returns a callback definition of the bindings to use for callbacks.
+     * 
      * @return a definition of the bindings to use for callbacks
      */
     Callback getCallback();
 
     /**
      * Sets a callback definition of the bindings to use for callbacks
+     * 
      * @param callback a definition of the bindings to use for callbacks
      */
     void setCallback(Callback callback);
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Implementation.java Sun Apr  1 20:53:56 2007
@@ -18,9 +18,6 @@
  */
 package org.apache.tuscany.assembly.model;
 
-
-
-
 /**
  * Represents a component implementation.
  */

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Multiplicity.java Sun Apr  1 20:53:56 2007
@@ -19,10 +19,11 @@
 package org.apache.tuscany.assembly.model;
 
 /**
- * Enumeration for multiplicity. Defines the number of wires that can connect a reference to target services.
+ * Enumeration for multiplicity. Defines the number of wires that can connect a
+ * reference to target services.
  */
 public enum Multiplicity {
-    
+
     /**
      * Zero or one wire can have the reference as a source.
      */

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Property.java Sun Apr  1 20:53:56 2007
@@ -20,12 +20,12 @@
 
 import org.apache.tuscany.policy.model.PolicySetAttachPoint;
 
-
 /**
- * A property allows for the configuration of an implementation with externally set data values.
- * An implementation can have zero or more properties.  Each property has a data type, which may be
-  * either simple or complex.  An implementation may also define a default value for a property.
+ * A property allows for the configuration of an implementation with externally
+ * set data values. An implementation can have zero or more properties. Each
+ * property has a data type, which may be either simple or complex. An
+ * implementation may also define a default value for a property.
  */
 public interface Property extends AbstractProperty, PolicySetAttachPoint {
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Reference.java Sun Apr  1 20:53:56 2007
@@ -20,42 +20,48 @@
 
 import java.util.List;
 
-
 /**
- * Represents a reference. References within an implementation represent
- * links to services that the implementation uses that must be provided by other components.
+ * Represents a reference. References within an implementation represent links
+ * to services that the implementation uses that must be provided by other
+ * components.
  */
 public interface Reference extends AbstractReference, Contract {
-	
-	/**
-	 * Returns a boolean value, "false" by default, which indicates that the implementation wires this
-     * reference dynamically.
-	 * @return true if the implementation wires this reference dynamically
-	 */
-	boolean isWiredByImpl();
 
-	/**
-	 * Sets a boolean value, "false" by default, which indicates that the implementation wires this
-     * reference dynamically.
-	 * @param wiredByImpl whether the implementation wires this reference dynamically
-	 */
-	void setWiredByImpl(boolean wiredByImpl);
-    
+    /**
+     * Returns a boolean value, "false" by default, which indicates that the
+     * implementation wires this reference dynamically.
+     * 
+     * @return true if the implementation wires this reference dynamically
+     */
+    boolean isWiredByImpl();
+
+    /**
+     * Sets a boolean value, "false" by default, which indicates that the
+     * implementation wires this reference dynamically.
+     * 
+     * @param wiredByImpl whether the implementation wires this reference
+     *            dynamically
+     */
+    void setWiredByImpl(boolean wiredByImpl);
+
     /**
      * Returns the targets of this reference.
+     * 
      * @return the targets of this reference.
      */
     List<ComponentService> getTargets();
-    
-	/**
-	 * Returns true if the reference should be autowired.
-	 * @return whether the reference should be autowired.
-	 */
-	boolean isAutowire();
 
-	/**
-	 * Sets whether the reference should be autowired.
-	 * @param autowire whether the reference should be autowired
-	 */
-	void setAutowire(boolean autowire);
+    /**
+     * Returns true if the reference should be autowired.
+     * 
+     * @return whether the reference should be autowired.
+     */
+    boolean isAutowire();
+
+    /**
+     * Sets whether the reference should be autowired.
+     * 
+     * @param autowire whether the reference should be autowired
+     */
+    void setAutowire(boolean autowire);
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/SCABinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/SCABinding.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/SCABinding.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/SCABinding.java Sun Apr  1 20:53:56 2007
@@ -20,8 +20,8 @@
 
 /**
  * Represents an SCA binding.
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public interface SCABinding extends Binding {
 

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Service.java Sun Apr  1 20:53:56 2007
@@ -18,11 +18,10 @@
  */
 package org.apache.tuscany.assembly.model;
 
-
 /**
  * Represents a service. Services are used to publish services provided by
  * implementations, so that they are addressable by other components.
  */
 public interface Service extends AbstractService, Contract {
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/Wire.java Sun Apr  1 20:53:56 2007
@@ -21,36 +21,37 @@
 import org.apache.tuscany.policy.model.IntentAttachPoint;
 import org.apache.tuscany.policy.model.PolicySetAttachPoint;
 
-
-
-
 /**
  * Represents a wire.
  */
 public interface Wire extends Base, IntentAttachPoint, PolicySetAttachPoint {
-    
+
     /**
      * Returns the source of the wire.
+     * 
      * @return the source of the wire
      */
     ComponentReference getSource();
-    
+
     /**
      * Sets the source of the wire.
+     * 
      * @param source the source of the wire
      */
     void setSource(ComponentReference source);
-    
+
     /**
      * Returns the target of the wire.
+     * 
      * @return the target of the wire
      */
     ComponentService getTarget();
-    
+
     /**
      * Sets the target of the wire.
+     * 
      * @param target the target of the wire
      */
     void setTarget(ComponentService target);
-    
+
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractPropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractPropertyImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractPropertyImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractPropertyImpl.java Sun Apr  1 20:53:56 2007
@@ -28,69 +28,69 @@
 import org.apache.tuscany.policy.model.Intent;
 
 /**
- * Represents an abstract  property.
- *
- *  @version $Rev$ $Date$
+ * Represents an abstract property.
+ * 
+ * @version $Rev$ $Date$
  */
 public class AbstractPropertyImpl extends BaseImpl implements AbstractProperty {
-	private Object defaultValue;
-	private String name;
-	private QName xsdType;
-	private QName xsdElement;
-	private boolean many;
-	private boolean mustSupply;
-	private List<Intent> requiredIntents = new ArrayList<Intent>();
-
-	public Object getDefaultValue() {
-		return defaultValue;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public QName getXSDElement() {
-		return xsdElement;
-	}
-
-	public QName getXSDType() {
-		return xsdType;
-	}
-
-	public boolean isMany() {
-		return many;
-	}
-
-	public boolean isMustSupply() {
-		return mustSupply;
-	}
-
-	public void setDefaultValue(Object defaultValue) {
-		this.defaultValue = defaultValue;
-	}
-
-	public void setMany(boolean many) {
-		this.many = many;
-	}
-
-	public void setMustSupply(boolean mustSupply) {
-		this.mustSupply = mustSupply;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setXSDElement(QName element) {
-		this.xsdElement = element;
-	}
-
-	public void setXSDType(QName type) {
-		this.xsdType = type;
-	}
-
-	public List<Intent> getRequiredIntents() {
-		return requiredIntents;
-	}
+    private Object defaultValue;
+    private String name;
+    private QName xsdType;
+    private QName xsdElement;
+    private boolean many;
+    private boolean mustSupply;
+    private List<Intent> requiredIntents = new ArrayList<Intent>();
+
+    public Object getDefaultValue() {
+        return defaultValue;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public QName getXSDElement() {
+        return xsdElement;
+    }
+
+    public QName getXSDType() {
+        return xsdType;
+    }
+
+    public boolean isMany() {
+        return many;
+    }
+
+    public boolean isMustSupply() {
+        return mustSupply;
+    }
+
+    public void setDefaultValue(Object defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public void setMany(boolean many) {
+        this.many = many;
+    }
+
+    public void setMustSupply(boolean mustSupply) {
+        this.mustSupply = mustSupply;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setXSDElement(QName element) {
+        this.xsdElement = element;
+    }
+
+    public void setXSDType(QName type) {
+        this.xsdType = type;
+    }
+
+    public List<Intent> getRequiredIntents() {
+        return requiredIntents;
+    }
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractReferenceImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractReferenceImpl.java Sun Apr  1 20:53:56 2007
@@ -23,18 +23,18 @@
 
 /**
  * Represents an abstract reference
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class AbstractReferenceImpl extends ContractImpl implements AbstractReference {
-	private Multiplicity multiplicity = Multiplicity.ONE_ONE;
+    private Multiplicity multiplicity = Multiplicity.ONE_ONE;
 
-	public Multiplicity getMultiplicity() {
-		return multiplicity;
-	}
+    public Multiplicity getMultiplicity() {
+        return multiplicity;
+    }
 
-	public void setMultiplicity(Multiplicity multiplicity) {
-		this.multiplicity = multiplicity;
-	}
+    public void setMultiplicity(Multiplicity multiplicity) {
+        this.multiplicity = multiplicity;
+    }
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractServiceImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractServiceImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/AbstractServiceImpl.java Sun Apr  1 20:53:56 2007
@@ -22,8 +22,8 @@
 
 /**
  * Represents an abstract service
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class AbstractServiceImpl extends ContractImpl implements AbstractService {
 

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BaseImpl.java Sun Apr  1 20:53:56 2007
@@ -22,26 +22,31 @@
 import java.util.List;
 
 import org.apache.tuscany.assembly.model.Base;
+import org.apache.tuscany.assembly.util.Visitable;
+import org.apache.tuscany.assembly.util.Visitor;
 
 /**
  * Convenience base class for assembly model objects.
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
-public class BaseImpl implements Base {
-	private List<Object> extensions = new ArrayList<Object>();
-	private boolean unresolved = false;
+public abstract class BaseImpl implements Base, Visitable {
+    private List<Object> extensions = new ArrayList<Object>();
+    private boolean unresolved = false;
 
-	public List<Object> getExtensions() {
-		return extensions;
-	}
+    public List<Object> getExtensions() {
+        return extensions;
+    }
 
-	public boolean isUnresolved() {
-		return unresolved;
-	}
+    public boolean isUnresolved() {
+        return unresolved;
+    }
 
-	public void setUnresolved(boolean undefined) {
-		this.unresolved = undefined;
-	}
+    public void setUnresolved(boolean undefined) {
+        this.unresolved = undefined;
+    }
 
+    public boolean accept(Visitor visitor) {
+        return visitor.visit(this);
+    }
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BindingImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BindingImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/BindingImpl.java Sun Apr  1 20:53:56 2007
@@ -27,37 +27,37 @@
 
 /**
  * Represents a binding.
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public abstract class BindingImpl extends BaseImpl implements Binding {
-	private String name;
-	private String uri;
-	private List<PolicySet> policySets = new ArrayList<PolicySet>();
-	private List<Intent> requiredIntents = new ArrayList<Intent>();
-
-	public String getName() {
-		return name;
-	}
-
-	public String getURI() {
-		return uri;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setURI(String uri) {
-		this.uri = uri;
-	}
-
-	public List<Intent> getRequiredIntents() {
-		return requiredIntents;
-	}
-
-	public List<PolicySet> getPolicySets() {
-		return policySets;
-	}
+    private String name;
+    private String uri;
+    private List<PolicySet> policySets = new ArrayList<PolicySet>();
+    private List<Intent> requiredIntents = new ArrayList<Intent>();
+
+    public String getName() {
+        return name;
+    }
+
+    public String getURI() {
+        return uri;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setURI(String uri) {
+        this.uri = uri;
+    }
+
+    public List<Intent> getRequiredIntents() {
+        return requiredIntents;
+    }
+
+    public List<PolicySet> getPolicySets() {
+        return policySets;
+    }
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CallbackImpl.java Sun Apr  1 20:53:56 2007
@@ -24,29 +24,39 @@
 
 import org.apache.tuscany.assembly.model.Binding;
 import org.apache.tuscany.assembly.model.Callback;
+import org.apache.tuscany.assembly.util.Visitor;
 import org.apache.tuscany.policy.model.Intent;
 import org.apache.tuscany.policy.model.PolicySet;
 
 /**
  * Represents a reference.
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class CallbackImpl extends BaseImpl implements Callback {
-	private List<Binding> bindings = new ArrayList<Binding>();
-	private List<PolicySet> policySets = new ArrayList<PolicySet>();
-	private List<Intent> requiredIntents = new ArrayList<Intent>();
+    private List<Binding> bindings = new ArrayList<Binding>();
+    private List<PolicySet> policySets = new ArrayList<PolicySet>();
+    private List<Intent> requiredIntents = new ArrayList<Intent>();
 
-	public List<Binding> getBindings() {
-		return bindings;
-	}
+    public List<Binding> getBindings() {
+        return bindings;
+    }
 
-	public List<PolicySet> getPolicySets() {
-		return policySets;
-	}
-	
-	public List<Intent> getRequiredIntents() {
-		return requiredIntents;
-	}
+    public List<PolicySet> getPolicySets() {
+        return policySets;
+    }
 
+    public List<Intent> getRequiredIntents() {
+        return requiredIntents;
+    }
+
+    public boolean accept(Visitor visitor) {
+        if (!super.accept(visitor))
+            return false;
+        for (Binding binding : bindings) {
+            if (!visitor.visit(binding))
+                return false;
+        }
+        return true;
+    }
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentImpl.java Sun Apr  1 20:53:56 2007
@@ -27,74 +27,93 @@
 import org.apache.tuscany.assembly.model.ComponentService;
 import org.apache.tuscany.assembly.model.ConstrainingType;
 import org.apache.tuscany.assembly.model.Implementation;
+import org.apache.tuscany.assembly.util.Visitor;
 import org.apache.tuscany.policy.model.Intent;
 import org.apache.tuscany.policy.model.PolicySet;
 
 /**
  * Represents a component.
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class ComponentImpl extends BaseImpl implements Component {
-	private ConstrainingType constrainingType;
-	private Implementation implementation;
-	private String name;
-	private List<ComponentProperty> properties = new ArrayList<ComponentProperty>();
-	private List<ComponentReference> references = new ArrayList<ComponentReference>();
-	private List<ComponentService> services = new ArrayList<ComponentService>();
-	private List<Intent> requiredIntents = new ArrayList<Intent>();
-	private List<PolicySet> policySets = new ArrayList<PolicySet>();
-	private boolean autowire;
-
-	public ConstrainingType getConstrainingType() {
-		return constrainingType;
-	}
-
-	public Implementation getImplementation() {
-		return implementation;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public List<ComponentProperty> getProperties() {
-		return properties;
-	}
-
-	public List<ComponentReference> getReferences() {
-		return references;
-	}
-
-	public List<ComponentService> getServices() {
-		return services;
-	}
-
-	public void setConstrainingType(ConstrainingType constrainingType) {
-		this.constrainingType = constrainingType;
-	}
-
-	public void setImplementation(Implementation implementation) {
-		this.implementation = implementation;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public List<Intent> getRequiredIntents() {
-		return requiredIntents;
-	}
-
-	public List<PolicySet> getPolicySets() {
-		return policySets;
-	}
-
-	public boolean isAutowire() {
-		return autowire;
-	}
-	
-	public void setAutowire(boolean autowire) {
-		this.autowire = autowire;
-	}
+    private ConstrainingType constrainingType;
+    private Implementation implementation;
+    private String name;
+    private List<ComponentProperty> properties = new ArrayList<ComponentProperty>();
+    private List<ComponentReference> references = new ArrayList<ComponentReference>();
+    private List<ComponentService> services = new ArrayList<ComponentService>();
+    private List<Intent> requiredIntents = new ArrayList<Intent>();
+    private List<PolicySet> policySets = new ArrayList<PolicySet>();
+    private boolean autowire;
+
+    public ConstrainingType getConstrainingType() {
+        return constrainingType;
+    }
+
+    public Implementation getImplementation() {
+        return implementation;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<ComponentProperty> getProperties() {
+        return properties;
+    }
+
+    public List<ComponentReference> getReferences() {
+        return references;
+    }
+
+    public List<ComponentService> getServices() {
+        return services;
+    }
+
+    public void setConstrainingType(ConstrainingType constrainingType) {
+        this.constrainingType = constrainingType;
+    }
+
+    public void setImplementation(Implementation implementation) {
+        this.implementation = implementation;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<Intent> getRequiredIntents() {
+        return requiredIntents;
+    }
+
+    public List<PolicySet> getPolicySets() {
+        return policySets;
+    }
+
+    public boolean isAutowire() {
+        return autowire;
+    }
+
+    public void setAutowire(boolean autowire) {
+        this.autowire = autowire;
+    }
+
+    public boolean accept(Visitor visitor) {
+        if (!super.accept(visitor))
+            return false;
+        for (ComponentProperty property : properties) {
+            if (!visitor.visit(property))
+                return false;
+        }
+        for (ComponentReference reference : references) {
+            if (!visitor.visit(reference))
+                return false;
+        }
+        for (ComponentService service : services) {
+            if (!visitor.visit(service))
+                return false;
+        }
+        return true;
+    }
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentPropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentPropertyImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentPropertyImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentPropertyImpl.java Sun Apr  1 20:53:56 2007
@@ -24,36 +24,36 @@
 
 /**
  * Represents a component property.
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class ComponentPropertyImpl extends PropertyImpl implements ComponentProperty {
-	private String file;
-	private Property property;
-	private String source;
-
-	public String getFile() {
-		return file;
-	}
-
-	public Property getProperty() {
-		return property;
-	}
-
-	public String getSource() {
-		return source;
-	}
-
-	public void setFile(String file) {
-		this.file = file;
-	}
-
-	public void setProperty(Property property) {
-		this.property = property;
-	}
-
-	public void setSource(String source) {
-		this.source = source;
-	}
+    private String file;
+    private Property property;
+    private String source;
+
+    public String getFile() {
+        return file;
+    }
+
+    public Property getProperty() {
+        return property;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public void setProperty(Property property) {
+        this.property = property;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentReferenceImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentReferenceImpl.java Sun Apr  1 20:53:56 2007
@@ -24,18 +24,18 @@
 
 /**
  * Represents a component reference
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class ComponentReferenceImpl extends ReferenceImpl implements ComponentReference {
-	private Reference reference;
+    private Reference reference;
 
-	public Reference getReference() {
-		return reference;
-	}
+    public Reference getReference() {
+        return reference;
+    }
 
-	public void setReference(Reference reference) {
-		this.reference = reference;
-	}
+    public void setReference(Reference reference) {
+        this.reference = reference;
+    }
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentServiceImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentServiceImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentServiceImpl.java Sun Apr  1 20:53:56 2007
@@ -24,18 +24,18 @@
 
 /**
  * Represents a component service
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class ComponentServiceImpl extends ServiceImpl implements ComponentService {
-	private Service service;
+    private Service service;
 
-	public Service getService() {
-		return service;
-	}
+    public Service getService() {
+        return service;
+    }
 
-	public void setService(Service service) {
-		this.service = service;
-	}
+    public void setService(Service service) {
+        this.service = service;
+    }
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/ComponentTypeImpl.java Sun Apr  1 20:53:56 2007
@@ -26,48 +26,66 @@
 import org.apache.tuscany.assembly.model.Property;
 import org.apache.tuscany.assembly.model.Reference;
 import org.apache.tuscany.assembly.model.Service;
+import org.apache.tuscany.assembly.util.Visitor;
 import org.apache.tuscany.policy.model.Intent;
 import org.apache.tuscany.policy.model.PolicySet;
 
 /**
  * Represents a component type.
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class ComponentTypeImpl extends BaseImpl implements ComponentType {
-	private ConstrainingType constrainingType;
-	private List<Property> properties = new ArrayList<Property>();
-	private List<Reference> references = new ArrayList<Reference>();
-	private List<Service> services = new ArrayList<Service>();
-	private List<Intent> requiredIntents = new ArrayList<Intent>();
-	private List<PolicySet> policySets = new ArrayList<PolicySet>();
-
-	public ConstrainingType getConstrainingType() {
-		return constrainingType;
-	}
-
-	public List<Property> getProperties() {
-		return properties;
-	}
-
-	public List<Reference> getReferences() {
-		return references;
-	}
-
-	public List<Service> getServices() {
-		return services;
-	}
-
-	public void setConstrainingType(ConstrainingType constrainingType) {
-		this.constrainingType = constrainingType;
-	}
-
-	public List<Intent> getRequiredIntents() {
-		return requiredIntents;
-	}
-
-	public List<PolicySet> getPolicySets() {
-		return policySets;
-	}
-
+    private ConstrainingType constrainingType;
+    private List<Property> properties = new ArrayList<Property>();
+    private List<Reference> references = new ArrayList<Reference>();
+    private List<Service> services = new ArrayList<Service>();
+    private List<Intent> requiredIntents = new ArrayList<Intent>();
+    private List<PolicySet> policySets = new ArrayList<PolicySet>();
+
+    public ConstrainingType getConstrainingType() {
+        return constrainingType;
+    }
+
+    public List<Property> getProperties() {
+        return properties;
+    }
+
+    public List<Reference> getReferences() {
+        return references;
+    }
+
+    public List<Service> getServices() {
+        return services;
+    }
+
+    public void setConstrainingType(ConstrainingType constrainingType) {
+        this.constrainingType = constrainingType;
+    }
+
+    public List<Intent> getRequiredIntents() {
+        return requiredIntents;
+    }
+
+    public List<PolicySet> getPolicySets() {
+        return policySets;
+    }
+
+    public boolean accept(Visitor visitor) {
+        if (!super.accept(visitor))
+            return false;
+        for (Property property : properties) {
+            if (!visitor.visit(property))
+                return false;
+        }
+        for (Reference reference : references) {
+            if (!visitor.visit(reference))
+                return false;
+        }
+        for (Service service : services) {
+            if (!visitor.visit(service))
+                return false;
+        }
+        return true;
+    }
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeImpl.java Sun Apr  1 20:53:56 2007
@@ -29,48 +29,47 @@
 import org.apache.tuscany.assembly.model.Wire;
 
 public class CompositeImpl extends ComponentTypeImpl implements Composite {
-	private List<Component> components = new ArrayList<Component>();
-	private List<Composite> includes = new ArrayList<Composite>();
-	private QName name;
-	private List<Wire> wires = new ArrayList<Wire>();
-	private boolean autowire;
-	private boolean local = true;
-	
-
-	public List<Component> getComponents() {
-		return components;
-	}
-
-	public List<Composite> getIncludes() {
-		return includes;
-	}
-
-	public QName getName() {
-		return name;
-	}
-
-	public List<Wire> getWires() {
-		return wires;
-	}
-
-	public boolean isAutowire() {
-		return autowire;
-	}
-
-	public boolean isLocal() {
-		return local;
-	}
-
-	public void setAutowire(boolean autowire) {
-		this.autowire = autowire;
-	}
-
-	public void setLocal(boolean local) {
-		this.local = local;
-	}
-
-	public void setName(QName name) {
-		this.name = name;
-	}
+    private List<Component> components = new ArrayList<Component>();
+    private List<Composite> includes = new ArrayList<Composite>();
+    private QName name;
+    private List<Wire> wires = new ArrayList<Wire>();
+    private boolean autowire;
+    private boolean local = true;
+
+    public List<Component> getComponents() {
+        return components;
+    }
+
+    public List<Composite> getIncludes() {
+        return includes;
+    }
+
+    public QName getName() {
+        return name;
+    }
+
+    public List<Wire> getWires() {
+        return wires;
+    }
+
+    public boolean isAutowire() {
+        return autowire;
+    }
+
+    public boolean isLocal() {
+        return local;
+    }
+
+    public void setAutowire(boolean autowire) {
+        this.autowire = autowire;
+    }
+
+    public void setLocal(boolean local) {
+        this.local = local;
+    }
+
+    public void setName(QName name) {
+        this.name = name;
+    }
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeReferenceImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeReferenceImpl.java Sun Apr  1 20:53:56 2007
@@ -27,14 +27,14 @@
 
 /**
  * Represents a composite reference.
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class CompositeReferenceImpl extends ReferenceImpl implements CompositeReference {
-	private List<ComponentReference> promotedReferences = new ArrayList<ComponentReference>();
+    private List<ComponentReference> promotedReferences = new ArrayList<ComponentReference>();
 
-	public List<ComponentReference> getPromotedReferences() {
-		return promotedReferences;
-	}
+    public List<ComponentReference> getPromotedReferences() {
+        return promotedReferences;
+    }
 
 }

Modified: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeServiceImpl.java?view=diff&rev=524718&r1=524717&r2=524718
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeServiceImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/impl/CompositeServiceImpl.java Sun Apr  1 20:53:56 2007
@@ -28,22 +28,22 @@
 
 /**
  * Represents a composite service
- *
- *  @version $Rev$ $Date$
+ * 
+ * @version $Rev$ $Date$
  */
 public class CompositeServiceImpl extends ServiceImpl implements CompositeService {
-	private List<Binding> callbackBindings = new ArrayList<Binding>();
-	private ComponentService promotedService;
+    private List<Binding> callbackBindings = new ArrayList<Binding>();
+    private ComponentService promotedService;
 
-	public List<Binding> getCallbackBindings() {
-		return callbackBindings;
-	}
+    public List<Binding> getCallbackBindings() {
+        return callbackBindings;
+    }
 
-	public ComponentService getPromotedService() {
-		return promotedService;
-	}
-	 
-	public void setPromotedService(ComponentService promotedService) {
-		this.promotedService = promotedService;
-	}
+    public ComponentService getPromotedService() {
+        return promotedService;
+    }
+
+    public void setPromotedService(ComponentService promotedService) {
+        this.promotedService = promotedService;
+    }
 }



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


Mime
View raw message