Modified: incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java (original) +++ incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java Fri May 2 23:47:54 2008 @@ -25,6 +25,7 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; +import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; @@ -38,26 +39,18 @@ */ public class PolicyReadTestCase extends TestCase { - @Override - public void setUp() throws Exception { - } - - @Override - public void tearDown() throws Exception { - } - public void testPolicyReading() throws Exception { ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - StAXArtifactProcessor<Axis2ConfigParamPolicy>processor = staxProcessors.getProcessor(Axis2ConfigParamPolicy.class); + XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + StAXArtifactProcessor<Object> staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null); URL url = getClass().getResource("mock_policies.xml"); - XMLInputFactory inputFactory = XMLInputFactory.newInstance(); InputStream urlStream = url.openStream(); XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream); - Axis2ConfigParamPolicy policy = processor.read(reader); + Axis2ConfigParamPolicy policy = (Axis2ConfigParamPolicy)staxProcessor.read(reader); assertEquals(policy.getParamElements().size(), 2); }
Modified: incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java (original) +++ incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java Fri May 2 23:47:54 2008 @@ -69,21 +69,16 @@ + " </policySet>" + " </definitions>"; - private XMLInputFactory xmlInputFactory; + private XMLInputFactory inputFactory; @Override public void setUp() throws Exception { - xmlInputFactory = XMLInputFactory.newInstance(); + inputFactory = XMLInputFactory.newInstance(); } - @Override - public void tearDown() throws Exception { - - } - public void testReadWsPolicy() throws Exception { - XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(VALID_WS_POLICY)); + XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_WS_POLICY)); WSPolicyProcessor processor = new WSPolicyProcessor(); Object artifact = null; Modified: incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java (original) +++ incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java Fri May 2 23:47:54 2008 @@ -27,10 +27,11 @@ import org.apache.tuscany.sca.contribution.Artifact; import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.ContributionFactory; -import org.apache.tuscany.sca.contribution.Export; -import org.apache.tuscany.sca.contribution.Import; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ClassReference; import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -38,6 +39,7 @@ import org.apache.tuscany.sca.contribution.scanner.ContributionScanner; import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionResolveException; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.workspace.scanner.impl.DirectoryContributionScanner; import org.apache.tuscany.sca.workspace.scanner.impl.JarContributionScanner; @@ -53,6 +55,15 @@ private ModelFactoryExtensionPoint modelFactories; private URLArtifactProcessor<Object> artifactProcessor; + public ContributionContentProcessor(ExtensionPointRegistry extensionPoints, StAXArtifactProcessor<Object> extensionProcessor) { + this.modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); + this.modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); + hackResolvers(modelResolvers); + URLArtifactProcessorExtensionPoint artifactProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + this.artifactProcessor = new ExtensibleURLArtifactProcessor(artifactProcessors); + this.contributionFactory = modelFactories.getFactory(ContributionFactory.class); + } + public ContributionContentProcessor(ModelFactoryExtensionPoint modelFactories, ModelResolverExtensionPoint modelResolvers, URLArtifactProcessor<Object> artifactProcessor) { this.modelFactories = modelFactories; this.modelResolvers = modelResolvers; @@ -62,7 +73,7 @@ } public String getArtifactType() { - return null; + return "contribution/content"; } public Class<Contribution> getModelType() { @@ -90,7 +101,8 @@ // Scan the contribution and list the artifacts contained in it List<Artifact> artifacts = contribution.getArtifacts(); boolean contributionMetadata = false; - for (String artifactURI: scanner.getArtifacts(contributionURL)) { + List<String> artifactURIs = scanner.getArtifacts(contributionURL); + for (String artifactURI: artifactURIs) { URL artifactURL = scanner.getArtifactURL(contributionURL, artifactURI); // Add the deployed artifact model to the contribution Modified: incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java (original) +++ incubator/tuscany/java/sca/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java Fri May 2 23:47:54 2008 @@ -32,7 +32,10 @@ import org.apache.tuscany.sca.contribution.Export; import org.apache.tuscany.sca.contribution.Import; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ClassReference; import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -40,6 +43,7 @@ import org.apache.tuscany.sca.contribution.scanner.ContributionScanner; import org.apache.tuscany.sca.contribution.service.ContributionReadException; import org.apache.tuscany.sca.contribution.service.ContributionResolveException; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.workspace.scanner.impl.DirectoryContributionScanner; import org.apache.tuscany.sca.workspace.scanner.impl.JarContributionScanner; @@ -55,6 +59,15 @@ private ModelFactoryExtensionPoint modelFactories; private URLArtifactProcessor<Object> artifactProcessor; + public ContributionInfoProcessor(ExtensionPointRegistry extensionPoints, StAXArtifactProcessor<Object> extensionProcessor) { + this.modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); + this.modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); + hackResolvers(modelResolvers); + URLArtifactProcessorExtensionPoint artifactProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + this.artifactProcessor = new ExtensibleURLArtifactProcessor(artifactProcessors); + this.contributionFactory = modelFactories.getFactory(ContributionFactory.class); + } + public ContributionInfoProcessor(ModelFactoryExtensionPoint modelFactories, ModelResolverExtensionPoint modelResolvers, URLArtifactProcessor<Object> artifactProcessor) { this.modelFactories = modelFactories; this.modelResolvers = modelResolvers; @@ -64,7 +77,7 @@ } public String getArtifactType() { - return null; + return "contribution/info"; } public Class<Contribution> getModelType() { Added: incubator/tuscany/java/sca/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor?rev=653010&view=auto ============================================================================== --- incubator/tuscany/java/sca/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor (added) +++ incubator/tuscany/java/sca/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor Fri May 2 23:47:54 2008 @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Implementation class for the artifact processor extension +org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;type=contribution/content +org.apache.tuscany.sca.workspace.processor.impl.ContributionInfoProcessor;type=contribution/info Modified: incubator/tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java?rev=653010&r1=652985&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java (original) +++ incubator/tuscany/java/sca/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java Fri May 2 23:47:54 2008 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.contribution.xml; +package org.apache.tuscany.sca.workspace.xml; import java.io.StringReader; @@ -27,15 +27,15 @@ import junit.framework.TestCase; -import org.apache.tuscany.sca.contribution.ContributionFactory; -import org.apache.tuscany.sca.contribution.DefaultContributionFactory; -import org.apache.tuscany.sca.workspace.DefaultWorkspaceFactory; +import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.workspace.Workspace; -import org.apache.tuscany.sca.workspace.WorkspaceFactory; -import org.apache.tuscany.sca.workspace.xml.WorkspaceProcessor; /** - * Test the contribution metadata processor. + * Test the workspace processor. * * @version $Rev$ $Date$ */ @@ -57,20 +57,20 @@ + "</contribution>" + "</workspace>"; - private XMLInputFactory xmlFactory; + private XMLInputFactory inputFactory; + private StAXArtifactProcessor<Object> staxProcessor; @Override protected void setUp() throws Exception { - xmlFactory = XMLInputFactory.newInstance(); + DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); + inputFactory = XMLInputFactory.newInstance(); + StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints); + staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null); } public void testRead() throws Exception { - XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(VALID_XML)); - - WorkspaceFactory workspaceFactory = new DefaultWorkspaceFactory(); - ContributionFactory contributionFactory = new DefaultContributionFactory(); - WorkspaceProcessor processor = new WorkspaceProcessor(workspaceFactory, contributionFactory, null); - Workspace workspace = processor.read(reader); + XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML)); + Workspace workspace = (Workspace)staxProcessor.read(reader); assertNotNull(workspace); assertEquals(2, workspace.getContributions().size()); assertEquals("uri2", workspace.getContributions().get(1).getURI()); @@ -78,12 +78,9 @@ } public void testReadInvalid() throws Exception { - XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(INVALID_XML)); - WorkspaceFactory workspaceFactory = new DefaultWorkspaceFactory(); - ContributionFactory contributionFactory = new DefaultContributionFactory(); - WorkspaceProcessor processor = new WorkspaceProcessor(workspaceFactory, contributionFactory, null); + XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(INVALID_XML)); try { - processor.read(reader); + staxProcessor.read(reader); fail("InvalidException should have been thrown"); } catch (XMLStreamException e) { assertTrue(true); Modified: incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java (original) +++ incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java Fri May 2 23:47:54 2008 @@ -53,7 +53,6 @@ import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; @@ -79,7 +78,6 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; -import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor; import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; import org.w3c.dom.Document; @@ -96,7 +94,7 @@ */ public class DistributeAndRunComponents { - private static URLArtifactProcessor<Contribution> contributionContentProcessor; + private static URLArtifactProcessor<Contribution> contributionProcessor; private static ModelResolverExtensionPoint modelResolvers; private static ModelFactoryExtensionPoint modelFactories; private static WorkspaceFactory workspaceFactory; @@ -125,21 +123,22 @@ XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class); outputFactory = modelFactories.getFactory(XMLOutputFactory.class); - // Get contribution, workspace, assembly and policy model factories + // Get contribution workspace and assembly model factories workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class); atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class); - // Create XML and document artifact processors + // Create XML artifact processors StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory); - URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - URLArtifactProcessor<Object> urlExtensionProcessor = new ExtensibleURLArtifactProcessor(docProcessorExtensions); // Create contribution content processor + URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + contributionProcessor = docProcessorExtensions.getProcessor("contribution/content"); + + // Get the model resolvers modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - contributionContentProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlExtensionProcessor); // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); @@ -170,19 +169,19 @@ // Read the sample store contribution URI storeURI = URI.create("store"); URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL(); - Contribution storeContribution = (Contribution)contributionContentProcessor.read(null, storeURI, storeURL); + Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL); workspace.getContributions().add(storeContribution); // Read the sample assets contribution URI assetsURI = URI.create("assets"); URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL(); - Contribution assetsContribution = (Contribution)contributionContentProcessor.read(null, assetsURI, assetsURL); + Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL); workspace.getContributions().add(assetsContribution); // Read the sample client contribution URI clientURI = URI.create("client"); URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL(); - Contribution clientContribution = (Contribution)contributionContentProcessor.read(null, clientURI, clientURL); + Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL); workspace.getContributions().add(clientContribution); // Build the contribution dependencies @@ -195,7 +194,7 @@ for (Contribution dependency: dependencies) { if (!resolved.contains(dependency)) { resolved.add(dependency); - contributionContentProcessor.resolve(dependency, workspace.getModelResolver()); + contributionProcessor.resolve(dependency, workspace.getModelResolver()); } } @@ -253,8 +252,7 @@ // the deployables to include domainComposite.getIncludes().addAll(workspace.getDeployables()); - // Build the domain composite and wire the components included - // in it + // Build the domain composite and wire the components included in it domainCompositeBuilder.build(domainComposite); // Print out the resulting domain composite Modified: incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/DistributeComponents.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/DistributeComponents.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/DistributeComponents.java (original) +++ incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/DistributeComponents.java Fri May 2 23:47:54 2008 @@ -51,7 +51,6 @@ import org.apache.tuscany.sca.contribution.ContributionFactory; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; @@ -76,7 +75,6 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; -import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor; import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; import org.w3c.dom.Document; @@ -109,7 +107,7 @@ */ public class DistributeComponents { - private static URLArtifactProcessor<Contribution> contributionContentProcessor; + private static URLArtifactProcessor<Contribution> contributionProcessor; private static ModelResolverExtensionPoint modelResolvers; private static ModelFactoryExtensionPoint modelFactories; private static WorkspaceFactory workspaceFactory; @@ -138,28 +136,27 @@ XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class); outputFactory = modelFactories.getFactory(XMLOutputFactory.class); - // Get contribution, workspace, assembly and policy model factories - ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class); + // Get contribution workspace and assembly model factories workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); - PolicyFactory policyFactory = modelFactories.getFactory(PolicyFactory.class); nodeFactory = modelFactories.getFactory(NodeImplementationFactory.class); atomBindingFactory = modelFactories.getFactory(AtomBindingFactory.class); - // Create a monitor - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); - Monitor monitor = monitorFactory.createMonitor(); - - // Create XML and document artifact processors + // Create XML artifact processors StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory); - URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - URLArtifactProcessor<Object> urlExtensionProcessor = new ExtensibleURLArtifactProcessor(docProcessorExtensions); // Create contribution content processor + URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + contributionProcessor = docProcessorExtensions.getProcessor("contribution/content"); + + // Get the model resolvers modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - contributionContentProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlExtensionProcessor); + + // Create a monitor + UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); + MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); + Monitor monitor = monitorFactory.createMonitor(); // Create a contribution dependency builder contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor); @@ -185,19 +182,19 @@ // Read the sample store contribution URI storeURI = URI.create("store"); URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL(); - Contribution storeContribution = (Contribution)contributionContentProcessor.read(null, storeURI, storeURL); + Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL); workspace.getContributions().add(storeContribution); // Read the sample assets contribution URI assetsURI = URI.create("assets"); URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL(); - Contribution assetsContribution = (Contribution)contributionContentProcessor.read(null, assetsURI, assetsURL); + Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL); workspace.getContributions().add(assetsContribution); // Read the sample client contribution URI clientURI = URI.create("client"); URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL(); - Contribution clientContribution = (Contribution)contributionContentProcessor.read(null, clientURI, clientURL); + Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL); workspace.getContributions().add(clientContribution); // Build the contribution dependencies @@ -209,7 +206,7 @@ for (Contribution dependency: dependencies) { if (!resolved.contains(dependency)) { resolved.add(dependency); - contributionContentProcessor.resolve(dependency, workspace.getModelResolver()); + contributionProcessor.resolve(dependency, workspace.getModelResolver()); } } } @@ -258,8 +255,7 @@ // the deployables to include domainComposite.getIncludes().addAll(workspace.getDeployables()); - // Build the domain composite and wire the components included - // in it + // Build the domain composite and wire the components included in it domainCompositeBuilder.build(domainComposite); // Print out the resulting domain composite Modified: incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java (original) +++ incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListComponents.java Fri May 2 23:47:54 2008 @@ -32,7 +32,6 @@ import org.apache.tuscany.sca.assembly.Service; import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -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.contribution.resolver.ExtensibleModelResolver; @@ -49,7 +48,6 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; -import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor; /** * Sample ListComponents task. @@ -69,7 +67,7 @@ */ public class ListComponents { - private static URLArtifactProcessor<Contribution> contributionContentProcessor; + private static URLArtifactProcessor<Contribution> contributionProcessor; private static ModelResolverExtensionPoint modelResolvers; private static ModelFactoryExtensionPoint modelFactories; private static WorkspaceFactory workspaceFactory; @@ -86,19 +84,16 @@ activator.start(extensionPoints); } - // Get XML input/output factories + // Get workspace contribution factory modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); - - // Get contribution, workspace, assembly and policy model factories workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); - // Create XML and document artifact processors + // Create contribution content processor URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - URLArtifactProcessor<Object> urlExtensionProcessor = new ExtensibleURLArtifactProcessor(docProcessorExtensions); + contributionProcessor = docProcessorExtensions.getProcessor("contribution/content"); - // Create contribution content processor + // Get the model resolvers modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - contributionContentProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlExtensionProcessor); // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); @@ -120,13 +115,13 @@ // Read the sample store contribution URI storeURI = URI.create("store"); URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL(); - Contribution storeContribution = (Contribution)contributionContentProcessor.read(null, storeURI, storeURL); + Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL); workspace.getContributions().add(storeContribution); // Read the sample assets contribution URI assetsURI = URI.create("assets"); URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL(); - Contribution assetsContribution = (Contribution)contributionContentProcessor.read(null, assetsURI, assetsURL); + Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL); workspace.getContributions().add(assetsContribution); // Build the store contribution dependencies @@ -134,7 +129,7 @@ // Resolve the contributions for (Contribution contribution: dependencies) { - contributionContentProcessor.resolve(contribution, workspace.getModelResolver()); + contributionProcessor.resolve(contribution, workspace.getModelResolver()); } // List the components declared in the deployables found in the Modified: incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java (original) +++ incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDependencies.java Fri May 2 23:47:54 2008 @@ -25,10 +25,8 @@ import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -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.contribution.resolver.ModelResolverExtensionPoint; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; @@ -38,7 +36,6 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; -import org.apache.tuscany.sca.workspace.processor.impl.ContributionInfoProcessor; /** * Sample ListDependencies task. @@ -54,7 +51,7 @@ */ public class ListDependencies { - private static URLArtifactProcessor<Contribution> contributionInfoProcessor; + private static URLArtifactProcessor<Contribution> contributionProcessor; private static WorkspaceFactory workspaceFactory; private static ContributionDependencyBuilder contributionDependencyBuilder; @@ -63,19 +60,13 @@ // Create extension point registry ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); - // Get XML input/output factories - ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); - // Get contribution, workspace and assembly model factories + ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); - // Create XML and document artifact processors - URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - URLArtifactProcessor<Object> docProcessor = new ExtensibleURLArtifactProcessor(docProcessorExtensions); - // Create contribution info processor - ModelResolverExtensionPoint modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - contributionInfoProcessor = new ContributionInfoProcessor(modelFactories, modelResolvers, docProcessor); + URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + contributionProcessor = docProcessorExtensions.getProcessor("contribution/info"); // Create a monitor UtilityExtensionPoint services = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); @@ -96,13 +87,13 @@ // Read the contribution info for the sample contribution URI storeURI = URI.create("store"); URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL(); - Contribution storeContribution = (Contribution)contributionInfoProcessor.read(null, storeURI, storeURL); + Contribution storeContribution = (Contribution)contributionProcessor.read(null, storeURI, storeURL); workspace.getContributions().add(storeContribution); // Read the contribution info for the assets contribution URI assetsURI = URI.create("assets"); URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL(); - Contribution assetsContribution = (Contribution)contributionInfoProcessor.read(null, assetsURI, assetsURL); + Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL); workspace.getContributions().add(assetsContribution); // List the contribution dependencies of each contribution Modified: incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDeployables.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDeployables.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDeployables.java (original) +++ incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/ListDeployables.java Fri May 2 23:47:54 2008 @@ -25,14 +25,10 @@ import org.apache.tuscany.sca.assembly.Composite; import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -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.contribution.resolver.ModelResolverExtensionPoint; import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.workspace.processor.impl.ContributionInfoProcessor; /** * Sample ListDeployables task. @@ -47,23 +43,17 @@ */ public class ListDeployables { - private static URLArtifactProcessor<Contribution> contributionInfoProcessor; + private static URLArtifactProcessor<Contribution> contributionProcessor; private static void init() { // Create extension point registry ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); - ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); - - // Create XML and document artifact processors - URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - URLArtifactProcessor<Object> docProcessor = new ExtensibleURLArtifactProcessor(docProcessorExtensions); // Create contribution info processor - ModelResolverExtensionPoint modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - contributionInfoProcessor = new ContributionInfoProcessor(modelFactories, modelResolvers, docProcessor); + URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + contributionProcessor = docProcessorExtensions.getProcessor("contribution/info"); } - public static void main(String[] args) throws Exception { init(); @@ -71,7 +61,7 @@ // Read the contribution info for the sample contribution URI uri = URI.create("store"); URL url = new File("./target/sample-domain-management-store.jar").toURI().toURL(); - Contribution contribution = (Contribution)contributionInfoProcessor.read(null, uri, url); + Contribution contribution = contributionProcessor.read(null, uri, url); // List the deployables in the contribution for (Composite deployable: contribution.getDeployables()) { Modified: incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/WireComponents.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/WireComponents.java?rev=653010&r1=653009&r2=653010&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/WireComponents.java (original) +++ incubator/tuscany/java/sca/samples/domain-management/src/main/java/manager/WireComponents.java Fri May 2 23:47:54 2008 @@ -43,7 +43,6 @@ import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; @@ -63,7 +62,6 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; -import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor; import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; import org.w3c.dom.Document; @@ -88,7 +86,7 @@ */ public class WireComponents { - private static URLArtifactProcessor<Contribution> contributionContentProcessor; + private static URLArtifactProcessor<Contribution> contributionProcessor; private static ModelResolverExtensionPoint modelResolvers; private static ModelFactoryExtensionPoint modelFactories; private static WorkspaceFactory workspaceFactory; @@ -114,19 +112,20 @@ XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class); outputFactory = modelFactories.getFactory(XMLOutputFactory.class); - // Get contribution, workspace, assembly and policy model factories + // Get contribution workspace and assembly model factories workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); - // Create XML and document artifact processors + // Create XML artifact processors StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory); - URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - URLArtifactProcessor<Object> urlExtensionProcessor = new ExtensibleURLArtifactProcessor(docProcessorExtensions); // Create contribution content processor + URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + contributionProcessor = docProcessorExtensions.getProcessor("contribution/content"); + + // Get the model resolvers modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - contributionContentProcessor = new ContributionContentProcessor(modelFactories, modelResolvers, urlExtensionProcessor); // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); @@ -155,19 +154,19 @@ // Read the sample store contribution URI storeURI = URI.create("store"); URL storeURL = new File("./target/sample-domain-management-store.jar").toURI().toURL(); - Contribution storeContribution = (Contribution)contributionContentProcessor.read(null, storeURI, storeURL); + Contribution storeContribution = contributionProcessor.read(null, storeURI, storeURL); workspace.getContributions().add(storeContribution); // Read the sample assets contribution URI assetsURI = URI.create("assets"); URL assetsURL = new File("./target/sample-domain-management-assets.jar").toURI().toURL(); - Contribution assetsContribution = (Contribution)contributionContentProcessor.read(null, assetsURI, assetsURL); + Contribution assetsContribution = contributionProcessor.read(null, assetsURI, assetsURL); workspace.getContributions().add(assetsContribution); // Read the sample client contribution URI clientURI = URI.create("client"); URL clientURL = new File("./target/sample-domain-management-client.jar").toURI().toURL(); - Contribution clientContribution = (Contribution)contributionContentProcessor.read(null, clientURI, clientURL); + Contribution clientContribution = contributionProcessor.read(null, clientURI, clientURL); workspace.getContributions().add(clientContribution); // Build the contribution dependencies @@ -179,7 +178,7 @@ for (Contribution dependency: dependencies) { if (!resolved.contains(dependency)) { resolved.add(dependency); - contributionContentProcessor.resolve(contribution, workspace.getModelResolver()); + contributionProcessor.resolve(contribution, workspace.getModelResolver()); } } } @@ -192,8 +191,7 @@ // the deployables to include domainComposite.getIncludes().addAll(workspace.getDeployables()); - // Build the domain composite and wire the components included - // in it + // Build the domain composite and wire the components included in it domainCompositeBuilder.build(domainComposite); // Print out the resulting domain composite
