svn commit: r525093 [1/4] - in /incubator/tuscany/java/sca/scdl4j: assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ assembly/src/main/java/org/apache/tuscany/assembly/ assembly...

[js...@apache.org]

Author: jsdelfino
Date: Tue Apr  3 01:52:45 2007
New Revision: 525093

URL: http://svn.apache.org/viewvc?view=rev&rev=525093
Log:
Refactored model packages using a consistent naming convention across modules. Removed .model from the package names.

Added:
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractProperty.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractReference.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractService.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Base.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Binding.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Callback.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Component.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentProperty.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Property.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Reference.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Service.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractPropertyImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractReferenceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractServiceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/BaseImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/BindingImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/CallbackImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentPropertyImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentReferenceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentServiceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeReferenceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeServiceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ConstrainingTypeImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/DefaultAssemblyFactory.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/PropertyImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ReferenceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/SCABindingImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/ServiceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/impl/WireImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/TestBinding.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java   (with props)
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/DataType.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/Interface.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/Operation.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/impl/
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/impl/DataTypeImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/impl/InterfaceImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/impl/OperationImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/util/
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/util/ElementInfo.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/util/TypeInfo.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/util/WrapperInfo.java   (with props)
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/idl/util/XMLType.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/Intent.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/IntentAttachPoint.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/IntentMap.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/PolicyFactory.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/PolicySet.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/PolicySetAttachPoint.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/impl/
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/impl/DefaultPolicyFactory.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/impl/IntentImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/impl/IntentMapImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/impl/PolicySetImpl.java   (with props)
    incubator/tuscany/java/sca/scdl4j/policy/src/test/java/org/apache/tuscany/policy/PolicyFactoryTestCase.java   (with props)
Removed:
    incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/model/
    incubator/tuscany/java/sca/scdl4j/assembly/src/test/java/org/apache/tuscany/assembly/model/
    incubator/tuscany/java/sca/scdl4j/idl/src/main/java/org/apache/tuscany/sca/
    incubator/tuscany/java/sca/scdl4j/policy/src/main/java/org/apache/tuscany/policy/model/
    incubator/tuscany/java/sca/scdl4j/policy/src/test/java/org/apache/tuscany/policy/model/
Modified:
    incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java
    incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java
    incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java
    incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java
    incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/LoaderRegistryImpl.java
    incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
    incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
    incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.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/Visitor.java
    incubator/tuscany/java/sca/scdl4j/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java
    incubator/tuscany/java/sca/scdl4j/idl-java/src/main/java/org/apache/tuscany/idl/java/JavaInterface.java
    incubator/tuscany/java/sca/scdl4j/idl-java/src/main/java/org/apache/tuscany/idl/java/impl/JavaInterfaceImpl.java
    incubator/tuscany/java/sca/scdl4j/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java
    incubator/tuscany/java/sca/scdl4j/idl-wsdl/src/main/java/org/apache/tuscany/idl/WSDLInterface.java
    incubator/tuscany/java/sca/scdl4j/idl-wsdl/src/main/java/org/apache/tuscany/idl/wsdl/impl/WSDLInterfaceImpl.java
    incubator/tuscany/java/sca/scdl4j/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
    incubator/tuscany/java/sca/scdl4j/impl-java/src/main/java/org/apache/tuscany/implementation/java/JavaImplementation.java
    incubator/tuscany/java/sca/scdl4j/impl-java/src/main/java/org/apache/tuscany/implementation/java/impl/DefaultJavaImplementationFactory.java
    incubator/tuscany/java/sca/scdl4j/impl-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaImplementationImpl.java

Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java?view=diff&rev=525093&r1=525092&r2=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/BaseLoader.java Tue Apr  3 01:52:45 2007
@@ -35,18 +35,18 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.assembly.model.AbstractProperty;
-import org.apache.tuscany.assembly.model.AbstractReference;
-import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.ConstrainingType;
-import org.apache.tuscany.assembly.model.Multiplicity;
-import org.apache.tuscany.assembly.model.Property;
+import org.apache.tuscany.assembly.AbstractProperty;
+import org.apache.tuscany.assembly.AbstractReference;
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.ConstrainingType;
+import org.apache.tuscany.assembly.Multiplicity;
+import org.apache.tuscany.assembly.Property;
 import org.apache.tuscany.assembly.xml.Constants;
