You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/21 07:54:10 UTC

svn commit: r379376 [1/11] - in /incubator/tuscany/java/sca/model: ./ src/main/java/org/apache/tuscany/model/ src/main/java/org/apache/tuscany/model/assembly/ src/main/java/org/apache/tuscany/model/assembly/impl/ src/main/java/org/apache/tuscany/model/...

Author: jsdelfino
Date: Mon Feb 20 22:54:02 2006
New Revision: 379376

URL: http://svn.apache.org/viewcvs?rev=379376&view=rev
Log:
new POJO model

Added:
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Aggregate.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AggregatePart.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelObject.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelVisitor.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Binding.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Component.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentImplementation.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentType.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredPort.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredProperty.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredReference.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredService.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/EntryPoint.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Extensible.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ExternalService.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Module.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleComponent.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleFragment.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Multiplicity.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/OverrideOption.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Port.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Property.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Reference.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/RuntimeConfigurationHolder.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Scope.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Service.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ServiceContract.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ServiceURI.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/SimpleComponent.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Subsystem.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregateImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AggregatePartImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyModelContextImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyModelObjectImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/BindingImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ComponentImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ComponentImplementationImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ComponentTypeImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPortImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredPropertyImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredReferenceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ConfiguredServiceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/EntryPointImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExtensibleImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ExternalServiceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleComponentImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleFragmentImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ModuleImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PortImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/PropertyImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ReferenceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceContractImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/SimpleComponentImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/SubsystemImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/AssemblyLoader.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/AssemblyLoaderImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/SCDLXMLLoader.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/pojo/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Binding.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Component.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/ComponentType.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/DocumentRoot.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/EntryPoint.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/ExternalService.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Implementation.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Interface.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/JavaImplementation.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/JavaInterface.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Module.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/ModuleComponent.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/ModuleFragment.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/ModuleWire.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Multiplicity.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/OverrideOptions.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Property.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/PropertyValues.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Reference.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/ReferenceValues.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/SCABinding.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/SCDLFactory.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Service.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/Subsystem.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/SystemWire.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/WSDLPortType.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/WebServiceBinding.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/BindingImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ComponentImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ComponentTypeImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/DocumentRootImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/EntryPointImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ExternalServiceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ImplementationImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/InterfaceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/JavaImplementationImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/JavaInterfaceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ModuleComponentImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ModuleFragmentImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ModuleImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ModuleWireImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/PropertyImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/PropertyValuesImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ReferenceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ReferenceValuesImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/SCABindingImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/SCDLFactoryImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/SCDLPackageImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/ServiceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/SubsystemImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/SystemWireImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/WSDLPortTypeImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/impl/WebServiceBindingImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/util/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/util/SCDLResourceFactoryImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/util/SCDLResourceImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/scdl/util/SCDLXMLProcessor.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/sdo/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/config/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/JavaServiceContract.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/WSDLServiceContract.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/xsd/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/xsd/impl/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/util/
    incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/util/XMLNameUtil.java   (with props)
    incubator/tuscany/java/sca/model/src/main/java/org/osoa/
    incubator/tuscany/java/sca/model/src/main/java/org/osoa/xmlns/
    incubator/tuscany/java/sca/model/src/main/resources/model/sca-binding-webservice.xsd   (with props)
    incubator/tuscany/java/sca/model/src/main/resources/model/sca-implementation-java.xsd   (with props)
    incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/SCDLXMLLoaderTestCase.java   (with props)
Removed:
    incubator/tuscany/java/sca/model/src/main/resources/model/sca-assembly.ecore
    incubator/tuscany/java/sca/model/src/main/resources/model/sca-assembly.genmodel
    incubator/tuscany/java/sca/model/src/main/resources/tuscany-model.config
    incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/sdo/tests/
    incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/AssemblyLoaderTestCase.java
Modified:
    incubator/tuscany/java/sca/model/pom.xml
    incubator/tuscany/java/sca/model/src/main/resources/model/sca-binding-sca.xsd
    incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd
    incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-java.xsd
    incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd
    incubator/tuscany/java/sca/model/src/main/resources/model/sca.xsd

