summaryrefslogtreecommitdiffstats
path: root/branches/sca-equinox/modules/core-spi/src
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-10-14 22:06:31 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-10-14 22:06:31 +0000
commit69f2050e34ee05b93e3141cb7b13ab0e072bc340 (patch)
tree1b64cbcda872510d70a55432f0de2ab5a49c45fb /branches/sca-equinox/modules/core-spi/src
parent2f93b179e29713d30ad55608e605f5cddf150691 (diff)
Remove SCA prefix from Defintions model
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@704715 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-equinox/modules/core-spi/src')
-rw-r--r--branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java (renamed from branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java)22
-rw-r--r--branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java (renamed from branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java)6
-rw-r--r--branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java (renamed from branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java)4
-rw-r--r--branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java (renamed from branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java)8
-rw-r--r--branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint (renamed from branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint)2
5 files changed, 21 insertions, 21 deletions
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
index 3e1f1a10c5..8b7902bec8 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
@@ -33,26 +33,26 @@ import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
*
* @version $Rev$ $Date$
*/
-public class DefaultSCADefinitionsProviderExtensionPoint implements
- SCADefinitionsProviderExtensionPoint {
+public class DefaultDefinitionsProviderExtensionPoint implements
+ DefinitionsProviderExtensionPoint {
private ExtensionPointRegistry extensionPointRegistry = null;
- private List<SCADefinitionsProvider> scaDefnsProviders = new ArrayList<SCADefinitionsProvider>();
+ private List<DefinitionsProvider> scaDefnsProviders = new ArrayList<DefinitionsProvider>();
- public DefaultSCADefinitionsProviderExtensionPoint(ExtensionPointRegistry extnPtReg) {
+ public DefaultDefinitionsProviderExtensionPoint(ExtensionPointRegistry extnPtReg) {
this.extensionPointRegistry = extnPtReg;
}
- public void addSCADefinitionsProvider(SCADefinitionsProvider provider) {
+ public void addDefinitionsProvider(DefinitionsProvider provider) {
scaDefnsProviders.add(provider);
}
- public void removeSCADefinitionsProvider(SCADefinitionsProvider provider) {
+ public void removeDefinitionsProvider(DefinitionsProvider provider) {
scaDefnsProviders.remove(provider);
}
- public List<SCADefinitionsProvider> getSCADefinitionsProviders() {
+ public List<DefinitionsProvider> getDefinitionsProviders() {
if (scaDefnsProviders.isEmpty()) {
loadProviders();
}
@@ -62,23 +62,23 @@ public class DefaultSCADefinitionsProviderExtensionPoint implements
private void loadProviders() {
// Get the provider service declarations
Set<ServiceDeclaration> defnProviderDecls;
- SCADefinitionsProvider aProvider = null;
+ DefinitionsProvider aProvider = null;
Class providerClass = null;
Constructor constructor = null;
try {
defnProviderDecls =
- ServiceDiscovery.getInstance().getServiceDeclarations(SCADefinitionsProvider.class.getName());
+ ServiceDiscovery.getInstance().getServiceDeclarations(DefinitionsProvider.class.getName());
for (ServiceDeclaration aDefnProviderDecl : defnProviderDecls) {
providerClass = aDefnProviderDecl.loadClass();
try {
constructor = providerClass.getConstructor();
- aProvider = (SCADefinitionsProvider)constructor.newInstance();
+ aProvider = (DefinitionsProvider)constructor.newInstance();
} catch (NoSuchMethodException e1) {
constructor = providerClass.getConstructor(ExtensionPointRegistry.class);
- aProvider = (SCADefinitionsProvider)constructor.newInstance(extensionPointRegistry);
+ aProvider = (DefinitionsProvider)constructor.newInstance(extensionPointRegistry);
}
scaDefnsProviders.add(aProvider);
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
index bd0f4d4b75..7871aea07c 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
+++ b/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.provider;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
/**
* Models a provider of SCA Definitions. Typically SCA Definitions providers
@@ -28,6 +28,6 @@ import org.apache.tuscany.sca.definitions.SCADefinitions;
*
* @version $Rev$ $Date$
*/
-public interface SCADefinitionsProvider {
- SCADefinitions getSCADefinition() throws SCADefinitionsProviderException ;
+public interface DefinitionsProvider {
+ Definitions getDefinitions() throws DefinitionsProviderException ;
}
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
index b05130d6c8..11464125ad 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
+++ b/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
@@ -22,9 +22,9 @@ package org.apache.tuscany.sca.provider;
/**
* @version $Rev$ $Date$
*/
-public class SCADefinitionsProviderException extends Exception {
+public class DefinitionsProviderException extends Exception {
- public SCADefinitionsProviderException(Throwable e) {
+ public DefinitionsProviderException(Throwable e) {
super(e);
}
}
diff --git a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
index a5d60cc6eb..61cfbe8536 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
+++ b/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
@@ -27,9 +27,9 @@ import java.util.List;
*
* @version $Rev$ $Date$
*/
-public interface SCADefinitionsProviderExtensionPoint {
+public interface DefinitionsProviderExtensionPoint {
- void addSCADefinitionsProvider(SCADefinitionsProvider provider);
- void removeSCADefinitionsProvider(SCADefinitionsProvider provider);
- List<SCADefinitionsProvider> getSCADefinitionsProviders();
+ void addDefinitionsProvider(DefinitionsProvider provider);
+ void removeDefinitionsProvider(DefinitionsProvider provider);
+ List<DefinitionsProvider> getDefinitionsProviders();
}
diff --git a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
index 2f700671ca..b7501e854e 100644
--- a/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
+++ b/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-org.apache.tuscany.sca.provider.DefaultSCADefinitionsProviderExtensionPoint
+org.apache.tuscany.sca.provider.DefaultDefinitionsProviderExtensionPoint
\ No newline at end of file