Remove SCA prefix from Defintions model

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

2 files changed, 11 insertions, 11 deletions

diff --git a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java b/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
index eae1016777..faf0bd53fd 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
+++ b/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
@@ -29,25 +29,25 @@ import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.provider.DefinitionsProvider;
+import org.apache.tuscany.sca.provider.DefinitionsProviderException;
 
 /**
  * Provider for Policy Intents and PolicySet definitions related to security
  *
  * @version $Rev$ $Date$
  */
-public class SCABindingDefinitionsProvider implements SCADefinitionsProvider {
+public class SCABindingDefinitionsProvider implements DefinitionsProvider {
     private String definitionsFile = "org/apache/tuscany/sca/binding/sca/definitions.xml";
     URLArtifactProcessor urlArtifactProcessor = null;
     
     public SCABindingDefinitionsProvider(ExtensionPointRegistry registry) {
         URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
+        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(Definitions.class);
     }
 
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
+    public Definitions getDefinitions() throws DefinitionsProviderException {
         // Allow privileged access to load resource. Requires RuntimePermssion in security policy.
         final URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
             public URL run() {
@@ -55,17 +55,17 @@ public class SCABindingDefinitionsProvider implements SCADefinitionsProvider {
             }
         });
 
-        SCADefinitions scaDefn = null;
+        Definitions scaDefn = null;
         try {
             final URI uri = new URI(definitionsFile);
             // Allow bindings to read properties. Requires PropertyPermission read in security policy. 
-            scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<SCADefinitions>() {
-                public SCADefinitions run() throws ContributionReadException {
-                    return (SCADefinitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
+            scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<Definitions>() {
+                public Definitions run() throws ContributionReadException {
+                    return (Definitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
                 }
             });
         } catch (Exception e) {
-            throw new SCADefinitionsProviderException(e);
+            throw new DefinitionsProviderException(e);
         }
         return scaDefn;
     }
diff --git a/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index 22c9a64b05..22c9a64b05 100644
--- a/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider