svn commit: r525710 [1/2] - in /incubator/tuscany/java/sca/modules/core-spi: ./ src/ src/main/java/org/apache/tuscany/spi/ src/main/java/org/apache/tuscany/spi/builder/ src/main/java/org/apache/tuscany/spi/builder/interceptor/ src/main/java/org/apache/...

[rf...@apache.org]

Author: rfeng
Date: Wed Apr  4 22:47:55 2007
New Revision: 525710

URL: http://svn.apache.org/viewvc?view=rev&rev=525710
Log:
Port the core SPIs to use the new assembly model

Added:
    incubator/tuscany/java/sca/modules/core-spi/
      - copied from r525178, incubator/tuscany/java/sca/kernel/spi/
    incubator/tuscany/java/sca/modules/core-spi/.checkstyle
      - copied unchanged from r525694, incubator/tuscany/java/sca/kernel/spi/.checkstyle
    incubator/tuscany/java/sca/modules/core-spi/.pmd
      - copied, changed from r525694, incubator/tuscany/java/sca/kernel/spi/.pmd
    incubator/tuscany/java/sca/modules/core-spi/.ruleset
      - copied unchanged from r525694, incubator/tuscany/java/sca/kernel/spi/.ruleset
    incubator/tuscany/java/sca/modules/core-spi/LICENSE.txt
      - copied unchanged from r525694, incubator/tuscany/java/sca/kernel/spi/LICENSE.txt
    incubator/tuscany/java/sca/modules/core-spi/NOTICE.txt
      - copied unchanged from r525694, incubator/tuscany/java/sca/kernel/spi/NOTICE.txt
    incubator/tuscany/java/sca/modules/core-spi/pom.xml
      - copied, changed from r525694, incubator/tuscany/java/sca/kernel/spi/pom.xml
    incubator/tuscany/java/sca/modules/core-spi/src/
      - copied from r525694, incubator/tuscany/java/sca/kernel/spi/src/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Scope.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/ScopeTestCase.java   (with props)
Removed:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/interceptor/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/physical/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ArtifactResolver.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ArtifactResolverRegistry.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ChangeSetHandler.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ChangeSetHandlerRegistry.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ContentType.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ContentTypeDescriber.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessor.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionProcessorRegistry.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/ContributionRepository.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ArtifactResolverExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/InterceptorBuilderExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/generator/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/idl/ElementInfo.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/idl/InvalidConversationalOperationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/idl/InvalidServiceContractException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/idl/OverloadedOperationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/idl/ServiceFaultException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/idl/TypeInfo.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/idl/XMLType.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/idl/java/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/implementation/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/loader/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/marshaller/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/AtomicImplementation.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/BindingDefinition.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/CompositeImplementation.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Contribution.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ContributionImport.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/DataType.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/DeployedArtifact.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ElementInfo.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Implementation.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Include.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Intent.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/IntentDefinition.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/IntentMap.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/IntentName.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ModelObject.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Multiplicity.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Operation.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/PolicyAttachable.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/PolicyAttachableModel.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/PolicyContentModel.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/PolicyModel.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/PolicySet.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/PolicySetReference.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Property.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/PropertyValue.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Qualifier.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ReferenceTarget.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ResourceDefinition.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/Scope.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/TypeInfo.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/WSPolicyAttachment.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/WrapperInfo.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/XMLType.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/model/physical/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/policy/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/artifact/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/discovery/
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/ComponentTypeLoaderExtensionTestCase.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/InterceptorBuilderExtensionTestCase.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/idl/
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/loader/
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/model/
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/policy/
Modified:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Component.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentManager.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Invocable.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Reference.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Service.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolutionException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/Resolver.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolverRegistry.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/work/WorkSchedulerException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/IncompatibleServiceContractException.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/InvocationChain.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/TuscanyRuntimeExceptionTestCase.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AbstractComponentExtensionTestCase.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java

Copied: incubator/tuscany/java/sca/modules/core-spi/.pmd (from r525694, incubator/tuscany/java/sca/kernel/spi/.pmd)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/.pmd?view=diff&rev=525710&p1=incubator/tuscany/java/sca/kernel/spi/.pmd&r1=525694&p2=incubator/tuscany/java/sca/modules/core-spi/.pmd&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/.pmd (original)
+++ incubator/tuscany/java/sca/modules/core-spi/.pmd Wed Apr  4 22:47:55 2007
@@ -1,20 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>
+<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/><includeDerivedFiles>false</includeDerivedFiles></pmd>
\ No newline at end of file

Copied: incubator/tuscany/java/sca/modules/core-spi/pom.xml (from r525694, incubator/tuscany/java/sca/kernel/spi/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/pom.xml?view=diff&rev=525710&p1=incubator/tuscany/java/sca/kernel/spi/pom.xml&r1=525694&p2=incubator/tuscany/java/sca/modules/core-spi/pom.xml&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/core-spi/pom.xml Wed Apr  4 22:47:55 2007
@@ -20,23 +20,47 @@
 <project>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>kernel</artifactId>
-        <version>2.0-alpha2-incubating-SNAPSHOT</version>
+        <artifactId>tuscany-modules</artifactId>
+        <version>1.0-incubating-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tuscany.sca.kernel</groupId>
-    <artifactId>tuscany-spi</artifactId>
+    <artifactId>tuscany-core-spi</artifactId>
     <name>Apache Tuscany SCA SPI</name>
     <description>Tuscany Service Provider Interfaces.</description>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-host-api</artifactId>
+            <artifactId>tuscany-host-spi</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-idl</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>                        
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/CoreRuntimeException.java Wed Apr  4 22:47:55 2007
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.spi;
 
-import org.apache.tuscany.api.TuscanyRuntimeException;
 
 /**
  * The root exception for the runtime package. Exceptions occurring in the runtime are generally non-recoverable

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java?view=auto&rev=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java Wed Apr  4 22:47:55 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.spi;
+
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation that can be applied to methods in a monitoring interface to indicate to logging frameworks the severity of
+ * the event.
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({METHOD})
+@Retention(RUNTIME)
+public @interface LogLevel {
+
+    /**
+     * The log level as specified by {@link java.util.logging.Level}.
+     */
+    @SuppressWarnings({"JavaDoc"}) String value();
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java?view=auto&rev=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java Wed Apr  4 22:47:55 2007
@@ -0,0 +1,34 @@
+/*
+ * 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.spi;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A system annotation to inject a monitor
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Monitor {
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/ObjectCreationException.java Wed Apr  4 22:47:55 2007
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.spi;
 
-import org.apache.tuscany.api.TuscanyRuntimeException;
 
 /**
  * Denotes an error creating a new object instance

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java?view=auto&rev=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java Wed Apr  4 22:47:55 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.spi;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation used to indicate a resource should be provided to an implementation by the runtime.
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Resource {
+
+    /**
+     * Denotes the name of the resource declared by the implementation.
+     */
+    String name() default "";
+
+    /**
+     * Denotes if the resource is optional
+     */
+    boolean optional() default false;
+
+    /**
+     * Denotes the default name of the resource provided by the runtime environment.
+     */
+    String mappedName() default "";
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Scope.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Scope.java?view=auto&rev=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Scope.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Scope.java Wed Apr  4 22:47:55 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.spi;
+
+/**
+ * The default implementation scopes supported by assemblies.
+ *
+ * @version $Rev$ $Date$
+ */
+public class Scope {
+    public static final Scope STATELESS = new Scope("STATELESS");
+    public static final Scope REQUEST = new Scope("REQUEST");
+    public static final Scope SESSION = new Scope("SESSION");
+    public static final Scope CONVERSATION = new Scope("CONVERSATION");
+    public static final Scope COMPOSITE = new Scope("COMPOSITE");
+    public static final Scope SYSTEM = new Scope("SYSTEM");
+    public static final Scope UNDEFINED = new Scope("UNDEFINED");
+
+    private String scope;
+
+    public Scope(String scope) {
+        this.scope = scope.toUpperCase().intern();
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final Scope scope1 = (Scope) o;
+        return !(scope != null ? scope != scope1.scope.intern() : scope1.scope != null);
+    }
+
+    public int hashCode() {
+        return scope != null ? scope.hashCode() : 0;
+    }
+
+    public String toString() {
+        return scope;
+    }
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Scope.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Scope.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java?view=auto&rev=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java Wed Apr  4 22:47:55 2007
@@ -0,0 +1,124 @@
+/*
+ * 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.spi;
+
+import java.io.PrintWriter;
+
+/**
+ * The root checked exception for the Tuscany runtime.
+ *
+ * @version $Rev$ $Date$
+ */
+public abstract class TuscanyException extends Exception {
+    private static final long serialVersionUID = -7847121698339635268L;
+    private final String identifier;
+
+    /**
+     * Override constructor from Exception.
+     *
+     * @see Exception
+     */
+    public TuscanyException() {
+        super();
+        this.identifier = null;
+    }
+
+    /**
+     * Override constructor from Exception.
+     *
+     * @param message passed to Exception
+     * @see Exception
+     */
+    public TuscanyException(String message) {
+        super(message);
+        this.identifier = null;
+    }
+
+    /**
+     * Override constructor from Exception.
+     *
+     * @param message    passed to Exception
+     * @param identifier additional error information referred to in the error message
+     * @see Exception
+     */
+    public TuscanyException(String message, String identifier) {
+        super(message);
+        this.identifier = identifier;
+    }
+
+    /**
+     * Override constructor from Exception.
+     *
+     * @param message passed to Exception
+     * @param cause   passed to Exception
+     * @see Exception
+     */
+    public TuscanyException(String message, Throwable cause) {
+        super(message, cause);
+        this.identifier = null;
+    }
+
+    /**
+     * Override constructor from Exception.
+     *
+     * @param message    passed to Exception
+     * @param identifier additional error information referred to in the error message
+     * @param cause      passed to Exception
+     * @see Exception
+     */
+    public TuscanyException(String message, String identifier, Throwable cause) {
+        super(message, cause);
+        this.identifier = identifier;
+    }
+
+    /**
+     * Override constructor from Exception.
+     *
+     * @param cause passed to Exception
+     * @see Exception
+     */
+    public TuscanyException(Throwable cause) {
+        super(cause);
+        this.identifier = null;
+    }
+
+    /**
+     * Returns a string representing additional error information referred to in the error message.
+     *
+     * @return additional error information
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public PrintWriter appendBaseMessage(PrintWriter writer) {
+        if (identifier == null) {
+            if (super.getMessage() == null) {
+                return writer;
+            }
+            return writer.append(super.getMessage());
+        }
+        if (super.getMessage() != null) {
+            writer.append(super.getMessage());
+        }
+        writer.append(" [").append(identifier).append(']');
+        return writer;
+    }
+
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java?view=auto&rev=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java Wed Apr  4 22:47:55 2007
@@ -0,0 +1,127 @@
+/*
+ * 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.spi;
+
+import java.io.PrintWriter;
+
+/**
+ * The root unchecked exception for the Tuscany runtime.
+ *
+ * @version $Rev$ $Date$
+ */
+
+public abstract class TuscanyRuntimeException extends RuntimeException {
+    private static final long serialVersionUID = -759677431966121786L;
+    private final String identifier;
+
+    /**
+     * Override constructor from RuntimeException.
+     *
+     * @see RuntimeException
+     */
+    public TuscanyRuntimeException() {
+        super();
+        this.identifier = null;
+    }
+
+    /**
+     * Override constructor from RuntimeException.
+     *
+     * @param message passed to RuntimeException
+     * @see RuntimeException
+     */
+    public TuscanyRuntimeException(String message) {
+        super(message);
+        this.identifier = null;
+    }
+
+
+    /**
+     * Override constructor from Exception.
+     *
+     * @param message    passed to Exception
+     * @param identifier additional error information referred to in the error message
+     * @see Exception
+     */
+    protected TuscanyRuntimeException(String message, String identifier) {
+        super(message);
+        this.identifier = identifier;
+    }
+
+    /**
+     * Override constructor from RuntimeException.
+     *
+     * @param message passed to RuntimeException
+     * @param cause   passed to RuntimeException
+     * @see RuntimeException
+     */
+    public TuscanyRuntimeException(String message, Throwable cause) {
+        super(message, cause);
+        this.identifier = null;
+    }
+
+
+    /**
+     * Override constructor from Exception.
+     *
+     * @param message    passed to Exception
+     * @param identifier additional error information referred to in the error message
+     * @param cause      passed to RuntimeException
+     * @see Exception
+     */
+    protected TuscanyRuntimeException(String message, String identifier, Throwable cause) {
+        super(message, cause);
+        this.identifier = identifier;
+    }
+
+    /**
+     * Override constructor from RuntimeException.
+     *
+     * @param cause passed to RuntimeException
+     * @see RuntimeException
+     */
+    public TuscanyRuntimeException(Throwable cause) {
+        super(cause);
+        this.identifier = null;
+    }
+
+    /**
+     * Returns a string representing additional error information referred to in the error message.
+     *
+     * @return additional error information
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public PrintWriter appendBaseMessage(PrintWriter writer) {
+        if (identifier == null) {
+            if (super.getMessage() == null) {
+                return writer;
+            }
+            return writer.append(super.getMessage());
+        }
+        if (super.getMessage() != null) {
+            writer.append(super.getMessage());
+        }
+        writer.append(" [").append(identifier).append(']');
+        return writer;
+    }
+
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/TuscanyRuntimeException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java Wed Apr  4 22:47:55 2007
@@ -18,12 +18,12 @@
  */
 package org.apache.tuscany.spi.builder;
 
+import org.apache.tuscany.assembly.Binding;
+import org.apache.tuscany.assembly.CompositeReference;
+import org.apache.tuscany.assembly.CompositeService;
 import org.apache.tuscany.spi.component.ReferenceBinding;
 import org.apache.tuscany.spi.component.ServiceBinding;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
-import org.apache.tuscany.spi.model.ServiceDefinition;
 
 /**
  * Responsible for processing a service or reference in an assembly configured with a particular binding. The builder
@@ -32,7 +32,7 @@
  *
  * @version $Rev$ $Date$
  */
-public interface BindingBuilder<B extends BindingDefinition> {
+public interface BindingBuilder<B extends Binding> {
 
     /**
      * Creates a service binding
@@ -43,7 +43,7 @@
      * @return a service binding
      * @throws BuilderException
      */
-    ServiceBinding build(ServiceDefinition serviceDefinition, B bindingDefinition, DeploymentContext context)
+    ServiceBinding build(CompositeService serviceDefinition, B bindingDefinition, DeploymentContext context)
         throws BuilderException;
 
     /**
@@ -55,6 +55,6 @@
      * @return a reference binding
      * @throws BuilderException
      */
-    ReferenceBinding build(ReferenceDefinition referenceDefinition, B bindingDefinition, DeploymentContext context)
+    ReferenceBinding build(CompositeReference referenceDefinition, B bindingDefinition, DeploymentContext context)
         throws BuilderException;
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java Wed Apr  4 22:47:55 2007
@@ -18,14 +18,12 @@
  */
 package org.apache.tuscany.spi.builder;
 
+import org.apache.tuscany.assembly.CompositeReference;
+import org.apache.tuscany.assembly.CompositeService;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.Reference;
 import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
-import org.apache.tuscany.spi.model.ServiceDefinition;
 
 /**
  * Implementations build <code>SCAObject</code> types from model objects.
@@ -41,7 +39,7 @@
      * @return the newly created component
      * @throws BuilderException
      */
-    <I extends Implementation<?>> Component build(ComponentDefinition<I> definition, DeploymentContext context)
+    Component build(org.apache.tuscany.assembly.Component definition, DeploymentContext context)
         throws BuilderException;
 
     /**
@@ -52,7 +50,7 @@
      * @return the newly created service
      * @throws BuilderException
      */
-    Service build(ServiceDefinition definition, DeploymentContext context) throws BuilderException;
+    Service build(CompositeService definition, DeploymentContext context) throws BuilderException;
 
     /**
      * Builds a <code>Reference</code> and its bindings from a <code>BoundReferenceDefinition</code>
@@ -62,6 +60,6 @@
      * @return the newly created reference
      * @throws BuilderException
      */
-    Reference build(ReferenceDefinition definition, DeploymentContext context) throws BuilderException;
+    Reference build(CompositeReference definition, DeploymentContext context) throws BuilderException;
 
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderException.java Wed Apr  4 22:47:55 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.spi.builder;
 
-import org.apache.tuscany.api.TuscanyException;
+import org.apache.tuscany.spi.TuscanyException;
 
 /**
  * The root exception for the builder package. Builder exceptions denote a non-recoverable failure.

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/BuilderRegistry.java Wed Apr  4 22:47:55 2007
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.spi.builder;
 
-import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.assembly.Binding;
+import org.apache.tuscany.assembly.Implementation;
 
 /**
  * Maintains a registry of builders in the runtime, dispatching to the appropriate one as an assembly model is processed
@@ -35,14 +35,14 @@
      * @param implClass the type of implementation that this builder can handle
      * @param builder   the builder to be registered
      */
-    <I extends Implementation<?>> void register(Class<I> implClass, ComponentBuilder<I> builder);
+    <I extends Implementation> void register(Class<I> implClass, ComponentBuilder builder);
 
     /**
      * Unregister a builder for an implementation type.
      *
      * @param implClass the implementation whose builder should be unregistered
      */
-    <I extends Implementation<?>> void unregister(Class<I> implClass);
+    <I extends Implementation> void unregister(Class<I> implClass);
 
     /**
      * Register a binding builder for a binding type
@@ -50,6 +50,6 @@
      * @param implClass the binding type
      * @param builder   the buinder to be registered
      */
-    <B extends BindingDefinition> void register(Class<B> implClass, BindingBuilder<B> builder);
+    <B extends Binding> void register(Class<B> implClass, BindingBuilder<B> builder);
 
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java Wed Apr  4 22:47:55 2007
@@ -20,23 +20,22 @@
 
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Implementation;
 
 /**
  * Responsible for building a {@link Component} from an component definition
- *
+ * 
  * @version $Rev$ $Date$
  */
-public interface ComponentBuilder<I extends Implementation<?>> {
+public interface ComponentBuilder {
 
     /**
      * Builds the component
-     *
+     * 
      * @param componentDefinition the component definition
-     * @param context             the deployment context
+     * @param context the deployment context
      * @return the built component
      * @throws BuilderException
      */
-    Component build(ComponentDefinition<I> componentDefinition, DeploymentContext context) throws BuilderException;
+    Component build(org.apache.tuscany.assembly.Component componentDefinition, DeploymentContext context)
+        throws BuilderException;
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java Wed Apr  4 22:47:55 2007
@@ -18,9 +18,9 @@
  */
 package org.apache.tuscany.spi.builder;
 
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
+import java.net.URI;
+
+import org.apache.tuscany.assembly.Component;
 
 /**
  * Implementations are responsible for creating a wires between source and target artifacts
@@ -28,23 +28,14 @@
  * @version $$Rev$$ $$Date$$
  */
 public interface Connector {
-
     /**
      * Recursively connects component references and its children. This method will eventially be replaced by one that
      * just takes a WireDefinition
      *
+     * @param groupId
      * @param definition the component definition to connect
      * @throws WiringException
-     * @deprecated
-     */
-    void connect(ComponentDefinition<? extends Implementation<?>> definition) throws WiringException;
-
-    /**
-     * Placeholder for the connect operation using federated deployment
-     *
-     * @param definition metadata describing the wire to create
-     * @throws WiringException
      */
-    void connect(PhysicalWireDefinition definition) throws BuilderException;
+    void connect(URI groupId, Component definition) throws WiringException;
 
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Component.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Component.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Component.java Wed Apr  4 22:47:55 2007
@@ -21,11 +21,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.osoa.sca.ComponentContext;
-
-import org.apache.tuscany.spi.model.PropertyValue;
-import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.wire.Wire;
+import org.osoa.sca.ComponentContext;
 
 /**
  * The runtime instantiation of an SCA component
@@ -54,14 +53,14 @@
      *
      * @return default property values associated with the component.
      */
-    Map<String, PropertyValue<?>> getDefaultPropertyValues();
+    Map<String, Property> getDefaultPropertyValues();
 
     /**
      * Sets the default property values associated with the component.
      *
      * @param defaultPropertyValues Default property values associated with the component.
      */
-    void setDefaultPropertyValues(Map<String, PropertyValue<?>> defaultPropertyValues);
+    void setDefaultPropertyValues(Map<String, Property> defaultPropertyValues);
 
     /**
      * Returns the ScopeContainer responsible for managing implementation instance or null if a ScopeContainer is not

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentException.java Wed Apr  4 22:47:55 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.spi.component;
 
-import org.apache.tuscany.api.TuscanyException;
+import org.apache.tuscany.spi.TuscanyException;
 
 /**
  * An checked exception encountered by an {@link org.apache.tuscany.spi.component.Component}

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentManager.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentManager.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ComponentManager.java Wed Apr  4 22:47:55 2007
@@ -21,8 +21,9 @@
 import java.net.URI;
 import java.util.List;
 
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.Contract;
 import org.apache.tuscany.spi.event.RuntimeEventListener;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
 
 /**
  * Responsible for tracking and managing the component tree for a runtime instance. The tree corresponds to components
@@ -58,7 +59,7 @@
      * @param instance the Object that will become the component's implementation
      * @throws RegistrationException
      */
-    <S, I extends S> void registerJavaObject(URI uri, JavaServiceContract<S> service, I instance)
+    <I> void registerJavaObject(URI uri, ComponentService service, I instance)
         throws RegistrationException;
 
     /**
@@ -70,7 +71,7 @@
      * @param instance the Object that will become the component's implementation
      * @throws RegistrationException
      */
-    <S, I extends S> void registerJavaObject(URI uri, List<JavaServiceContract<?>> services, I instance)
+    <I> void registerJavaObject(URI uri, List<ComponentService> services, I instance)
         throws RegistrationException;
 
     /**

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Invocable.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Invocable.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Invocable.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Invocable.java Wed Apr  4 22:47:55 2007
@@ -18,40 +18,25 @@
  */
 package org.apache.tuscany.spi.component;
 
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
+import org.apache.tuscany.idl.Operation;
 import org.apache.tuscany.spi.wire.TargetInvoker;
 
 /**
  * @version $Rev$ $Date$
- *
  */
-@Deprecated
 public interface Invocable extends SCAObject {
 
     /**
-     * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to a service offered this
-     * artifact
-     *
+     * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker}
+     * which dispatches to a service offered this artifact
+     * 
      * @param targetName the service name
-     * @param operation  the operation to invoke
+     * @param operation the operation to invoke
+     * @param isCallback To indicate if the operation if for callback
      * @return the target invoker
      * @throws TargetInvokerCreationException
      */
-    @Deprecated
-    TargetInvoker createTargetInvoker(String targetName, Operation operation) throws TargetInvokerCreationException;
-
-    /**
-     * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to a service offered this
-     * artifact
-     *
-     * @param targetName the service name
-     * @param operation  the operation to invoke
-     * @return the target invoker
-     * @throws TargetInvokerCreationException if an error is encountered creating the invoker
-     */
-    @Deprecated
-    TargetInvoker createTargetInvoker(String targetName, PhysicalOperationDefinition operation)
+    TargetInvoker createTargetInvoker(String targetName, Operation operation, boolean isCallback)
         throws TargetInvokerCreationException;
 
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Reference.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Reference.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Reference.java Wed Apr  4 22:47:55 2007
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.assembly.Contract;
 
 /**
  * The runtime instantiation of an SCA reference
@@ -35,7 +35,7 @@
      *
      * @return the contract for the reference.
      */
-    ServiceContract<?> getServiceContract();
+    Contract getServiceContract();
 
     /**
      * Returns the collection of bindings configured for the reference.

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java Wed Apr  4 22:47:55 2007
@@ -19,9 +19,10 @@
 package org.apache.tuscany.spi.component;
 
 import java.net.URI;
+
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.assembly.Contract;
 import org.apache.tuscany.spi.wire.Wire;
 
 /**
@@ -54,7 +55,7 @@
      *
      * @return the service contract for the binding
      */
-    ServiceContract<?> getBindingServiceContract();
+    Contract getBindingServiceContract();
 
     /**
      * Returns the target URI for the binding

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java Wed Apr  4 22:47:55 2007
@@ -21,8 +21,8 @@
 import java.net.URI;
 
 import org.apache.tuscany.spi.Lifecycle;
+import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.event.RuntimeEventListener;
-import org.apache.tuscany.spi.model.Scope;
 
 
 /**

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java Wed Apr  4 22:47:55 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.spi.component;
 
-import org.apache.tuscany.api.annotation.LogLevel;
+import org.apache.tuscany.spi.LogLevel;
 
 /**
  * Defines monitor events for scope containers

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java Wed Apr  4 22:47:55 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.spi.component;
 
-import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.Scope;
 
 /**
  * Manages {@link ScopeContainer}s in the runtime

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Service.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Service.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/Service.java Wed Apr  4 22:47:55 2007
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.assembly.Contract;
 
 /**
  * The runtime instantiation of an SCA service
@@ -35,7 +35,7 @@
      *
      * @return the contract for the service.
      */
-    ServiceContract<?> getServiceContract();
+    Contract getServiceContract();
 
     /**
      * Returns the collection of bindings configured for the service.

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ServiceBinding.java Wed Apr  4 22:47:55 2007
@@ -20,7 +20,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.assembly.Contract;
 import org.apache.tuscany.spi.wire.Wire;
 
 /**
@@ -43,7 +43,7 @@
      *
      * @return the ServiceContract for the binding
      */
-    ServiceContract<?> getBindingServiceContract();
+    Contract getBindingServiceContract();
 
     Wire getWire();
 

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java Wed Apr  4 22:47:55 2007
@@ -23,28 +23,27 @@
 import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.ComponentException;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Implementation;
 import org.apache.tuscany.spi.resolver.ResolutionException;
 
 /**
  * Interface that can be used to deploy SCA bundles to a runtime.
- *
+ * 
  * @version $Rev$ $Date$
  */
 public interface Deployer {
     /**
-     * Deploy a component as a child of the supplied parent. This operation creates a new component in the runtime to
-     * represent the supplied component definition. The type of component created will depend on the component
-     * definition implementation; for example, if the implementation of the component definition is a composite then
-     * typically a CompositeComponent would be returned.
-     *
-     * @param parent              the parent context
-     * @param componentDefinition the component definition as parsed from an assembly
+     * Deploy a component as a child of the supplied parent. This operation
+     * creates a new component in the runtime to represent the supplied
+     * component definition. The type of component created will depend on the
+     * component definition implementation; for example, if the implementation
+     * of the component definition is a composite then typically a
+     * CompositeComponent would be returned.
+     * 
+     * @param parent the parent context
+     * @param componentDefinition the component definition as parsed from an
+     *            assembly
      * @return the newly deployed component
      */
-    <I extends Implementation<?>> Collection<Component> deploy(Component parent,
-                                                   ComponentDefinition<I> componentDefinition)
-        throws LoaderException, BuilderException, ComponentException, ResolutionException;
+    Collection<Component> deploy(Component parent, org.apache.tuscany.assembly.Component componentDefinition)
+        throws BuilderException, ComponentException, ResolutionException;
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java Wed Apr  4 22:47:55 2007
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.spi.deployer;
 
-import org.apache.tuscany.api.TuscanyException;
-import org.apache.tuscany.api.annotation.LogLevel;
+import org.apache.tuscany.spi.LogLevel;
+import org.apache.tuscany.spi.TuscanyException;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java Wed Apr  4 22:47:55 2007
@@ -24,8 +24,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.osoa.sca.ComponentContext;
-
+import org.apache.tuscany.assembly.Property;
 import org.apache.tuscany.spi.component.AbstractSCAObject;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.DuplicateNameException;
@@ -34,7 +33,7 @@
 import org.apache.tuscany.spi.component.SCAObject;
 import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.Service;
-import org.apache.tuscany.spi.model.PropertyValue;
+import org.osoa.sca.ComponentContext;
 
 /**
  * @version Provides support for property accessors.
@@ -44,7 +43,7 @@
     protected final List<Reference> references = new ArrayList<Reference>();
     protected final Map<String, SCAObject> children = new ConcurrentHashMap<String, SCAObject>();
     protected ScopeContainer scopeContainer;
-    private Map<String, PropertyValue<?>> defaultPropertyValues;
+    private Map<String, Property> defaultPropertyValues;
 
     /**
      * Initializes component name and parent.
@@ -63,11 +62,11 @@
         this.scopeContainer = scopeContainer;
     }
 
-    public Map<String, PropertyValue<?>> getDefaultPropertyValues() {
+    public Map<String, Property> getDefaultPropertyValues() {
         return defaultPropertyValues;
     }
 
-    public void setDefaultPropertyValues(Map<String, PropertyValue<?>> defaultPropertyValues) {
+    public void setDefaultPropertyValues(Map<String, Property> defaultPropertyValues) {
         this.defaultPropertyValues = defaultPropertyValues;
     }
 

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Wed Apr  4 22:47:55 2007
@@ -23,12 +23,12 @@
 import org.apache.tuscany.spi.CoreRuntimeException;
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.ComponentException;
 import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.TargetResolutionException;
 import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.ProxyService;
 
 /**

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java Wed Apr  4 22:47:55 2007
@@ -18,19 +18,18 @@
  */
 package org.apache.tuscany.spi.extension;
 
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-
+import org.apache.tuscany.assembly.Binding;
+import org.apache.tuscany.assembly.CompositeReference;
+import org.apache.tuscany.assembly.CompositeService;
 import org.apache.tuscany.spi.builder.BindingBuilder;
 import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 import org.apache.tuscany.spi.component.ReferenceBinding;
 import org.apache.tuscany.spi.component.ServiceBinding;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.BindingDefinition;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
-import org.apache.tuscany.spi.model.ServiceDefinition;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
 
 /**
  * An extension point for binding builders. When adding support for new serviceBindings, implementations may extend this
@@ -39,7 +38,7 @@
  * @version $$Rev$$ $$Date$$
  */
 @EagerInit
-public abstract class BindingBuilderExtension<B extends BindingDefinition> implements BindingBuilder<B> {
+public abstract class BindingBuilderExtension<B extends Binding> implements BindingBuilder<B> {
     protected BuilderRegistry builderRegistry;
 
     @Reference
@@ -52,12 +51,12 @@
         builderRegistry.register(getBindingType(), this);
     }
 
-    public ServiceBinding build(ServiceDefinition serviceDefinition, B bindingDefinition, DeploymentContext context)
+    public ServiceBinding build(CompositeService serviceDefinition, B bindingDefinition, DeploymentContext context)
         throws BuilderException {
         return null;
     }
 
-    public ReferenceBinding build(ReferenceDefinition boundReferenceDefinition,
+    public ReferenceBinding build(CompositeReference boundReferenceDefinition,
                                   B bindingDefinition,
                                   DeploymentContext context) throws BuilderException {
         return null;

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java Wed Apr  4 22:47:55 2007
@@ -18,17 +18,15 @@
  */
 package org.apache.tuscany.spi.extension;
 
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-
+import org.apache.tuscany.assembly.Implementation;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 import org.apache.tuscany.spi.builder.ComponentBuilder;
 import org.apache.tuscany.spi.component.ScopeRegistry;
 import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
 import org.apache.tuscany.spi.wire.ProxyService;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
 
 /**
  * An extension point for component builders. When adding support for new component types, implementations may extend
@@ -37,12 +35,11 @@
  * @version $$Rev$$ $$Date$$
  */
 @EagerInit
-public abstract class ComponentBuilderExtension<I extends Implementation<?>> implements ComponentBuilder<I> {
+public abstract class ComponentBuilderExtension<I extends Implementation> implements ComponentBuilder {
     protected BuilderRegistry builderRegistry;
     protected ScopeRegistry scopeRegistry;
     protected ProxyService proxyService;
     protected WorkContext workContext;
-    protected PolicyBuilderRegistry policyBuilderRegistry;
 
     @Reference
     public void setBuilderRegistry(BuilderRegistry registry) {
@@ -62,11 +59,6 @@
     @Reference
     public void setWorkContext(WorkContext workContext) {
         this.workContext = workContext;
-    }
-
-    @Reference
-    public void setPolicyBuilderRegistry(PolicyBuilderRegistry registry) {
-        policyBuilderRegistry = registry;
     }
 
     @Init

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Wed Apr  4 22:47:55 2007
@@ -20,6 +20,8 @@
 
 import java.net.URI;
 
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.spi.Scope;
 import org.apache.tuscany.spi.component.Reference;
 import org.apache.tuscany.spi.component.ReferenceBinding;
 import org.apache.tuscany.spi.component.Service;
@@ -27,9 +29,6 @@
 import org.apache.tuscany.spi.component.TargetInvokerCreationException;
 import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.spi.event.RuntimeEventListener;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
 import org.apache.tuscany.spi.wire.TargetInvoker;
 
 /**
@@ -51,7 +50,7 @@
         publish(event);
     }
 
-    public TargetInvoker createTargetInvoker(String name, Operation operation)
+    public TargetInvoker createTargetInvoker(String name, Operation operation, boolean isCallback)
         throws TargetInvokerCreationException {
         Service service = getService(name);
         if (service != null) {
@@ -61,7 +60,7 @@
                 throw new AssertionError();
             }
             ServiceBinding binding = service.getServiceBindings().get(0);
-            return binding.createTargetInvoker(name, operation);
+            return binding.createTargetInvoker(name, operation, false);
         }
         Reference reference = getReference(name);
         if (reference != null) {
@@ -71,32 +70,7 @@
                 throw new AssertionError();
             }
             ReferenceBinding binding = reference.getReferenceBindings().get(0);
-            binding.createTargetInvoker(name, operation);
-        }
-        return null;
-    }
-
-    public TargetInvoker createTargetInvoker(String name, PhysicalOperationDefinition operation)
-        throws TargetInvokerCreationException {
-        Service service = getService(name);
-        if (service != null) {
-            if (service.getServiceBindings().isEmpty()) {
-                // for now, throw an assertion exception.
-                // We will need to choose bindings during allocation
-                throw new AssertionError();
-            }
-            ServiceBinding binding = service.getServiceBindings().get(0);
-            return binding.createTargetInvoker(name, operation);
-        }
-        Reference reference = getReference(name);
-        if (reference != null) {
-            if (reference.getReferenceBindings().isEmpty()) {
-                // for now, throw an assertion exception.
-                // We will need to choose bindings during allocation
-                throw new AssertionError();
-            }
-            ReferenceBinding binding = reference.getReferenceBindings().get(0);
-            binding.createTargetInvoker(name, operation);
+            binding.createTargetInvoker(name, operation, false);
         }
         return null;
     }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java Wed Apr  4 22:47:55 2007
@@ -20,9 +20,9 @@
 
 import java.net.URI;
 
+import org.apache.tuscany.assembly.Contract;
 import org.apache.tuscany.spi.component.AbstractSCAObject;
 import org.apache.tuscany.spi.component.ReferenceBinding;
-import org.apache.tuscany.spi.model.ServiceContract;
 import org.apache.tuscany.spi.wire.Wire;
 
 /**
@@ -33,7 +33,7 @@
  */
 public abstract class ReferenceBindingExtension extends AbstractSCAObject implements ReferenceBinding {
     protected Wire wire;
-    protected ServiceContract<?> bindingServiceContract;
+    protected Contract bindingServiceContract;
     protected URI targetUri;
 
     protected ReferenceBindingExtension(URI name, URI targetUri) {
@@ -41,7 +41,7 @@
         this.targetUri = targetUri;
     }
 
-    public ServiceContract<?> getBindingServiceContract() {
+    public Contract getBindingServiceContract() {
         return bindingServiceContract;
     }
 

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ServiceBindingExtension.java Wed Apr  4 22:47:55 2007
@@ -20,12 +20,12 @@
 
 import java.net.URI;
 
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.idl.Operation;
 import org.apache.tuscany.spi.CoreRuntimeException;
 import org.apache.tuscany.spi.component.AbstractSCAObject;
 import org.apache.tuscany.spi.component.ServiceBinding;
 import org.apache.tuscany.spi.component.TargetInvokerCreationException;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.ServiceContract;
 import org.apache.tuscany.spi.wire.TargetInvoker;
 import org.apache.tuscany.spi.wire.Wire;
 
@@ -36,19 +36,19 @@
  * @Deprecated
  */
 public abstract class ServiceBindingExtension extends AbstractSCAObject implements ServiceBinding {
-    protected ServiceContract<?> bindingServiceContract;
+    protected Contract bindingServiceContract;
     protected Wire wire;
 
     public ServiceBindingExtension(URI name) throws CoreRuntimeException {
         super(name);
     }
 
-    public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation)
+    public TargetInvoker createTargetInvoker(Contract contract, Operation operation)
         throws TargetInvokerCreationException {
         throw new UnsupportedOperationException();
     }
 
-    public ServiceContract<?> getBindingServiceContract() {
+    public Contract getBindingServiceContract() {
         return bindingServiceContract;
     }
 

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/host/ResourceResolutionException.java Wed Apr  4 22:47:55 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.spi.host;
 
-import org.apache.tuscany.api.TuscanyException;
+import org.apache.tuscany.spi.TuscanyException;
 
 /**
  * @version $Rev$ $Date$

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolutionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolutionException.java?view=diff&rev=525710&r1=525694&r2=525710
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolutionException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/resolver/ResolutionException.java Wed Apr  4 22:47:55 2007
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.spi.resolver;
 
-import org.apache.tuscany.api.TuscanyException;
+import org.apache.tuscany.spi.TuscanyException;
 
 /**
  * Denotes an error during the resolve phase as an assembly is evaluated



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

Integrated core-spi and host-spi in the build, was svn commit: r525710 [1/2] - in /incubator/tuscany/java/sca/modules/core-spi

[Jean-Sebastien Delfino <js...@apache.org>]

rfeng@apache.org wrote:
> Author: rfeng
> Date: Wed Apr  4 22:47:55 2007
> New Revision: 525710
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=525710
> Log:
> Port the core SPIs to use the new assembly model
>
>   

I integrated your new core-spi and host-spi in the build under 
tuscany/java/sca/modules.

-- 
Jean-Sebastien


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