Remove SCA prefix from Defintions model

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@704715 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 6 insertions, 6 deletions

diff --git a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
index aebe4ff211..c9339c1545 100644
--- a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
+++ b/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
@@ -28,7 +28,7 @@ import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
 import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
@@ -113,7 +113,7 @@ public class CompositeBuilderNonWiringImpl implements CompositeBuilder {
         return "org.apache.tuscany.sca.assembly.builder.CompositeBuilderNonWiring";
     }
 
-    public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+    public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
 
         // Collect and fuse includes
         compositeIncludeBuilder.build(composite, definitions, monitor);
diff --git a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index b2e7dbb8c0..4b3485f088 100644
--- a/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
@@ -52,7 +52,7 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.ModuleActivator;

 import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;

 import org.apache.tuscany.sca.core.UtilityExtensionPoint;

-import org.apache.tuscany.sca.definitions.SCADefinitions;

+import org.apache.tuscany.sca.definitions.Definitions;

 import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;

 import org.apache.tuscany.sca.monitor.Monitor;

 import org.apache.tuscany.sca.monitor.MonitorFactory;

@@ -73,7 +73,7 @@ public class CustomCompositeBuilder {
     private ContributionBuilder contributionDependencyBuilder;

     private CompositeBuilder domainCompositeBuilder;

     private static Workspace workspace;

-    private List<SCADefinitions> policyDefinitions;

+    private List<Definitions> policyDefinitions;

     private Monitor monitor;

     private Composite domainComposite;

     private boolean nonWiring;

diff --git a/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
index e7305e671d..e6f3bce5df 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
@@ -51,7 +51,7 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.ModuleActivator;
 import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
 import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
 import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
 import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
@@ -77,7 +77,7 @@ public class CustomCompositeBuilder {
     private NodeImplementationFactory nodeFactory;
     //private AtomBindingFactory atomBindingFactory;
     private static Workspace workspace;
-    private List<SCADefinitions> policyDefinitions;
+    private List<Definitions> policyDefinitions;
     private Monitor monitor;
         
     private CustomCompositeBuilder() {