-import org.apache.tuscany.policy.model.Intent;
-import org.apache.tuscany.policy.model.IntentAttachPoint;
-import org.apache.tuscany.policy.model.PolicyFactory;
-import org.apache.tuscany.policy.model.PolicySet;
-import org.apache.tuscany.policy.model.PolicySetAttachPoint;
+import org.apache.tuscany.policy.Intent;
+import org.apache.tuscany.policy.IntentAttachPoint;
+import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.policy.PolicySetAttachPoint;
 import org.apache.tuscany.sca.idl.Operation;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;

Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java?view=diff&rev=525093&r1=525092&r2=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeLoader.java Tue Apr  3 01:52:45 2007
@@ -26,19 +26,19 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.Binding;
-import org.apache.tuscany.assembly.model.Callback;
-import org.apache.tuscany.assembly.model.ComponentService;
-import org.apache.tuscany.assembly.model.ComponentType;
-import org.apache.tuscany.assembly.model.Contract;
-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.AssemblyFactory;
+import org.apache.tuscany.assembly.Binding;
+import org.apache.tuscany.assembly.Callback;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.ComponentType;
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.assembly.Reference;
+import org.apache.tuscany.assembly.Service;
 import org.apache.tuscany.assembly.xml.Constants;
 import org.apache.tuscany.assembly.xml.Loader;
 import org.apache.tuscany.assembly.xml.LoaderRegistry;
-import org.apache.tuscany.policy.model.PolicyFactory;
+import org.apache.tuscany.policy.PolicyFactory;
 import org.apache.tuscany.sca.idl.Interface;
 import org.apache.tuscany.sca.idl.Operation;
 

Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java?view=diff&rev=525093&r1=525092&r2=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeLoader.java Tue Apr  3 01:52:45 2007
@@ -27,23 +27,23 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.Binding;
-import org.apache.tuscany.assembly.model.Callback;
-import org.apache.tuscany.assembly.model.Component;
-import org.apache.tuscany.assembly.model.ComponentProperty;
-import org.apache.tuscany.assembly.model.ComponentReference;
-import org.apache.tuscany.assembly.model.ComponentService;
-import org.apache.tuscany.assembly.model.Composite;
-import org.apache.tuscany.assembly.model.CompositeReference;
-import org.apache.tuscany.assembly.model.CompositeService;
-import org.apache.tuscany.assembly.model.Contract;
-import org.apache.tuscany.assembly.model.Implementation;
-import org.apache.tuscany.assembly.model.Property;
-import org.apache.tuscany.assembly.model.Wire;
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.Binding;
+import org.apache.tuscany.assembly.Callback;
+import org.apache.tuscany.assembly.Component;
+import org.apache.tuscany.assembly.ComponentProperty;
+import org.apache.tuscany.assembly.ComponentReference;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.Composite;
+import org.apache.tuscany.assembly.CompositeReference;
+import org.apache.tuscany.assembly.CompositeService;
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.assembly.Implementation;
+import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.assembly.Wire;
 import org.apache.tuscany.assembly.xml.Loader;
 import org.apache.tuscany.assembly.xml.LoaderRegistry;
-import org.apache.tuscany.policy.model.PolicyFactory;
+import org.apache.tuscany.policy.PolicyFactory;
 import org.apache.tuscany.sca.idl.Interface;
 import org.apache.tuscany.sca.idl.Operation;
 

Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java?view=diff&rev=525093&r1=525092&r2=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeLoader.java Tue Apr  3 01:52:45 2007
@@ -26,16 +26,16 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.assembly.model.AbstractContract;
-import org.apache.tuscany.assembly.model.AbstractProperty;
-import org.apache.tuscany.assembly.model.AbstractReference;
-import org.apache.tuscany.assembly.model.AbstractService;
-import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.ConstrainingType;
+import org.apache.tuscany.assembly.AbstractContract;
+import org.apache.tuscany.assembly.AbstractProperty;
+import org.apache.tuscany.assembly.AbstractReference;
+import org.apache.tuscany.assembly.AbstractService;
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.ConstrainingType;
 import org.apache.tuscany.assembly.xml.Constants;
 import org.apache.tuscany.assembly.xml.Loader;
 import org.apache.tuscany.assembly.xml.LoaderRegistry;
