summaryrefslogtreecommitdiffstats
path: root/branches/sca-equinox/modules/policy-logging
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/policy-logging
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/policy-logging')
-rw-r--r--branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java16
-rw-r--r--branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider (renamed from branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider)0
2 files changed, 8 insertions, 8 deletions
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
index 4220caab80..836631541d 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
+++ b/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
@@ -27,25 +27,25 @@ import java.security.PrivilegedAction;
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 LoggingPolicyDefinitionsProvider implements SCADefinitionsProvider {
+public class LoggingPolicyDefinitionsProvider implements DefinitionsProvider {
private String definitionsFile = "org/apache/tuscany/sca/policy/logging/definitions.xml";
URLArtifactProcessor urlArtifactProcessor = null;
public LoggingPolicyDefinitionsProvider(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.
URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
public URL run() {
@@ -56,11 +56,11 @@ public class LoggingPolicyDefinitionsProvider implements SCADefinitionsProvider
Object scaDefn = null;
try {
URI uri = new URI(definitionsFile);
- return (SCADefinitions)urlArtifactProcessor.read(null,
+ return (Definitions)urlArtifactProcessor.read(null,
uri,
definitionsFileUrl);
} catch ( Exception e ) {
- throw new SCADefinitionsProviderException(e);
+ throw new DefinitionsProviderException(e);
}
}
diff --git a/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
index ec40cb7dc5..ec40cb7dc5 100644
--- a/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider