diff options
Diffstat (limited to 'branches/sca-equinox/modules/assembly-xml')
5 files changed, 21 insertions, 21 deletions
diff --git a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java index 09ef2e2c8b..57d2330210 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java +++ b/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java @@ -44,7 +44,7 @@ import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.definitions.SCADefinitions; +import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.util.PolicyComputationUtils; @@ -215,8 +215,8 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements } for ( Object object : scaDefnsSink ) { - if ( object instanceof SCADefinitions ) { - for ( PolicySet policySet : ((SCADefinitions)object).getPolicySets() ) { + if ( object instanceof Definitions ) { + for ( PolicySet policySet : ((Definitions)object).getPolicySets() ) { domainPolicySetMap.put( policySet.getName(), policySet); } } diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java index 51d83cbf15..0fc36e6cad 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java +++ b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java @@ -45,7 +45,7 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.definitions.SCADefinitions; +import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.monitor.DefaultMonitorFactory; import org.apache.tuscany.sca.monitor.Monitor; @@ -61,7 +61,7 @@ import org.junit.Test; */ public class BuildPolicyTestCase { private static URLArtifactProcessor<Object> documentProcessor; - private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor; + private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor; private static ModelResolver resolver; private static CompositeBuilder compositeBuilder; private static Composite composite; @@ -75,7 +75,7 @@ public class BuildPolicyTestCase { modelFactories.addFactory(scaBindingFactory); compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder"); - List<SCADefinitions> policyDefinitions = new ArrayList<SCADefinitions>(); + List<Definitions> policyDefinitions = new ArrayList<Definitions>(); resolver = new DefaultModelResolver(); MonitorFactory monitorFactory = new DefaultMonitorFactory(); @@ -86,7 +86,7 @@ public class BuildPolicyTestCase { URLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint(extensionPoints); documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null); - policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class); + policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class); StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); staxProcessors.addArtifactProcessor(new TestPolicyProcessor()); @@ -104,7 +104,7 @@ public class BuildPolicyTestCase { url = BuildPolicyTestCase.class.getResource("another_test_definitions.xml"); uri = URI.create("another_test_definitions.xml"); - SCADefinitions definitions = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url); + Definitions definitions = (Definitions)policyDefinitionsProcessor.read(null, uri, url); assertNotNull(definitions); policyDefinitions.add(definitions); diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java index cf8ef0cad9..cc5421cd84 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java +++ b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java @@ -37,7 +37,7 @@ import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensi import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.definitions.SCADefinitions; +import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.policy.PolicySetAttachPoint; import org.junit.BeforeClass; import org.junit.Test; @@ -51,7 +51,7 @@ public class ResolvePolicyTestCase { private static URLArtifactProcessor<Object> documentProcessor; private static ModelResolver resolver; - private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor; + private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor; @BeforeClass public static void setUp() throws Exception { @@ -60,7 +60,7 @@ public class ResolvePolicyTestCase { URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null); - policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class); + policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class); // Create StAX processors StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); @@ -83,7 +83,7 @@ public class ResolvePolicyTestCase { url = getClass().getResource("test_definitions.xml"); uri = URI.create("test_definitions.xml"); - SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url); + Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url); assertNotNull(scaDefns); preResolvePolicyTests(composite); diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java index f42d4195d5..ee281faa5d 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java +++ b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java @@ -44,7 +44,7 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.definitions.SCADefinitions; +import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.monitor.DefaultMonitorFactory; import org.apache.tuscany.sca.monitor.Monitor; @@ -62,7 +62,7 @@ public class WireTestCase { private static XMLInputFactory inputFactory; private static StAXArtifactProcessor<Object> staxProcessor; private static ModelResolver resolver; - private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor; + private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor; private static CompositeBuilder compositeBuilder; private static Monitor monitor; @@ -86,7 +86,7 @@ public class WireTestCase { InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class); URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class); + policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class); } @Test @@ -106,7 +106,7 @@ public class WireTestCase { URL url = getClass().getResource("test_definitions.xml"); URI uri = URI.create("test_definitions.xml"); - SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url); + Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url); assertNotNull(scaDefns); policyDefinitionsProcessor.resolve(scaDefns, resolver); @@ -134,7 +134,7 @@ public class WireTestCase { URL url = getClass().getResource("test_definitions.xml"); URI uri = URI.create("test_definitions.xml"); - SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url); + Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url); assertNotNull(scaDefns); policyDefinitionsProcessor.resolve(scaDefns, resolver); diff --git a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java index 2ae7eebbef..df760c1d1f 100644 --- a/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java +++ b/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java @@ -47,7 +47,7 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.definitions.SCADefinitions; +import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.monitor.DefaultMonitorFactory; import org.apache.tuscany.sca.monitor.Monitor; @@ -66,7 +66,7 @@ public class WriteAllTestCase { private static ExtensibleStAXArtifactProcessor staxProcessor; private static ModelResolver resolver; private static CompositeBuilder compositeBuilder; - private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor; + private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor; private static Monitor monitor; @BeforeClass @@ -90,7 +90,7 @@ public class WriteAllTestCase { monitor = monitorFactory.createMonitor(); URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class); + policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class); } @Test @@ -118,7 +118,7 @@ public class WriteAllTestCase { URL url = getClass().getResource("test_definitions.xml"); URI uri = URI.create("test_definitions.xml"); - SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url); + Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url); assertNotNull(scaDefns); policyDefinitionsProcessor.resolve(scaDefns, resolver); |