-import org.apache.tuscany.policy.model.PolicyFactory;
+import org.apache.tuscany.policy.PolicyFactory;
 import org.apache.tuscany.sca.idl.Interface;
 import org.apache.tuscany.sca.idl.Operation;
 

Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/LoaderRegistryImpl.java?view=diff&rev=525093&r1=525092&r2=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/LoaderRegistryImpl.java Tue Apr  3 01:52:45 2007
@@ -30,16 +30,16 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
 import org.apache.tuscany.assembly.xml.Constants;
 import org.apache.tuscany.assembly.xml.InvalidConfigurationException;
 import org.apache.tuscany.assembly.xml.Loader;
 import org.apache.tuscany.assembly.xml.LoaderException;
 import org.apache.tuscany.assembly.xml.LoaderRegistry;
 import org.apache.tuscany.assembly.xml.UnrecognizedElementException;
-import org.apache.tuscany.policy.model.PolicyFactory;
-import org.apache.tuscany.policy.model.impl.DefaultPolicyFactory;
+import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
 
 /**
  * The default implementation of a loader registry

Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java?view=diff&rev=525093&r1=525092&r2=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java Tue Apr  3 01:52:45 2007
@@ -25,15 +25,15 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.assembly.model.Callback;
-import org.apache.tuscany.assembly.model.Component;
-import org.apache.tuscany.assembly.model.ComponentReference;
-import org.apache.tuscany.assembly.model.ComponentService;
-import org.apache.tuscany.assembly.model.Composite;
-import org.apache.tuscany.assembly.model.CompositeReference;
-import org.apache.tuscany.assembly.model.CompositeService;
-import org.apache.tuscany.assembly.model.Multiplicity;
-import org.apache.tuscany.assembly.model.Property;
+import org.apache.tuscany.assembly.Callback;
+import org.apache.tuscany.assembly.Component;
+import org.apache.tuscany.assembly.ComponentReference;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.Composite;
+import org.apache.tuscany.assembly.CompositeReference;
+import org.apache.tuscany.assembly.CompositeService;
+import org.apache.tuscany.assembly.Multiplicity;
+import org.apache.tuscany.assembly.Property;
 import org.apache.tuscany.assembly.util.CompositeUtil;
 import org.apache.tuscany.assembly.util.PrintUtil;
 import org.apache.tuscany.assembly.xml.Constants;

Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java?view=diff&rev=525093&r1=525092&r2=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java Tue Apr  3 01:52:45 2007
@@ -26,15 +26,15 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
 import org.apache.tuscany.assembly.xml.LoaderRegistry;
 import org.apache.tuscany.assembly.xml.impl.ComponentTypeLoader;
 import org.apache.tuscany.assembly.xml.impl.CompositeLoader;
 import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeLoader;
 import org.apache.tuscany.assembly.xml.impl.LoaderRegistryImpl;
-import org.apache.tuscany.policy.model.PolicyFactory;
-import org.apache.tuscany.policy.model.impl.DefaultPolicyFactory;
+import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
 
 /**
  * Test the usability of the assembly model API when loading SCDL

Modified: incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java?view=diff&rev=525093&r1=525092&r2=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java (original)
+++ incubator/tuscany/java/sca/scdl4j/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java Tue Apr  3 01:52:45 2007
@@ -24,14 +24,14 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.assembly.model.AssemblyFactory;
-import org.apache.tuscany.assembly.model.Composite;
-import org.apache.tuscany.assembly.model.impl.DefaultAssemblyFactory;
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.Composite;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
 import org.apache.tuscany.assembly.xml.LoaderRegistry;
 import org.apache.tuscany.assembly.xml.impl.CompositeLoader;
 import org.apache.tuscany.assembly.xml.impl.LoaderRegistryImpl;
-import org.apache.tuscany.policy.model.PolicyFactory;
-import org.apache.tuscany.policy.model.impl.DefaultPolicyFactory;
+import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
 
 /**
  * Test the usability of the assembly model API when loading SCDL

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import org.apache.tuscany.policy.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.
+ * 
+ * @version $Rev$ $Date$
+ */
+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
+     */
+    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
+     */
+    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.
+     */
+    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.
+     */
+    void setCallbackInterface(Interface callbackInterface);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractContract.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractProperty.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractProperty.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractProperty.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractProperty.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.policy.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.
+ */
+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
+     */
+    void setMustSupply(boolean mustSupply);
+
+    /**
+     * 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.
+     * 
+     * @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.
+     * 
+     * @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.
+     * 
+     * @param type the element defining the type of this property
+     */
+    void setXSDElement(QName element);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractProperty.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractProperty.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractReference.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractReference.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractReference.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+/**
+ * Represents a reference contract.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface AbstractReference extends AbstractContract {
+
+    /**
+     * 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
+     */
+    void setMultiplicity(Multiplicity multiplicity);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractReference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractReference.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractService.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractService.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractService.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+/**
+ * Represents a service contract.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface AbstractService extends AbstractContract {
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AbstractService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import org.apache.tuscany.sca.idl.Operation;
+
+/**
+ * A factory for the assembly model
+ * 
+ * @version $Rev$ $Date$
+ */
+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();
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/AssemblyFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Base.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Base.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Base.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Base.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import java.util.List;
+
+/**
+ * Base interface for all assembly model objects.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface Base {
+
+    /**
+     * 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);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Base.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Base.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Binding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Binding.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Binding.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Binding.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import org.apache.tuscany.policy.IntentAttachPoint;
+import org.apache.tuscany.policy.PolicySetAttachPoint;
+
+/**
+ * Represents a binding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface Binding extends Base, IntentAttachPoint, PolicySetAttachPoint {
+
+    /**
+     * 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);
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Binding.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Binding.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Callback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Callback.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Callback.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Callback.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import java.util.List;
+
+import org.apache.tuscany.policy.IntentAttachPoint;
+import org.apache.tuscany.policy.PolicySetAttachPoint;
+
+/**
+ * Represents a callback object describing the bindings to use for callbacks.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface Callback extends Base, IntentAttachPoint, PolicySetAttachPoint {
+
+    /**
+     * Returns the bindings supported for callbacks.
+     * 
+     * @return the bindings supported for callbacks
+     */
+    List<Binding> getBindings();
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Callback.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Callback.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Component.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Component.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Component.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import java.util.List;
+
+import org.apache.tuscany.policy.IntentAttachPoint;
+import org.apache.tuscany.policy.PolicySetAttachPoint;
+
+/**
+ * Represents a component. A component is a configured instance of an
+ * implementation.
+ * 
+ * @version $Rev$ $Date$
+ */
+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);
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Component.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Component.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentProperty.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentProperty.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentProperty.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentProperty.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+/**
+ * Represents a configured property of a component.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface ComponentProperty extends Property {
+
+    /**
+     * 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
+     */
+    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
+     */
+    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);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentProperty.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentProperty.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+/**
+ * An instance of a reference associated with a particular component.
+ * 
+ * @version $Rev$ $Date$
+ */
+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);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+/**
+ * An addressable instance of a service associated with a particular component.
+ * 
+ * @version $Rev$ $Date$
+ */
+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);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import java.util.List;
+
+import org.apache.tuscany.policy.IntentAttachPoint;
+import org.apache.tuscany.policy.PolicySetAttachPoint;
+
+/**
+ * Describes an implementation and represents its configurable aspects.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface ComponentType extends Base, IntentAttachPoint, PolicySetAttachPoint {
+
+    /**
+     * 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);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Represents a composite.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface Composite extends Implementation {
+
+    /**
+     * 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
+     */
+    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
+     */
+    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);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import java.util.List;
+
+/**
+ * Represents composite reference.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface CompositeReference extends Reference {
+
+    /**
+     * Returns the promoted composite references.
+     * 
+     * @return the promoted composite references
+     */
+    List<ComponentReference> getPromotedReferences();
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+/**
+ * Represents a composite service.
+ * 
+ * @version $Rev$ $Date$
+ */
+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);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.policy.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.
+ * 
+ * @version $Rev$ $Date$
+ */
+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();
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+import java.util.List;
+
+import org.apache.tuscany.policy.PolicySetAttachPoint;
+
+/**
+ * Represents a contract. A contract can be either a service or a reference.
+ * 
+ * @version $Rev$ $Date$
+ */
+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.
+     * 
+     * @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.
+     * 
+     * @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);
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+/**
+ * Represents a component implementation.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface Implementation extends ComponentType {
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java?view=auto&rev=525093
==============================================================================
--- incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java (added)
+++ incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java Tue Apr  3 01:52:45 2007
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.assembly;
+
+/**
+ * Enumeration for multiplicity. Defines the number of wires that can connect a
+ * reference to target services.
+ * 
+ * @version $Rev$ $Date$
+ */
+public enum Multiplicity {
+
+    /**
+     * Zero or one wire can have the reference as a source.
+     */
+    ZERO_ONE,
+
+    /**
+     * The default setting, one wire can have the reference as a source.
+     */
+    ONE_ONE,
+
+    /**
+     * Zero or more wires can have the reference as a source.
+     */
+    ZERO_N,
+
+    /**
+     * One or more wires can have the reference as a source.
+     */
+    ONE_N
+
+}

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/scdl4j/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



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