diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-14 22:06:31 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-14 22:06:31 +0000 |
commit | 69f2050e34ee05b93e3141cb7b13ab0e072bc340 (patch) | |
tree | 1b64cbcda872510d70a55432f0de2ab5a49c45fb /branches/sca-equinox/modules/binding-ws-axis2 | |
parent | 2f93b179e29713d30ad55608e605f5cddf150691 (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 '')
-rw-r--r-- | branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java | 22 | ||||
-rw-r--r-- | branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider (renamed from branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider) | 0 |
2 files changed, 11 insertions, 11 deletions
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java index 7e95313011..34f752e229 100644 --- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java +++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java @@ -28,37 +28,37 @@ 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 WSBindingDefinitionsProvider implements SCADefinitionsProvider { +public class WSBindingDefinitionsProvider implements DefinitionsProvider { private String definitionsFile = "org/apache/tuscany/sca/binding/ws/axis2/definitions.xml"; URLArtifactProcessor urlArtifactProcessor = null; public WSBindingDefinitionsProvider(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 { final URL definitionsFileUrl = getClass().getClassLoader().getResource(definitionsFile); - 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-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider index 370b83f87b..370b83f87b 100644 --- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider +++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider |