You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/05/12 13:03:07 UTC
svn commit: r537384 [2/5] - in /incubator/tuscany/java/sca:
itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/
modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/dsl/impl/
modules/assembly-xml/src/main/java/org/...
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentReference.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentService.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ComponentType.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/CompositeReference.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/CompositeService.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
/**
* Represents a composite service.
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/ConstrainingType.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Contract.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/DefaultAssemblyFactory.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/DefaultAssemblyFactory.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/DefaultAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java Sat May 12 04:02:56 2007
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
-import org.apache.tuscany.assembly.impl.AssemblyFactoryImpl;
+import org.apache.tuscany.sca.assembly.impl.AssemblyFactoryImpl;
/**
* A factory for the assembly model.
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Implementation.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
/**
* Represents a component implementation.
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Multiplicity.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
/**
* Enumeration for multiplicity. Defines the number of wires that can connect a
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Property.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Property.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Property.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import org.apache.tuscany.policy.PolicySetAttachPoint;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Reference.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Reference.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Reference.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
/**
* Represents an SCA binding.
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Service.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Service.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Service.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
/**
* Represents a service. Services are used to publish services provided by
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Visitable.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Visitable.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Visitable.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
/**
* This interface is implemented by object that can accept a visitor.
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Visitor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Visitor.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Visitor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
/**
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import org.apache.tuscany.policy.IntentAttachPoint;
import org.apache.tuscany.policy.PolicySetAttachPoint;
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java Sat May 12 04:02:56 2007
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.tuscany.assembly.builder;
+package org.apache.tuscany.sca.assembly.builder;
-import org.apache.tuscany.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Composite;
/**
* A builder that handles the configuration of the components inside a
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilderException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilderException.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilderException.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java Sat May 12 04:02:56 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.assembly.builder;
+package org.apache.tuscany.sca.assembly.builder;
/**
* Reports a composite builder exception.
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilderMonitor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilderMonitor.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilderMonitor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java Sat May 12 04:02:56 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.assembly.builder;
+package org.apache.tuscany.sca.assembly.builder;
/**
* A monitor for the composite builder.
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/Problem.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/Problem.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/builder/Problem.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java Sat May 12 04:02:56 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.assembly.builder;
+package org.apache.tuscany.sca.assembly.builder;
/**
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java Sat May 12 04:02:56 2007
@@ -16,35 +16,35 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.builder.impl;
+package org.apache.tuscany.sca.assembly.builder.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.Binding;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentProperty;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
-import org.apache.tuscany.assembly.Composite;
-import org.apache.tuscany.assembly.CompositeReference;
-import org.apache.tuscany.assembly.CompositeService;
-import org.apache.tuscany.assembly.Implementation;
-import org.apache.tuscany.assembly.Multiplicity;
-import org.apache.tuscany.assembly.Property;
-import org.apache.tuscany.assembly.Reference;
-import org.apache.tuscany.assembly.SCABinding;
-import org.apache.tuscany.assembly.Service;
-import org.apache.tuscany.assembly.Wire;
-import org.apache.tuscany.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.assembly.builder.CompositeBuilderMonitor;
-import org.apache.tuscany.assembly.builder.Problem;
-import org.apache.tuscany.assembly.builder.Problem.Severity;
import org.apache.tuscany.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentProperty;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.CompositeReference;
+import org.apache.tuscany.sca.assembly.CompositeService;
+import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.Multiplicity;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.SCABinding;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.Wire;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderMonitor;
+import org.apache.tuscany.sca.assembly.builder.Problem;
+import org.apache.tuscany.sca.assembly.builder.Problem.Severity;
/**
* A builder that handles the configuration of the components inside a
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java Sat May 12 04:02:56 2007
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.tuscany.assembly.builder.impl;
+package org.apache.tuscany.sca.assembly.builder.impl;
-import org.apache.tuscany.assembly.builder.Problem;
+import org.apache.tuscany.sca.assembly.builder.Problem;
/**
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.builder.impl;
+package org.apache.tuscany.sca.assembly.builder.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -41,10 +41,10 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentProperty;
-import org.apache.tuscany.assembly.Property;
-import org.apache.tuscany.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentProperty;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java Sat May 12 04:02:56 2007
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.builder.impl;
+package org.apache.tuscany.sca.assembly.builder.impl;
import java.util.List;
-import org.apache.tuscany.assembly.Multiplicity;
+import org.apache.tuscany.sca.assembly.Multiplicity;
/**
* This class encapsulates utility methods to deal with reference definitions
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java Sat May 12 04:02:56 2007
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.tuscany.assembly.AbstractProperty;
import org.apache.tuscany.policy.Intent;
+import org.apache.tuscany.sca.assembly.AbstractProperty;
/**
* Represents an abstract property.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java Sat May 12 04:02:56 2007
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
-import org.apache.tuscany.assembly.AbstractReference;
-import org.apache.tuscany.assembly.Multiplicity;
+import org.apache.tuscany.sca.assembly.AbstractReference;
+import org.apache.tuscany.sca.assembly.Multiplicity;
/**
* Represents an abstract reference
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java Sat May 12 04:02:56 2007
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
-import org.apache.tuscany.assembly.AbstractService;
+import org.apache.tuscany.sca.assembly.AbstractService;
/**
* Represents an abstract service
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java Sat May 12 04:02:56 2007
@@ -17,29 +17,29 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
-import org.apache.tuscany.assembly.AbstractProperty;
-import org.apache.tuscany.assembly.AbstractReference;
-import org.apache.tuscany.assembly.AbstractService;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.Callback;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentProperty;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
-import org.apache.tuscany.assembly.ComponentType;
-import org.apache.tuscany.assembly.Composite;
-import org.apache.tuscany.assembly.CompositeReference;
-import org.apache.tuscany.assembly.CompositeService;
-import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.assembly.Property;
-import org.apache.tuscany.assembly.Reference;
-import org.apache.tuscany.assembly.SCABinding;
-import org.apache.tuscany.assembly.Service;
-import org.apache.tuscany.assembly.Wire;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
+import org.apache.tuscany.sca.assembly.AbstractProperty;
+import org.apache.tuscany.sca.assembly.AbstractReference;
+import org.apache.tuscany.sca.assembly.AbstractService;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Callback;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentProperty;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.CompositeReference;
+import org.apache.tuscany.sca.assembly.CompositeService;
+import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.SCABinding;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.Wire;
/**
* A factory for the assembly model.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java Sat May 12 04:02:56 2007
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.Base;
-import org.apache.tuscany.assembly.Visitable;
-import org.apache.tuscany.assembly.Visitor;
+import org.apache.tuscany.sca.assembly.Base;
+import org.apache.tuscany.sca.assembly.Visitable;
+import org.apache.tuscany.sca.assembly.Visitor;
/**
* Convenience base class for assembly model objects.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java Sat May 12 04:02:56 2007
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.Binding;
-import org.apache.tuscany.assembly.Callback;
-import org.apache.tuscany.assembly.Visitor;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Callback;
+import org.apache.tuscany.sca.assembly.Visitor;
/**
* Represents a reference.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java Sat May 12 04:02:56 2007
@@ -16,20 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.ComponentProperty;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
-import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.assembly.Implementation;
-import org.apache.tuscany.assembly.Visitor;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentProperty;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.Visitor;
/**
* Represents a component.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java Sat May 12 04:02:56 2007
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
-import org.apache.tuscany.assembly.ComponentProperty;
-import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.sca.assembly.ComponentProperty;
+import org.apache.tuscany.sca.assembly.Property;
/**
* Represents a component property.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java Sat May 12 04:02:56 2007
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.CompositeReference;
-import org.apache.tuscany.assembly.Reference;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.CompositeReference;
+import org.apache.tuscany.sca.assembly.Reference;
/**
* Represents a component reference
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java Sat May 12 04:02:56 2007
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.ComponentService;
-import org.apache.tuscany.assembly.CompositeService;
-import org.apache.tuscany.assembly.Service;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.CompositeService;
+import org.apache.tuscany.sca.assembly.Service;
/**
* Represents a component service
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java Sat May 12 04:02:56 2007
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.ComponentType;
-import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.assembly.Property;
-import org.apache.tuscany.assembly.Reference;
-import org.apache.tuscany.assembly.Service;
-import org.apache.tuscany.assembly.Visitor;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.Visitor;
/**
* Represents a component type.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java Sat May 12 04:02:56 2007
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.Composite;
-import org.apache.tuscany.assembly.Visitor;
-import org.apache.tuscany.assembly.Wire;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Visitor;
+import org.apache.tuscany.sca.assembly.Wire;
public class CompositeImpl extends ComponentTypeImpl implements Composite, Cloneable {
private List<Component> components = new ArrayList<Component>();
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java Sat May 12 04:02:56 2007
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.CompositeReference;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.CompositeReference;
/**
* Represents a composite reference.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java Sat May 12 04:02:56 2007
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
-import org.apache.tuscany.assembly.ComponentService;
-import org.apache.tuscany.assembly.CompositeService;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.CompositeService;
/**
* Represents a composite service
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java Sat May 12 04:02:56 2007
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.tuscany.assembly.AbstractProperty;
-import org.apache.tuscany.assembly.AbstractReference;
-import org.apache.tuscany.assembly.AbstractService;
-import org.apache.tuscany.assembly.ConstrainingType;
-import org.apache.tuscany.assembly.Visitor;
import org.apache.tuscany.policy.Intent;
+import org.apache.tuscany.sca.assembly.AbstractProperty;
+import org.apache.tuscany.sca.assembly.AbstractReference;
+import org.apache.tuscany.sca.assembly.AbstractService;
+import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Visitor;
/**
* Represents a constraining type.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java Sat May 12 04:02:56 2007
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.AbstractContract;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.policy.Intent;
+import org.apache.tuscany.sca.assembly.AbstractContract;
public class ContractImpl extends BaseImpl implements AbstractContract {
private InterfaceContract interfaceContract;
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java Sat May 12 04:02:56 2007
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.Property;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.Property;
/**
* Represents a property.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java Sat May 12 04:02:56 2007
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.Binding;
-import org.apache.tuscany.assembly.Callback;
-import org.apache.tuscany.assembly.ComponentService;
-import org.apache.tuscany.assembly.Reference;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Callback;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.Reference;
/**
* Represents a reference.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java Sat May 12 04:02:56 2007
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.SCABinding;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.SCABinding;
/**
* Represents an SCA binding.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java Sat May 12 04:02:56 2007
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.Binding;
-import org.apache.tuscany.assembly.Callback;
-import org.apache.tuscany.assembly.Service;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Callback;
+import org.apache.tuscany.sca.assembly.Service;
/**
* Represents a reference.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java Sat May 12 04:02:56 2007
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.impl;
+package org.apache.tuscany.sca.assembly.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.ComponentReference;
-import org.apache.tuscany.assembly.ComponentService;
-import org.apache.tuscany.assembly.Wire;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.Wire;
/**
* Represents a wire
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly.util;
+package org.apache.tuscany.sca.assembly.util;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
Copied: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/AssemblyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java Sat May 12 04:02:56 2007
@@ -16,9 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.AbstractProperty;
+import org.apache.tuscany.sca.assembly.AbstractReference;
+import org.apache.tuscany.sca.assembly.AbstractService;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentProperty;
+import org.apache.tuscany.sca.assembly.ComponentReference;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.CompositeReference;
+import org.apache.tuscany.sca.assembly.CompositeService;
+import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
+import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.Multiplicity;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.Wire;
import junit.framework.TestCase;
Copied: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestBinding.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestBinding.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java Sat May 12 04:02:56 2007
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import java.util.List;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Binding;
/**
* A test interface model.
Copied: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java Sat May 12 04:02:56 2007
@@ -16,11 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import javax.xml.namespace.QName;
-import org.apache.tuscany.assembly.impl.ComponentTypeImpl;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.Multiplicity;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.impl.ComponentTypeImpl;
/**
* A test component implementation model.
Copied: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterface.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java Sat May 12 04:02:56 2007
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import org.apache.tuscany.interfacedef.Interface;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.InterfaceImpl;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
/**
* A test interface model.
Copied: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterfaceContract.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterfaceContract.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestInterfaceContract.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java Sat May 12 04:02:56 2007
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.impl.InterfaceContractImpl;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
/**
* A test interface contract model.
Copied: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java (from r537379, incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java?view=diff&rev=537384&p1=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java&r1=537379&p2=incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/assembly/TestOperation.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.assembly;
+package org.apache.tuscany.sca.assembly;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.interfacedef.impl.OperationImpl;
Modified: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java?view=diff&rev=537384&r1=537379&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java Sat May 12 04:02:56 2007
@@ -17,19 +17,20 @@
* under the License.
*/
-package org.apache.tuscany.assembly.builder.impl;
+package org.apache.tuscany.sca.assembly.builder.impl;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.Component;
-import org.apache.tuscany.assembly.Composite;
-import org.apache.tuscany.assembly.CompositeReference;
-import org.apache.tuscany.assembly.CompositeService;
-import org.apache.tuscany.assembly.DefaultAssemblyFactory;
import org.apache.tuscany.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.CompositeReference;
+import org.apache.tuscany.sca.assembly.CompositeService;
+import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
+import org.apache.tuscany.sca.assembly.builder.impl.DefaultCompositeBuilder;
public class CompositeBuilderTestCase extends TestCase {
Modified: incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java Sat May 12 04:02:56 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.binding.jsonrpc;
-import org.apache.tuscany.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Binding;
/**
* A model for the sample JSONRPC binding.
Modified: incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java Sat May 12 04:02:56 2007
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.sca.binding.rmi;
-import org.apache.tuscany.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Binding;
/**
* Represents a binding to an RMI service.
Modified: incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIModuleActivator.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIModuleActivator.java Sat May 12 04:02:56 2007
@@ -21,12 +21,12 @@
import java.util.Map;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.DefaultAssemblyFactory;
import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.policy.DefaultPolicyFactory;
import org.apache.tuscany.policy.PolicyFactory;
import org.apache.tuscany.rmi.RMIHost;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
import org.apache.tuscany.sca.binding.rmi.xml.RMIBindingProcessor;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.ModuleActivator;
Modified: incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/xml/RMIBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/xml/RMIBindingProcessor.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/xml/RMIBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/xml/RMIBindingProcessor.java Sat May 12 04:02:56 2007
@@ -26,13 +26,13 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.assembly.AssemblyFactory;
import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ModelResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
import org.apache.tuscany.contribution.service.ContributionWriteException;
import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.xml.BaseArtifactProcessor;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.binding.rmi.RMIBinding;
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ModuleActivator.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ModuleActivator.java Sat May 12 04:02:56 2007
@@ -21,8 +21,6 @@
import java.util.Map;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.DefaultAssemblyFactory;
import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.interfacedef.wsdl.DefaultWSDLFactory;
import org.apache.tuscany.interfacedef.wsdl.WSDLFactory;
@@ -30,6 +28,8 @@
import org.apache.tuscany.interfacedef.wsdl.introspect.WSDLInterfaceIntrospector;
import org.apache.tuscany.policy.DefaultPolicyFactory;
import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
import org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java Sat May 12 04:02:56 2007
@@ -32,7 +32,6 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.assembly.AssemblyFactory;
import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ModelResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
@@ -45,6 +44,7 @@
import org.apache.tuscany.interfacedef.wsdl.WSDLInterfaceContract;
import org.apache.tuscany.interfacedef.wsdl.introspect.WSDLInterfaceIntrospector;
import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.xml.BaseArtifactProcessor;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java Sat May 12 04:02:56 2007
@@ -27,11 +27,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.ComponentType;
-import org.apache.tuscany.assembly.Composite;
-import org.apache.tuscany.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.assembly.builder.impl.DefaultCompositeBuilder;
import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.interfacedef.InterfaceContractMapper;
@@ -42,6 +37,11 @@
import org.apache.tuscany.interfacedef.wsdl.introspect.WSDLInterfaceIntrospector;
import org.apache.tuscany.policy.DefaultPolicyFactory;
import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
+import org.apache.tuscany.sca.assembly.builder.impl.DefaultCompositeBuilder;
import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java Sat May 12 04:02:56 2007
@@ -27,10 +27,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.ComponentType;
-import org.apache.tuscany.assembly.Composite;
-import org.apache.tuscany.assembly.DefaultAssemblyFactory;
import org.apache.tuscany.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.interfacedef.InterfaceContractMapper;
@@ -41,6 +37,10 @@
import org.apache.tuscany.interfacedef.wsdl.introspect.WSDLInterfaceIntrospector;
import org.apache.tuscany.policy.DefaultPolicyFactory;
import org.apache.tuscany.policy.PolicyFactory;
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;
Modified: incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java Sat May 12 04:02:56 2007
@@ -22,9 +22,9 @@
import javax.wsdl.Service;
import javax.xml.namespace.QName;
-import org.apache.tuscany.assembly.Binding;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.wsdl.WSDLDefinition;
+import org.apache.tuscany.sca.assembly.Binding;
/**
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java?view=diff&rev=537384&r1=537383&r2=537384
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/contribution/impl/ContributionImpl.java Sat May 12 04:02:56 2007
@@ -22,12 +22,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.contribution.Contribution;
import org.apache.tuscany.contribution.ContributionExport;
import org.apache.tuscany.contribution.ContributionImport;
import org.apache.tuscany.contribution.DeployedArtifact;
import org.apache.tuscany.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.assembly.Composite;
/**
* The representation of a deployed contribution
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org