Modified: incubator/tuscany/java/sca/model/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/pom.xml?rev=379376&r1=379375&r2=379376&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/pom.xml (original)
+++ incubator/tuscany/java/sca/model/pom.xml Mon Feb 20 22:54:02 2006
@@ -26,6 +26,16 @@
     <description>Data model for the Assembly model defined by the SCA specification.</description>
     <version>SNAPSHOT</version>
 
+    <repositories>
+        <repository>
+            <id>jeremy</id>
+            <url>http://people.apache.org/~jboynes/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.osoa</groupId>
@@ -41,66 +51,65 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>commonj-sdo</artifactId>
-            <version>2.1.0</version>
+            <groupId>commonj</groupId>
+            <artifactId>sdo-api</artifactId>
+            <version>SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
+      <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+<!--
+       <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>common</artifactId>
-            <version>2.1.0</version>
+            <version>2.2.0-I200602160000</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>ecore</artifactId>
-            <version>2.1.0</version>
+            <version>2.2.0-I200602160000</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>ecore-change</artifactId>
-            <version>2.1.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-sdo</artifactId>
-            <version>2.1.1</version>
+            <version>2.2.0-I200602160000</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>
             <artifactId>ecore-xmi</artifactId>
-            <version>2.1.0</version>
+            <version>2.2.0-I200602160000</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xsd</groupId>
             <artifactId>xsd</artifactId>
-            <version>2.1.1</version>
+            <version>2.2.0-I200602160000</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.wtp</groupId>
-            <artifactId>wsdl</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
+-->
+        
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis-wsdl4j</artifactId>
             <version>1.5.1</version>
             <scope>compile</scope>
         </dependency>
+<!--
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+-->
 
         <dependency>
             <groupId>junit</groupId>

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Aggregate.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Aggregate.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Aggregate.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Aggregate.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,90 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import java.util.List;
+
+/**
+ * Represents an aggregate. An aggregate contains AggregateParts (e.g. components, entry points
+ * and external services).
+ */
+public interface Aggregate extends Extensible {
+
+    /**
+     * Returns the name of the aggregate.
+     * @return
+     */
+    String getName();
+
+    /**
+     * Sets the name of the aggregate.
+     * @param value
+     */
+    void setName(String value);
+
+    /**
+     * Returns the entry points contained in this aggregate.
+     */
+    List<EntryPoint> getEntryPoints();
+
+    /**
+     * Returns the named entry point.
+     * @param name
+     * @return
+     */
+    EntryPoint getEntryPoint(String name);
+
+    /**
+     * Returns the components contained in this aggregate.
+     * @return
+     */
+    List<Component> getComponents();
+
+    /**
+     * Returns the named component.
+     * @param name
+     * @return
+     */
+    Component getComponent(String name);
+
+    /**
+     * Returns external services contained in this aggregate.
+     * @return
+     */
+    List<ExternalService> getExternalServices();
+
+    /**
+     * Returns the named external service.
+     * @param name
+     * @return
+     */
+    ExternalService getExternalService(String name);
+
+    /**
+     * Returns the configured service at the given address.
+     * @param address
+     * @return
+     */
+    ConfiguredService getConfiguredService(ServiceURI address);
+
+    /**
+     * Returns the AggregateParts in this aggregate
+     * @return
+     */
+    List<AggregatePart> getAggregateParts();
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Aggregate.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AggregatePart.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AggregatePart.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AggregatePart.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AggregatePart.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,40 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+/**
+ * Represents a part of an aggregate (a component, an external service or an entry point).
+ */
+public interface AggregatePart extends AssemblyModelObject {
+
+    /**
+     * Returns the name of the part.
+     */
+    String getName();
+
+    /**
+     * Sets name of the part.
+     */
+    void setName(String value);
+
+    /**
+     * Returns the aggregate containing this aggregate part.
+     * @return
+     */
+    Aggregate getAggregate();
+    
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AggregatePart.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,156 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.model.types.java.JavaServiceContract;
+import org.apache.tuscany.model.types.wsdl.WSDLServiceContract;
+
+/**
+ * The Factory for the assembly model.
+ * Provides a create method for each non-abstract class of the model.
+ */
+public interface AssemblyFactory {
+
+    /**
+     * Returns a new SimpleComponent.
+     * @return
+     */
+    SimpleComponent createSimpleComponent();
+
+    /**
+     * Returns a new ComponentType.
+     * @return
+     */
+    ComponentType createComponentType();
+
+    /**
+     * Returns a new EntryPoint.
+     * @return
+     */
+    EntryPoint createEntryPoint();
+
+    /**
+     * Returns a new ExternalService.
+     * @return
+     */
+    ExternalService createExternalService();
+
+    /**
+     * Returns a new JavaServiceContract.
+     * @return
+     */
+    JavaServiceContract createJavaServiceContract();
+
+    /**
+     * Returns a new Module.
+     * @return
+     */
+    Module createModule();
+
+    /**
+     * Returns a new ModuleComponent.
+     * @return
+     */
+    ModuleComponent createModuleComponent();
+
+    /**
+     * Returns a new ModuleFragment.
+     * @return
+     */
+    ModuleFragment createModuleFragment();
+
+    /**
+     * Returns a new Reference.
+     * @return
+     */
+    Reference createReference();
+
+    /**
+     * Returns a new ConfiguredReference.
+     * @return
+     */
+    ConfiguredReference createConfiguredReference();
+
+    /**
+     * Returns a new Service.
+     * @return
+     */
+    Service createService();
+
+    /**
+     * Returns a new ConfiguredService.
+     * @return
+     */
+    ConfiguredService createConfiguredService();
+
+    /**
+     * Returns a new Subsystem.
+     * @return
+     */
+    Subsystem createSubsystem();
+
+    /**
+     * Returns Property.
+     * @return
+     */
+    Property createProperty();
+
+    /**
+     * Returns a new ConfiguredProperty.
+     * @return
+     */
+    ConfiguredProperty createConfiguredProperty();
+
+    /**
+     * Returns a new WSDLServiceContract.
+     * @return
+     */
+    WSDLServiceContract createWSDLServiceContract();
+
+    /**
+     * Create a new ServiceURI from the given uri string.
+     * @param uri
+     * @return
+     */
+    ServiceURI createServiceURI(String uri);
+
+    /**
+     * Creates a new ServiceURI from a module component and a service name.
+     * @param moduleComponent
+     * @param serviceName
+     * @return
+     */
+    ServiceURI createServiceURI(ModuleComponent moduleComponent, String serviceName);
+
+    /**
+     * Creates a new ServiceURI from a module component and configured port.
+     * @param moduleComponent
+     * @param configuredPort
+     * @return
+     */
+    ServiceURI createServiceURI(ModuleComponent moduleComponent, ConfiguredPort configuredPort);
+
+    /**
+     * Create a qname from a URI
+     * @param uri
+     * @return
+     */
+    QName createQName(String uri);
+
+}

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

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

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,46 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import org.apache.tuscany.common.resource.loader.ResourceLoader;
+import org.apache.tuscany.model.assembly.loader.AssemblyLoader;
+
+
+/**
+ */
+public interface AssemblyModelContext {
+
+    /**
+     * Returns a model factory.
+     *
+     * @return
+     */
+    AssemblyFactory getAssemblyFactory();
+
+    /**
+     * Returns a resource loader
+     * @return
+     */
+    ResourceLoader getResourceLoader();
+    
+    /**
+     * Returns an assembly loader.
+     * @return
+     */
+    AssemblyLoader getAssemblyLoader();
+    
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelContext.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelObject.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelObject.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelObject.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelObject.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,42 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Base interface for assembly model objects.
+ */
+public interface AssemblyModelObject {
+
+    /**
+     * Initialize this model object.
+     * @param modelContext
+     */
+    void initialize(AssemblyModelContext modelContext);
+
+    /**
+     * Freeze this model object.
+     */
+    void freeze();
+
+    /**
+     * Accept a visitor
+     * @param visitor
+     */
+    boolean accept(AssemblyModelVisitor visitor);
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelObject.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelVisitor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelVisitor.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelVisitor.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelVisitor.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,31 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+/**
+ */
+public interface AssemblyModelVisitor {
+
+    /**
+     * Visit the given model object.
+     *
+     * @param modelObject
+     * @return
+     */
+    boolean visit(AssemblyModelObject modelObject);
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyModelVisitor.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Binding.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Binding.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Binding.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Binding.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,37 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a binding.
+ */
+public interface Binding extends AssemblyModelObject, RuntimeConfigurationHolder {
+
+    /**
+     * Returns the binding URI.
+     * @return
+     */
+    String getURI();
+
+    /**
+     * Sets binding URI.
+     * @param value
+     */
+    void setURI(String value);
+
+}

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

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

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Component.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Component.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Component.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Component.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,78 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import java.util.List;
+
+
+/**
+ * Represents a component.
+ */
+public interface Component extends Extensible, AggregatePart {
+
+    /**
+     * Returns the component implementation.
+     * @return
+     */
+    ComponentImplementation getComponentImplementation();
+
+    /**
+     * Sets the component implementation.
+     * @param value
+     */
+    void setComponentImplementation(ComponentImplementation value);
+
+    /**
+     * Returns the configured properties.
+     * @return
+     */
+    List<ConfiguredProperty> getConfiguredProperties();
+
+    /**
+     * Returns the named configured property.
+     * @param name
+     * @return
+     */
+    ConfiguredProperty getConfiguredProperty(String name);
+
+    /**
+     * Returns the configured references.
+     * @return
+     */
+    List<ConfiguredReference> getConfiguredReferences();
+
+    /**
+     * Returns the named configured reference.
+     * @param name
+     * @return
+     */
+    ConfiguredReference getConfiguredReference(String name);
+
+    /**
+     * Returns the configured services.
+     * @return
+     */
+    List<ConfiguredService> getConfiguredServices();
+
+    /**
+     * Returns the named configured service.
+     * @param name
+     * @return
+     */
+    ConfiguredService getConfiguredService(String name);
+	
+}

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

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

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentImplementation.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentImplementation.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentImplementation.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentImplementation.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,37 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a component implementation.
+ */
+public interface ComponentImplementation extends Extensible, RuntimeConfigurationHolder {
+
+    /**
+     * Returns the component type describing this implementation.
+     * @return
+     */
+    ComponentType getComponentType();
+    
+    /**
+     * Sets the component type describing this implementation.
+     * @param componentType
+     */
+    void setComponentType(ComponentType componentType);
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentImplementation.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentType.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentType.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentType.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentType.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,66 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import java.util.List;
+
+
+/**
+ * Represents a component type.
+ */
+public interface ComponentType extends Extensible {
+
+    /**
+     * Returns the declared services.
+     * @return
+     */
+    List<Service> getServices();
+
+    /**
+     * Returns the named service.
+     * @param name
+     * @return
+     */
+    Service getService(String name);
+
+    /**
+     * Returns the declared references.
+     * @return
+     */
+    List<Reference> getReferences();
+
+    /**
+     * Returns the named reference.
+     * @param name
+     * @return
+     */
+    Reference getReference(String name);
+
+    /**
+     * Returns the properties declared by the component type.
+     * @return
+     */
+    List<Property> getProperties();
+
+    /**
+     * Returns the named property.
+     * @param name
+     * @return
+     */
+    Property getProperty(String name);
+
+}

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

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

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredPort.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredPort.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredPort.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredPort.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,55 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a configured port (e.g. a configured reference or configured service).
+ */
+public interface ConfiguredPort extends AssemblyModelObject, RuntimeConfigurationHolder {
+
+    /**
+     * Returns the port definition.
+     * @return
+     */
+    Port getPort();
+
+    /**
+     * Sets the port definition.
+     * @param port
+     */
+    void setPort(Port port);
+
+    /**
+     * Returns the aggregate part containing this port.
+     * @return
+     */
+    AggregatePart getAggregatePart();
+    
+    /**
+     * Returns the port's proxy factory
+     * @return
+     */
+    Object getProxyFactory();
+
+    /**
+     * Sets the port's proxy factory
+     * @param proxyFactory
+     */
+    void setProxyFactory(Object proxyFactory);
+	
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredPort.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredProperty.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredProperty.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredProperty.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredProperty.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,49 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a configured property.
+ */
+public interface ConfiguredProperty extends AssemblyModelObject {
+
+    /**
+     * Returns the property definition.
+     * @return
+     */
+    Property getProperty();
+
+    /**
+     * Sets the property definition
+     * @param property
+     */
+    void setProperty(Property property);
+
+    /**
+     * Returns the property value
+     * @return
+     */
+    Object getValue();
+
+    /**
+     * Sets the property value
+     * @param value
+     */
+    void setValue(Object value);
+	
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredProperty.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredReference.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredReference.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredReference.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredReference.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,44 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import java.util.List;
+
+/**
+ * Represents a configured reference.
+ */
+public interface ConfiguredReference extends ConfiguredPort {
+
+    /**
+     * Returns the reference definition.
+     * @return
+     */
+    Reference getReference();
+
+    /**
+     * Sets the reference definition.
+     * @return
+     */
+    void setReference(Reference reference);
+
+    /**
+     * Returns the target configured services wired to this configured reference.
+     * @return
+     */
+    List<ConfiguredService> getTargetConfiguredServices();
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredReference.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredService.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredService.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredService.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,37 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a configured service.
+ */
+public interface ConfiguredService extends ConfiguredPort {
+
+    /**
+     * Returns the service definition.
+     * @return
+     */
+    Service getService();
+
+    /**
+     * Sets the service definition.
+     * @param service
+     */
+    void setService(Service service);
+    
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ConfiguredService.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/EntryPoint.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/EntryPoint.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/EntryPoint.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/EntryPoint.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,56 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import java.util.List;
+
+
+/**
+ * Represents an entry point.
+ */
+public interface EntryPoint extends AggregatePart, Extensible {
+
+    /**
+     * Returns the bindings used by this entry point.
+     */
+    List<Binding> getBindings();
+
+    /**
+     * Returns the configured service exposed by this external service.
+     * @return
+     */
+    ConfiguredService getConfiguredService();
+
+    /**
+     * Sets the configured service exposed by this external service.
+     * @param configuredService
+     */
+    void setConfiguredService(ConfiguredService configuredService);
+
+    /**
+     * Returns the configured reference wiring this entry point to the published service.
+     * @return
+     */
+    ConfiguredReference getConfiguredReference();
+
+    /**
+     * Sets the configured reference wiring this entry point to the published service.
+     * @param configuredReference
+     */
+    void setConfiguredReference(ConfiguredReference configuredReference);
+    
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/EntryPoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Extensible.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Extensible.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Extensible.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Extensible.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,38 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import java.util.List;
+
+/**
+ * Represents an extensible model object.
+ */
+public interface Extensible extends AssemblyModelObject {
+
+    /**
+     * Returns the extensibility elements.
+     * @return
+     */
+    List getExtensibilityElements();
+
+    /**
+     * Returns the extensibility attributes.
+     * @return
+     */
+    List getExtensibilityAttributes();
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Extensible.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ExternalService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ExternalService.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ExternalService.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ExternalService.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,53 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import java.util.List;
+
+
+/**
+ * Represents an external service.
+ */
+public interface ExternalService extends AggregatePart, Extensible {
+
+    /**
+     * Returns the bindings configured on this external service.
+     */
+    List<Binding> getBindings();
+
+    /**
+     * Returns the override option.
+     */
+    OverrideOption getOverrideOption();
+
+    /**
+     * Sets the override option.
+     */
+    void setOverrideOption(OverrideOption value);
+
+    /**
+     * Returns the configured service exposed by this external service.
+     * @return
+     */
+    ConfiguredService getConfiguredService();
+
+    /**
+     * Sets the configured service exposed by this external service.
+     * @param configuredService
+     */
+    void setConfiguredService(ConfiguredService configuredService);
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ExternalService.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Module.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Module.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Module.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Module.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,40 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+import java.util.List;
+
+
+/**
+ * Represents a module.
+ */
+public interface Module extends Aggregate, ComponentImplementation {
+
+    /**
+     * Returns the module fragments
+     * @return
+     */
+    List<ModuleFragment> getModuleFragments();
+
+    /**
+     * Returns the named module fragment
+     * @param name
+     * @return
+     */
+    ModuleFragment getModuleFragment(String name);
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Module.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleComponent.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleComponent.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleComponent.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleComponent.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,46 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+/**
+ * Represents a module component.
+ */
+public interface ModuleComponent extends Component {
+
+    /**
+     * Returns the module implementing this module component.
+     * @return
+     */
+    Module getModuleImplementation();
+
+    /**
+     * Set the module implementing this module component.
+     * @param module
+     */
+    void setModuleImplementation(Module module);
+
+    /**
+     * Returns the uri of the module component.
+     */
+    String getURI();
+
+    /**
+     * Sets the uri of the module component.
+     */
+    void setURI(String value);
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleComponent.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleFragment.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleFragment.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleFragment.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleFragment.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,25 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a module fragment.
+ */
+public interface ModuleFragment extends Aggregate {
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ModuleFragment.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Multiplicity.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Multiplicity.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Multiplicity.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Multiplicity.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,30 @@
+/**
+ *
+ *  Copyright 2005 BEA Systems Inc.
+ *  Copyright 2005 International Business Machines Corporation
+ *
+ *  Licensed 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.model.assembly;
+
+/**
+ * Enumeration for multiplicity.
+ */
+public enum Multiplicity {
+
+    ZERO_ONE,
+    ONE_ONE,
+    ZERO_N,
+    ONE_N,
+
+}

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

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

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/OverrideOption.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/OverrideOption.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/OverrideOption.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/OverrideOption.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,29 @@
+/**
+ *
+ *  Copyright 2005 BEA Systems Inc.
+ *  Copyright 2005 International Business Machines Corporation
+ *
+ *  Licensed 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.model.assembly;
+
+/**
+ * Enumeration for override options.
+ */
+public enum OverrideOption {
+    
+    NO,
+    MAY,
+    MUST;
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/OverrideOption.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Port.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Port.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Port.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Port.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,48 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+/**
+ * Represents a port (e.g. a service or reference).
+ */
+public interface Port extends AssemblyModelObject {
+
+    /**
+     * Returns the port's service contract (interface and callback interface).
+     * @return 
+     */
+    ServiceContract getServiceContract();
+
+    /**
+     * Returns the port's service contract (interface and callback interface).
+     * @param value 
+     */
+    void setServiceContract(ServiceContract value);
+
+    /**
+     * Returns the name of the port.
+     * @return
+     */
+    String getName();
+
+    /**
+     * Sets the name of the port.
+     * @param value
+     */
+    void setName(String value);
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Port.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Property.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Property.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Property.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Property.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,85 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a property definition.
+ */
+public interface Property extends Extensible {
+    
+    /**
+     * Returns the default value of the property.
+     * @return
+     */
+    Object getDefaultValue();
+
+    /**
+     * Sets the default value of the property.
+     * @param value
+     */
+    void setDefaultValue(Object value);
+
+    /**
+     * Returns true if the property allows multiple values.
+     * @return
+     */
+    boolean isMany();
+
+    /**
+     * Sets whether or not the property allows many values.
+     * @param value
+     */
+    void setMany(boolean value);
+
+    /**
+     * Returns the property name.
+     * @return
+     */
+    String getName();
+
+    /**
+     * Sets the property name.
+     * @param value
+     */
+    void setName(String value);
+
+    /**
+     * Returns true if the property is required.
+     * @return
+     */
+    boolean isRequired();
+
+    /**
+     * Sets the whether or not the property is required.
+     * @param value
+     */
+    void setRequired(boolean value);
+
+    /**
+     * Returns the property type.
+     * @return
+     */
+    Class getType();
+
+    /**
+     * Sets the property type.
+     * @param value
+     */
+    void setType(Class value);
+
+} // Property

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Property.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Reference.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Reference.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Reference.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Reference.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,37 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a reference.
+ */
+public interface Reference extends Port {
+
+    /**
+     * Returns the multiplicity.
+     * @return
+     */
+    Multiplicity getMultiplicity();
+
+    /**
+     * Sets the multiplicity.
+     * @param multiplicity
+     */
+    void setMultiplicity(Multiplicity multiplicity);
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Reference.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/RuntimeConfigurationHolder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/RuntimeConfigurationHolder.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/RuntimeConfigurationHolder.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/RuntimeConfigurationHolder.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,36 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+/**
+ * Represents a model object that can hold a runtime configuration object.
+ */
+public interface RuntimeConfigurationHolder {
+
+    /**
+     * Sets the runtime configuration
+     * @param configuration
+     */
+    void setRuntimeConfiguration(Object configuration);
+
+    /**
+     * Returns the runtime configuration
+     * @return
+     */
+    Object getRuntimeConfiguration();
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/RuntimeConfigurationHolder.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Scope.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Scope.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Scope.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Scope.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,33 @@
+/**
+ *
+ *  Copyright 2005 BEA Systems Inc.
+ *  Copyright 2005 International Business Machines Corporation
+ *
+ *  Licensed 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.model.assembly;
+
+/**
+ * A scope enumeration
+ */
+public enum Scope {
+    
+    INSTANCE,
+    REQUEST,
+    SESSION,
+    MODULE,
+    //FIXME Jim do we really need this?
+    AGGREGATE,
+    UNDEFINED;
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Scope.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Service.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Service.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Service.java (added)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Service.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,25 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.model.assembly;
+
+
+/**
+ * Represents a service.
+ */
+public interface Service extends Port {
+
+}

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

Propchange: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Service.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date