Author: rfeng
Date: Mon Mar 17 13:21:59 2008
New Revision: 638055
URL: http://svn.apache.org/viewvc?rev=638055&view=rev
Log:
Minor cleanup: remove unused imports and change the way of discovering resource
files
Modified:
incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
Modified:
incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java?rev=638055&r1=638054&r2=638055&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
Mon Mar 17 13:21:59 2008
@@ -22,7 +22,6 @@
import java.net.URI;
import java.net.URL;
-import
org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -32,45 +31,37 @@
import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
/**
- * Provider for Policy Intents and PolicySet definitions related to security
+ * Provider for Policy Intents and PolicySet definitions related to transaction
*/
public class TransactionPolicyDefinitionsProvider implements
SCADefinitionsProvider {
- private String scaDefinitionsFile =
"org/apache/tuscany/sca/policy/transaction/definitions.xml";
- private String tuscanyDefinitionsFile =
"org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml";
- URLArtifactProcessor urlArtifactProcessor = null;
-
+ private final static String scaDefinitionsFile = "definitions.xml";
+ private final static String tuscanyDefinitionsFile =
"tuscany_definitions.xml";
+ private URLArtifactProcessor urlArtifactProcessor;
+
public TransactionPolicyDefinitionsProvider(ExtensionPointRegistry
registry) {
- URLArtifactProcessorExtensionPoint documentProcessors =
registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
+ URLArtifactProcessorExtensionPoint documentProcessors =
+
registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
urlArtifactProcessor =
(URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
}
public SCADefinitions getSCADefinition() throws
SCADefinitionsProviderException {
-
- Object scaDefn = null;
+
try {
SCADefinitions scaTransactionPolicyDefns = null;
SCADefinitions tuscanyTransactionPolicyDefns = null;
-
+
URI uri = new URI(scaDefinitionsFile);
- URL defintionsFileUrl =
getClass().getClassLoader().getResource(scaDefinitionsFile);
- scaTransactionPolicyDefns =
(SCADefinitions)urlArtifactProcessor.read(null,
-
uri,
-
defintionsFileUrl);
-
+ URL defintionsFileUrl = getClass().getResource(scaDefinitionsFile);
+ scaTransactionPolicyDefns =
(SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
+
uri = new URI(tuscanyDefinitionsFile);
- defintionsFileUrl =
getClass().getClassLoader().getResource(tuscanyDefinitionsFile);
- tuscanyTransactionPolicyDefns =
(SCADefinitions)urlArtifactProcessor.read(null,
-
uri,
-
defintionsFileUrl);
-
-
-
SCADefinitionsUtil.aggregateSCADefinitions(tuscanyTransactionPolicyDefns,
-
scaTransactionPolicyDefns);
-
-
-
+ defintionsFileUrl = getClass().getResource(tuscanyDefinitionsFile);
+ tuscanyTransactionPolicyDefns =
(SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
+
+
SCADefinitionsUtil.aggregateSCADefinitions(tuscanyTransactionPolicyDefns,
scaTransactionPolicyDefns);
+
return scaTransactionPolicyDefns;
- } catch ( Exception e ) {
+ } catch (Exception e) {
throw new SCADefinitionsProviderException(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
