You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2008/03/14 16:12:01 UTC
svn commit: r637129 [1/2] - in /incubator/tuscany/java/sca/modules:
assembly-xml/ assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/
assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/
assembly-xml/src/test/resources/org/apache...
Author: svkrish
Date: Fri Mar 14 08:11:59 2008
New Revision: 637129
URL: http://svn.apache.org/viewvc?rev=637129&view=rev
Log:
cleaning contribution off definitions and policyset dependency
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/contribution/pom.xml
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
incubator/tuscany/java/sca/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANode2Impl.java
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/pom.xml?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/pom.xml Fri Mar 14 08:11:59 2008
@@ -46,7 +46,6 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-definitions</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java Fri Mar 14 08:11:59 2008
@@ -19,12 +19,17 @@
package org.apache.tuscany.sca.assembly.xml;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URL;
-import java.net.URLConnection;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -35,6 +40,9 @@
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.util.PolicyComputationUtils;
/**
* A composite processor.
@@ -43,6 +51,8 @@
*/
public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor<Composite> {
private XMLInputFactory inputFactory;
+ private List scaDefnSink;
+ private Collection<PolicySet> domainPolicySets = null;
/**
* Construct a new composite processor
@@ -50,20 +60,29 @@
* @param policyFactory
* @param staxProcessor
*/
- public CompositeDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory) {
+ public CompositeDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory, List scaDefnsSink) {
super(null, null, staxProcessor);
this.inputFactory = inputFactory;
+ this.scaDefnSink = scaDefnsSink;
}
public Composite read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
- InputStream urlStream = null;
+ InputStream scdlStream = null;
try {
+ if ( domainPolicySets == null ) {
+ fillDomainPolicySets(scaDefnSink);
+ }
+
+ byte[] transformedArtifactContent = null;
+ try {
+ transformedArtifactContent =
+ PolicyComputationUtils.addApplicablePolicySets(url, domainPolicySets);
+ } catch ( Exception e ) {
+ throw new ContributionReadException(e);
+ }
+ scdlStream = new ByteArrayInputStream(transformedArtifactContent);
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(scdlStream);
- // Create a stream reader
- URLConnection connection = url.openConnection();
- connection.setUseCaches(false);
- urlStream = connection.getInputStream();
- XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
reader.nextTag();
// Read the composite model
@@ -94,13 +113,11 @@
} catch (XMLStreamException e) {
throw new ContributionReadException(e);
- } catch (IOException e) {
- throw new ContributionReadException(e);
} finally {
try {
- if (urlStream != null) {
- urlStream.close();
- urlStream = null;
+ if (scdlStream != null) {
+ scdlStream.close();
+ scdlStream = null;
}
} catch (IOException ioe) {
//ignore
@@ -118,5 +135,19 @@
public Class<Composite> getModelType() {
return Composite.class;
+ }
+
+ private void fillDomainPolicySets(List scaDefnsSink) {
+ Map<QName, PolicySet> domainPolicySetMap = new Hashtable<QName, PolicySet>();
+ if ( scaDefnsSink != null ) {
+ for ( Object object : scaDefnsSink ) {
+ if ( object instanceof SCADefinitions ) {
+ for ( PolicySet policySet : ((SCADefinitions)object).getPolicySets() ) {
+ domainPolicySetMap.put( policySet.getName(), policySet);
+ }
+ }
+ }
+ }
+ domainPolicySets = domainPolicySetMap.values();
}
}
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java Fri Mar 14 08:11:59 2008
@@ -21,6 +21,8 @@
import java.net.URI;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -61,8 +63,7 @@
*
* @version $Rev: 561254 $ $Date: 2007-07-31 13:16:27 +0530 (Tue, 31 Jul 2007) $
*/
-public class BuildPolicyTestCase extends TestCase {
-
+public class BuildPolicyTestCase extends TestCase {
private ExtensibleURLArtifactProcessor documentProcessor;
private TestModelResolver resolver;
private SCADefinitionsDocumentProcessor scaDefnDocProcessor;
@@ -71,10 +72,11 @@
@Override
public void setUp() throws Exception {
+ List scaDefnSink = new ArrayList();
AssemblyFactory factory = new DefaultAssemblyFactory();
PolicyFactory policyFactory = new DefaultPolicyFactory();
resolver = new TestModelResolver();
- compositeBuilder = new CompositeBuilderImpl(factory, new TestSCABindingFactoryImpl(), new DefaultIntentAttachPointTypeFactory(), new InterfaceContractMapperImpl(), null, null);
+ compositeBuilder = new CompositeBuilderImpl(factory, new TestSCABindingFactoryImpl(), new DefaultIntentAttachPointTypeFactory(), new InterfaceContractMapperImpl(), null);
URLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint(new DefaultModelFactoryExtensionPoint());
documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
@@ -94,7 +96,7 @@
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
// Create document processors
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory, scaDefnSink));
documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
scaDefnDocProcessor = new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, inputFactory, policyFactory);
@@ -115,6 +117,7 @@
uri = URI.create("another_test_definitions.xml");
SCADefinitions scaDefns = (SCADefinitions)scaDefnDocProcessor.read(null, uri, url);
assertNotNull(scaDefns);
+ scaDefnSink.add(scaDefns);
//preResolvePolicyTests(composite);
documentProcessor.resolve(scaDefns, resolver);
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java Fri Mar 14 08:11:59 2008
@@ -81,7 +81,7 @@
staxProcessors.addArtifactProcessor(new ConstrainingTypeProcessor(factory, policyFactory, staxProcessor));
inputFactory = XMLInputFactory.newInstance();
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory, null));
documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
@@ -138,12 +138,12 @@
reader.parse(new InputSource(url.openStream()));
}
- public void testReadImplementation() throws Exception {
+ public void testReadImplementation() throws Exception {
ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
schemas.addSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd").toString());
XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas);
- CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, validatingInputFactory);
+ CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, validatingInputFactory, null);
URL url = getClass().getResource("JavaScriptReference.composite");
URI uri = URI.create("JavaScriptReference.composite");
@@ -179,7 +179,7 @@
ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
schemas.addSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd").toString());
XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas);
- CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, validatingInputFactory);
+ CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, validatingInputFactory, null);
URL url = getClass().getResource("RMIBindingTest.composite");
URI uri = URI.create("RMIBindingTest.composite");
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java Fri Mar 14 08:11:59 2008
@@ -21,6 +21,8 @@
import java.net.URI;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
@@ -59,11 +61,12 @@
public class ResolvePolicyTestCase extends TestCase {
private ExtensibleURLArtifactProcessor documentProcessor;
- private TestModelResolver resolver;
+ private TestModelResolver resolver;
SCADefinitionsDocumentProcessor scaDefnDocProcessor;
@Override
public void setUp() throws Exception {
+ List scaDefnSink = new ArrayList();
AssemblyFactory factory = new DefaultAssemblyFactory();
PolicyFactory policyFactory = new DefaultPolicyFactory();
resolver = new TestModelResolver();
@@ -86,7 +89,7 @@
// Create document processors
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory, scaDefnSink));
documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
scaDefnDocProcessor = new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, inputFactory, policyFactory);
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java Fri Mar 14 08:11:59 2008
@@ -107,7 +107,7 @@
scaDefnDocProcessor.resolve(scaDefns, resolver);
compositeReader.resolve(composite, resolver);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
assertEquals(composite.getConstrainingType(), constrainingType);
@@ -137,7 +137,7 @@
scaDefnDocProcessor.resolve(scaDefns, resolver);
compositeReader.resolve(composite, resolver);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java Fri Mar 14 08:11:59 2008
@@ -73,7 +73,7 @@
scaBindingFactory = new TestSCABindingFactoryImpl();
policyFactory = new DefaultPolicyFactory();
mapper = new InterfaceContractMapperImpl();
- compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(new DefaultModelFactoryExtensionPoint());
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
staxProcessors.addArtifactProcessor(new CompositeProcessor(new DefaultContributionFactory(), assemblyFactory, policyFactory, staxProcessor));
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml Fri Mar 14 08:11:59 2008
@@ -30,7 +30,7 @@
<!-- POLICY SETS -->
<sca:policySet name="SecureReliablePolicy"
provides="confidentiality.transport integrity"
- appliesTo="sca:binding.ws and sca:binding.sca"
+ appliesTo="sca:binding.ws"
xmlns="http://test"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
<wsp:PolicyAttachment>
@@ -64,6 +64,7 @@
</sca:policySet>
<sca:policySet name="SecurityPolicy" provides="confidentiality"
+ appliesTo="sca:binding.ws"
xmlns="http://test"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
<sca:intentMap provides="confidentiality" default="message">
@@ -110,7 +111,7 @@
<sca:policySet name="ConfidentialityPolicies"
provides="confidentiality"
- bindings="binding.ws"
+ appliesTo="sca:binding.ws"
xmlns="http://test"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
<sca:intentMap provides="confidentiality" default="transport">
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java Fri Mar 14 08:11:59 2008
@@ -44,8 +44,8 @@
*/
public class BindingPolicyComputer extends PolicyComputer {
- public BindingPolicyComputer(List<PolicySet> domainPolicySets) {
- super(domainPolicySets);
+ public BindingPolicyComputer() {
+ super();
}
public void computeBindingIntentsAndPolicySets(Contract contract) throws PolicyValidationException {
@@ -147,16 +147,14 @@
trimProvidedIntents(confOp.getRequiredIntents(), confOp.getPolicySets());
trimProvidedIntents(confOp.getRequiredIntents(), policiedBinding.getPolicySets());
- if (domainPolicySets != null) {
- determineApplicableDomainPolicySets(policiedBinding.getApplicablePolicySets(),
- confOp,
- policiedBinding.getType());
-
- if (confOp.getRequiredIntents().size() > 0) {
- new PolicyComputationException("The following are unfulfilled intents for operations configured in "
- + "binding - " + aBinding.getName() + "\nUnfulfilled Intents = " +
- confOp.getRequiredIntents());
- }
+ determineApplicableDomainPolicySets(policiedBinding.getApplicablePolicySets(),
+ confOp,
+ policiedBinding.getType());
+
+ if (confOp.getRequiredIntents().size() > 0) {
+ new PolicyComputationException("The following are unfulfilled intents for operations configured in "
+ + "binding - " + aBinding.getName() + "\nUnfulfilled Intents = " +
+ confOp.getRequiredIntents());
}
//the intents list could have been trimmed when matching for policysets
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java Fri Mar 14 08:11:59 2008
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.assembly.builder.impl;
-import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -32,7 +31,6 @@
import org.apache.tuscany.sca.assembly.builder.Problem.Severity;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
* A builder that handles the configuration of the components inside a composite
@@ -57,7 +55,6 @@
SCABindingFactory scaBindingFactory,
IntentAttachPointTypeFactory intentAttachPointTypeFactory,
InterfaceContractMapper interfaceContractMapper,
- List<PolicySet> domainPolicySets,
CompositeBuilderMonitor monitor) {
if (monitor == null) {
@@ -80,7 +77,7 @@
}
includeBuilder = new CompositeIncludeBuilderImpl(monitor);
- wireBuilder = new CompositeWireBuilderImpl(assemblyFactory, interfaceContractMapper, domainPolicySets, monitor);
+ wireBuilder = new CompositeWireBuilderImpl(assemblyFactory, interfaceContractMapper, monitor);
cloneBuilder = new CompositeCloneBuilderImpl(monitor);
configurationBuilder = new CompositeConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, interfaceContractMapper, monitor);
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java Fri Mar 14 08:11:59 2008
@@ -79,13 +79,13 @@
}
};
- public CompositeWireBuilderImpl(AssemblyFactory assemblyFactory, InterfaceContractMapper interfaceContractMapper, List<PolicySet> domainPolicySets, CompositeBuilderMonitor monitor) {
+ public CompositeWireBuilderImpl(AssemblyFactory assemblyFactory, InterfaceContractMapper interfaceContractMapper, CompositeBuilderMonitor monitor) {
this.assemblyFactory = assemblyFactory;
this.interfaceContractMapper = interfaceContractMapper;
this.monitor = monitor;
- this.bindingPolicyComputer = new BindingPolicyComputer(domainPolicySets);
- this.implPolicyComputer = new ImplementationPolicyComputer(domainPolicySets);
+ this.bindingPolicyComputer = new BindingPolicyComputer();
+ this.implPolicyComputer = new ImplementationPolicyComputer();
}
/**
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java Fri Mar 14 08:11:59 2008
@@ -45,9 +45,8 @@
SCABindingFactory scaBindingFactory,
IntentAttachPointTypeFactory intentAttachPointTypeFactory,
InterfaceContractMapper interfaceContractMapper,
- List<PolicySet> domainPolicySets,
CompositeBuilderMonitor monitor) {
- wireBuilder = new CompositeWireBuilderImpl(assemblyFactory, interfaceContractMapper, domainPolicySets, monitor);
+ wireBuilder = new CompositeWireBuilderImpl(assemblyFactory, interfaceContractMapper, monitor);
}
public String getComponentNameFromReference(String referenceName){
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java Fri Mar 14 08:11:59 2008
@@ -37,8 +37,8 @@
*/
public class ImplementationPolicyComputer extends PolicyComputer {
- public ImplementationPolicyComputer(List<PolicySet> domainPolicySets) {
- super(domainPolicySets);
+ public ImplementationPolicyComputer() {
+ super();
}
public void computeImplementationIntentsAndPolicySets(Implementation implementation, Component parent)
@@ -88,16 +88,14 @@
trimProvidedIntents(confOp.getRequiredIntents(), confOp.getPolicySets());
trimProvidedIntents(confOp.getRequiredIntents(), component.getPolicySets());
- if (domainPolicySets != null) {
- determineApplicableDomainPolicySets(component.getApplicablePolicySets(),
- confOp,
- policiedImplementation.getType());
-
- if (confOp.getRequiredIntents().size() > 0) {
- new PolicyComputationException("The following are unfulfilled intents for operations configured in "
- + "component implementation - " + component.getName() + "\nUnfulfilled Intents = " +
- confOp.getRequiredIntents());
- }
+ determineApplicableDomainPolicySets(component.getApplicablePolicySets(),
+ confOp,
+ policiedImplementation.getType());
+
+ if (confOp.getRequiredIntents().size() > 0) {
+ new PolicyComputationException("The following are unfulfilled intents for operations configured in "
+ + "component implementation - " + component.getName() + "\nUnfulfilled Intents = " +
+ confOp.getRequiredIntents());
}
//the intents list could have been trimmed when matching for policysets
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java Fri Mar 14 08:11:59 2008
@@ -43,10 +43,9 @@
* This class contains policy computation methods common to computing implementation and binding policies
*/
public abstract class PolicyComputer {
- protected List<PolicySet> domainPolicySets;
- protected PolicyComputer(List<PolicySet> domainPolicySets) {
- this.domainPolicySets = domainPolicySets;
+ protected PolicyComputer() {
+
}
protected List<Intent> computeInheritableIntents(IntentAttachPointType attachPointType,
Modified: incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java Fri Mar 14 08:11:59 2008
@@ -113,7 +113,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
SCABinding referenceSCABinding = (SCABinding) composite.getComponents().get(0).getReferences().get(0).getBindings().get(0);
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java Fri Mar 14 08:11:59 2008
@@ -102,7 +102,7 @@
compositeReader.resolve(composite, resolver);
- CompositeBuilderImpl compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeBuilder.build(composite);
SCABinding referenceSCABinding = (SCABinding) composite.getComponents().get(0).getReferences().get(0).getBindings().get(0);
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java Fri Mar 14 08:11:59 2008
@@ -111,7 +111,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
//new PrintUtil(System.out).print(composite);
@@ -124,7 +124,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
assertEquals(((OperationsConfigurator)composite.getServices().get(0).getBindings().get(0))
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java Fri Mar 14 08:11:59 2008
@@ -18,40 +18,18 @@
*/
package org.apache.tuscany.sca.contribution.service.impl;
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLConnection;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
import java.util.List;
-import java.util.Map;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Composite;
@@ -66,18 +44,11 @@
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionRepository;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.contribution.service.ExtensibleContributionListener;
import org.apache.tuscany.sca.contribution.service.util.IOHelper;
import org.apache.tuscany.sca.contribution.xml.ContributionMetadataDocumentProcessor;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* Service interface that manages artifacts contributed to a Tuscany runtime.
@@ -144,21 +115,12 @@
private ContributionFactory contributionFactory;
- private List<SCADefinitions> contributionSCADefinitions = new ArrayList<SCADefinitions>();
-
private ModelResolver domainResolver;
+
+
+ private List scaDefinitionsSink = null;
- private Map<QName, PolicySet> policySetMap = new Hashtable<QName, PolicySet>();
-
- private SCADefinitions systemSCADefinitions = null;
-
- private String COMPOSITE_FILE_EXTN = ".composite";
- private String POLICYSET_PREFIX = "tp_";
- private String APPLICABLE_POLICYSET_ATTR_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
- private String APPLICABLE_POLICYSET_ATTR = "applicablePolicySets";
- private String POLICY_SETS_ATTR = "policySets";
- private String APPLICABLE_POLICYSET_ATTR_PREFIX = "tuscany";
- private String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+ private String COMPOSITE_FILE_EXTN = ".composite";
public ContributionServiceImpl(ContributionRepository repository,
PackageProcessor packageProcessor,
@@ -171,7 +133,7 @@
AssemblyFactory assemblyFactory,
ContributionFactory contributionFactory,
XMLInputFactory xmlFactory,
- SCADefinitions scaDefinitions) {
+ List scaDefnSink) {
super();
this.contributionRepository = repository;
this.packageProcessor = packageProcessor;
@@ -184,7 +146,7 @@
this.assemblyFactory = assemblyFactory;
this.contributionFactory = contributionFactory;
this.domainResolver = domainResolver;
- this.systemSCADefinitions = scaDefinitions;
+ this.scaDefinitionsSink = scaDefnSink;
}
public Contribution contribute(String contributionURI, URL sourceURL, boolean storeInRepository)
@@ -372,11 +334,6 @@
contributionArtifacts = this.packageProcessor.getArtifacts(locationURL, contributionStream);
}
- //at this point the systemSCADefinitions will be updated by the runtime with all the
- //contents of definitions.xml in the META-INF/services subdirectory. So first update the
- //policysetMap for the systemSCADefinitions
- updatePolicySetMap(systemSCADefinitions);
-
// Read all artifacts in the contribution
try {
processReadPhase(contribution, contributionArtifacts);
@@ -449,9 +406,8 @@
// Add the loaded model to the model resolver
modelResolver.addModel(model);
- if ( model instanceof SCADefinitions ) {
- contributionSCADefinitions.add((SCADefinitions)model);
- updatePolicySetMap((SCADefinitions)model);
+ if ( isSCADefnsFile(anArtifactUri) ) {
+ scaDefinitionsSink.add(model);
}
}
}
@@ -467,17 +423,11 @@
contribution.getArtifacts().add(artifact);
modelResolver.addModel(artifact);
- byte[] transformedArtifactContent = addApplicablePolicySets(artifactURL);
- artifact.setContents(transformedArtifactContent);
- XMLStreamReader reader = xmlFactory.createXMLStreamReader(new ByteArrayInputStream(transformedArtifactContent));
- reader.nextTag();
- Composite composite = (Composite)staxProcessor.read(reader);
- if (composite != null) {
- composite.setURI(anArtifactUri.toString());
-
- artifact.setModel(composite);
+ model = this.artifactProcessor.read(contributionURL, anArtifactUri, artifactURL);
+ if (model != null) {
+ artifact.setModel(model);
// Add the loaded model to the model resolver
- modelResolver.addModel(composite);
+ modelResolver.addModel(model);
}
}
}
@@ -527,155 +477,11 @@
contribution.getDeployables().addAll(resolvedDeployables);
}
- public List<SCADefinitions> getContributionSCADefinitions() {
- return contributionSCADefinitions;
- }
-
- private void updatePolicySetMap(SCADefinitions scaDefns) {
- for ( PolicySet policySet : scaDefns.getPolicySets() ) {
- policySetMap.put(policySet.getName(), policySet);
- }
- }
-
- private byte[] addApplicablePolicySets(Document doc, Collection<PolicySet> policySets) throws
- XPathExpressionException,
- TransformerConfigurationException,
- TransformerException {
- int prefixCount = 1;
-
- for ( PolicySet policySet : policySets ) {
- if ( policySet.getAppliesTo() != null ) {
- addApplicablePolicySets(policySet, doc, prefixCount);
- }
-
- if ( policySet.getAlwaysAppliesTo() != null ) {
- addAlwaysApplicablePolicySets(policySet, doc, prefixCount);
- }
- }
-
- StringWriter sw = new StringWriter();
- Source domSource = new DOMSource(doc);
- Result finalResult = new StreamResult(sw);
- Transformer transformer = TransformerFactory.newInstance().newTransformer();
- //transformer.setOutputProperty("omit-xml-declaration", "yes");
- transformer.transform(domSource, finalResult);
- return sw.toString().getBytes();
- }
-
- private void addAlwaysApplicablePolicySets(PolicySet policySet, Document doc, int prefixCount) throws XPathExpressionException {
- XPathExpression expression = policySet.getAlwaysAppliesToXPathExpression();
- NodeList result = (NodeList)expression.evaluate(doc, XPathConstants.NODESET);
-
- if ( result != null ) {
- for ( int counter = 0 ; counter < result.getLength() ; ++counter ) {
- Node aResultNode = result.item(counter);
-
- String alwaysApplicablePolicySets = null;
- String policySetPrefix = POLICYSET_PREFIX + prefixCount++;
- String policySetsAttrPrefix = "sca";
-
- policySetPrefix = declareNamespace((Element)aResultNode, policySetPrefix, policySet.getName().getNamespaceURI());
- policySetsAttrPrefix = declareNamespace((Element)aResultNode, policySetsAttrPrefix, SCA10_NS);
- if ( aResultNode.getAttributes().getNamedItem( POLICY_SETS_ATTR) != null ) {
- alwaysApplicablePolicySets =
- aResultNode.getAttributes().getNamedItem(POLICY_SETS_ATTR).getNodeValue();
- }
-
- if ( alwaysApplicablePolicySets != null && alwaysApplicablePolicySets.length() > 0 ) {
- alwaysApplicablePolicySets = alwaysApplicablePolicySets + " " + policySetPrefix + ":" + policySet.getName().getLocalPart();
- } else {
- alwaysApplicablePolicySets = policySetPrefix + ":" + policySet.getName().getLocalPart();
- }
-
- ((Element)aResultNode).setAttribute(POLICY_SETS_ATTR,
- alwaysApplicablePolicySets);
- }
- }
- }
-
- private void addApplicablePolicySets(PolicySet policySet, Document doc, int prefixCount) throws XPathExpressionException {
- XPathExpression expression = policySet.getAppliesToXPathExpression();
- NodeList result = (NodeList)expression.evaluate(doc, XPathConstants.NODESET);
-
- if ( result != null ) {
- for ( int counter = 0 ; counter < result.getLength() ; ++counter ) {
- Node aResultNode = result.item(counter);
-
- String applicablePolicySets = null;
- String policySetPrefix = POLICYSET_PREFIX + prefixCount++;
- String appPolicyAttrPrefix = APPLICABLE_POLICYSET_ATTR_PREFIX;
-
- policySetPrefix = declareNamespace((Element)aResultNode, policySetPrefix, policySet.getName().getNamespaceURI());
- appPolicyAttrPrefix = declareNamespace((Element)aResultNode, appPolicyAttrPrefix, APPLICABLE_POLICYSET_ATTR_NS);
- if ( aResultNode.getAttributes().getNamedItemNS(APPLICABLE_POLICYSET_ATTR_NS, APPLICABLE_POLICYSET_ATTR) != null ) {
- applicablePolicySets =
- aResultNode.getAttributes().getNamedItemNS(APPLICABLE_POLICYSET_ATTR_NS, APPLICABLE_POLICYSET_ATTR).getNodeValue();
- }
-
- if ( applicablePolicySets != null && applicablePolicySets.length() > 0 ) {
- applicablePolicySets = applicablePolicySets + " " + policySetPrefix + ":" + policySet.getName().getLocalPart();
- } else {
- applicablePolicySets = policySetPrefix + ":" + policySet.getName().getLocalPart();
- }
-
- ((Element)aResultNode).setAttributeNS(APPLICABLE_POLICYSET_ATTR_NS,
- appPolicyAttrPrefix + ":" + APPLICABLE_POLICYSET_ATTR,
- applicablePolicySets);
- }
- }
- }
-
- private byte[] addApplicablePolicySets(URL artifactUrl) throws ContributionReadException {
- try {
- DocumentBuilderFactory dbFac = DocumentBuilderFactory.newInstance();
- dbFac.setNamespaceAware(true);
- DocumentBuilder db = dbFac.newDocumentBuilder();
- Document doc = db.parse(artifactUrl.toURI().toString());
- return addApplicablePolicySets(doc, policySetMap.values());
- } catch ( Exception e ) {
- throw new ContributionReadException(e);
- }
- }
-
- private String declareNamespace(Element element, String prefix, String ns) {
- if (ns == null) {
- ns = "";
- }
- if (prefix == null) {
- prefix = "";
- }
- String qname = null;
- if ("".equals(prefix)) {
- qname = "xmlns";
- } else {
- qname = "xmlns:" + prefix;
- }
- Node node = element;
- boolean declared = false;
- while (node != null && node.getNodeType() == Node.ELEMENT_NODE) {
- if ( node.lookupPrefix(ns) != null ) {
- prefix = node.lookupPrefix(ns);
- declared = true;
- break;
- } else {
- /*NamedNodeMap attrs = node.getAttributes();
- if (attrs == null) {
- break;
- }
- Node attr = attrs.getNamedItem(qname);
- if (attr != null) {
- declared = ns.equals(attr.getNodeValue());
- break;
- }*/
- node = node.getParentNode();
- }
- }
- if (!declared) {
- org.w3c.dom.Attr attr = element.getOwnerDocument().createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, qname);
- attr.setValue(ns);
- element.setAttributeNodeNS(attr);
- }
- return prefix;
- }
+ private boolean isSCADefnsFile(URI uri) {
+ int index = uri.toString().lastIndexOf("/");
+
+ index = (index != -1) ? index + 1 : 0;
+ return uri.toString().substring(index).equals("definitions.xml");
+ }
}
Modified: incubator/tuscany/java/sca/modules/contribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/pom.xml?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/contribution/pom.xml Fri Mar 14 08:11:59 2008
@@ -35,12 +35,6 @@
<version>1.2-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-definitions</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extensibility</artifactId>
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java Fri Mar 14 08:11:59 2008
@@ -21,12 +21,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.List;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
/**
* Service interface that manages artifacts contributed to a Tuscany runtime.
@@ -140,11 +138,4 @@
* @throws DeploymentException
*/
void remove(String contribution) throws ContributionException;
-
- /**
- * Return the collection of SCA Definitions processed in the contribution
- *
- * @return collection of SCADefinitions
- */
- List<SCADefinitions> getContributionSCADefinitions();
}
Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java Fri Mar 14 08:11:59 2008
@@ -74,7 +74,7 @@
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
/**
- * A mini test runtime that uses the SCA assembly model variant implementation
+ * A mini test runtime that uses the SCA assembly model variant implementation
* backed by Spring bean definitions.
*
* @version $Rev$ $Date$
@@ -180,7 +180,7 @@
};
// Configure and wire the composite
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), interfaceContractMapper, null, monitor);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), interfaceContractMapper, monitor);
compositeUtil.build(composite);
}
Modified: incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java Fri Mar 14 08:11:59 2008
@@ -90,19 +90,22 @@
Object extension = extensionProcessor.read(reader);
if (extension != null) {
if ( extension instanceof Intent ) {
- ((Intent)extension).setName(new QName(targetNamespace,
- ((Intent)extension).getName().getLocalPart()));
- if ( extension instanceof QualifiedIntent ) {
- ((QualifiedIntent)extension).getQualifiableIntent().
- setName(new QName(targetNamespace,
- ((QualifiedIntent)extension).getQualifiableIntent().getName().getLocalPart()));
+ Intent intent = (Intent)extension;
+ intent.setName(new QName(targetNamespace,
+ intent.getName().getLocalPart()));
+ if ( intent instanceof QualifiedIntent ) {
+ QualifiedIntent qualifiedIntent = (QualifiedIntent)intent;
+ qualifiedIntent.getQualifiableIntent().
+ setName(new QName(targetNamespace,
+ qualifiedIntent.getQualifiableIntent().getName().getLocalPart()));
}
- definitions.getPolicyIntents().add((Intent)extension);
+ definitions.getPolicyIntents().add(intent);
} else if ( extension instanceof PolicySet ) {
- ((PolicySet)extension).setName(new QName(targetNamespace,
- ((PolicySet)extension).getName().getLocalPart()));
- definitions.getPolicySets().add((PolicySet)extension);
+ PolicySet policySet = (PolicySet)extension;
+ policySet.setName(new QName(targetNamespace,
+ policySet.getName().getLocalPart()));
+ definitions.getPolicySets().add(policySet);
} else if ( extension instanceof IntentAttachPointType ) {
IntentAttachPointType type = (IntentAttachPointType)extension;
if ( type.getName().getLocalPart().startsWith(BINDING)) {
Modified: incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java Fri Mar 14 08:11:59 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.domain.impl;
+package org.apache.tuscany.sca.domain.impl;
import java.io.ByteArrayOutputStream;
import java.io.Externalizable;
@@ -202,12 +202,6 @@
contribution = domainManagementContributionService.contribute(domainModel.getDomainURI(),
contributionURL,
false);
-
- //update the runtime for all SCA Definitions processed from the contribution..
- //so that the policyset determination done during 'build' has the all the defined
- //intents and policysets
- domainManagementRuntime.updateSCADefinitions(domainManagementContributionService.getContributionSCADefinitions());
-
//get the domain builder
domainBuilder = domainManagementRuntime.getDomainBuilder();
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java Fri Mar 14 08:11:59 2008
@@ -194,7 +194,7 @@
//update the runtime for all SCA Definitions processed from the contribution..
//so that the policyset determination done during 'build' has the all the defined
//intents and policysets
- runtime.updateSCADefinitions(contributionService.getContributionSCADefinitions());
+ //runtime.updateSCADefinitions(null);
// Build the SCA composites
for (Composite composite : domainComposite.getIncludes()) {
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java Fri Mar 14 08:11:59 2008
@@ -100,10 +100,6 @@
domainComposite = null;
}
- public void updateContributionSCADefinitions(List<SCADefinitions> scaDefns) {
- runtime.updateSCADefinitions(scaDefns);
- }
-
public void buildComposite(Composite composite) throws CompositeBuilderException {
runtime.buildComposite(composite);
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java Fri Mar 14 08:11:59 2008
@@ -81,7 +81,7 @@
private WorkScheduler workScheduler;
private ScopeRegistry scopeRegistry;
private ProxyFactory proxyFactory;
- private SCADefinitions scaDefinitions = new SCADefinitionsImpl();
+ private List scaDefnsSink = new ArrayList();
public ReallySmallRuntime(ClassLoader classLoader) {
this.classLoader = classLoader;
@@ -137,7 +137,7 @@
assemblyFactory,
policyFactory,
mapper,
- scaDefinitions);
+ scaDefnsSink);
// Create the ScopeRegistry
scopeRegistry = ReallySmallRuntimeBuilder.createScopeRegistry(registry);
@@ -196,19 +196,11 @@
compositeBuilder = ReallySmallRuntimeBuilder.createCompositeBuilder(assemblyFactory,
scaBindingFactory,
intentAttachPointTypeFactory,
- mapper,
- scaDefinitions.getPolicySets());
+ mapper);
compositeBuilder.build(composite);
}
- public void updateSCADefinitions(List<SCADefinitions> scaDefns) {
- for ( SCADefinitions aDefn : scaDefns ) {
- SCADefinitionsUtil.aggregateSCADefinitions(aDefn, scaDefinitions);
- }
- SCADefinitionsUtil.stripDuplicates(scaDefinitions);
- }
-
public ContributionService getContributionService() {
return contributionService;
}
@@ -236,13 +228,12 @@
domainBuilder = ReallySmallRuntimeBuilder.createDomainBuilder(assemblyFactory,
scaBindingFactory,
intentAttachPointTypeFactory,
- mapper,
- scaDefinitions.getPolicySets());
+ mapper);
}
return domainBuilder;
}
- private SCADefinitions loadSCADefinitions(ExtensionPointRegistry registry) throws ActivationException {
+ private void loadSCADefinitions(ExtensionPointRegistry registry) throws ActivationException {
URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
SCADefinitionsDocumentProcessor definitionsProcessor = (SCADefinitionsDocumentProcessor)documentProcessors.getProcessor(SCADefinitions.class);
@@ -250,14 +241,16 @@
Map<ClassLoader, Set<URL>> scaDefinitionFiles =
ServiceDiscovery.getInstance().getServiceResources("definitions.xml");
+ SCADefinitions systemSCADefinitions = new SCADefinitionsImpl();
for ( ClassLoader cl : scaDefinitionFiles.keySet() ) {
for ( URL scaDefnUrl : scaDefinitionFiles.get(cl) ) {
SCADefinitions defnSubset = definitionsProcessor.read(null, null, scaDefnUrl);
- SCADefinitionsUtil.aggregateSCADefinitions(defnSubset, scaDefinitions);
+ SCADefinitionsUtil.aggregateSCADefinitions(defnSubset, systemSCADefinitions);
}
}
- definitionsProcessor.resolve(scaDefinitions, definitionsProcessor.getSCADefinitionsResolver());
+ definitionsProcessor.resolve(systemSCADefinitions, definitionsProcessor.getSCADefinitionsResolver());
+ scaDefnsSink.add(systemSCADefinitions);
} catch ( ContributionReadException e ) {
throw new ActivationException(e);
} catch ( ContributionResolveException e ) {
@@ -265,8 +258,6 @@
} catch ( IOException e ) {
throw new ActivationException(e);
}
-
- return scaDefinitions;
}
@SuppressWarnings("unchecked")
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java Fri Mar 14 08:11:59 2008
@@ -147,17 +147,15 @@
public static CompositeBuilder createCompositeBuilder(AssemblyFactory assemblyFactory,
SCABindingFactory scaBindingFactory,
IntentAttachPointTypeFactory intentAttachPointTypeFactory,
- InterfaceContractMapper interfaceContractMapper,
- List<PolicySet> domainPolicySets) {
- return new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, interfaceContractMapper, domainPolicySets, null);
+ InterfaceContractMapper interfaceContractMapper) {
+ return new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, interfaceContractMapper, null);
}
public static DomainBuilder createDomainBuilder(AssemblyFactory assemblyFactory,
SCABindingFactory scaBindingFactory,
IntentAttachPointTypeFactory intentAttachPointTypeFactory,
- InterfaceContractMapper interfaceContractMapper,
- List<PolicySet> domainPolicySets) {
- return new DomainWireBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, interfaceContractMapper, domainPolicySets, null);
+ InterfaceContractMapper interfaceContractMapper) {
+ return new DomainWireBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, interfaceContractMapper, null);
}
/**
@@ -171,7 +169,7 @@
AssemblyFactory assemblyFactory,
PolicyFactory policyFactory,
InterfaceContractMapper mapper,
- SCADefinitions scaDefinitions)
+ List scaDefinitionsSink)
throws ActivationException {
// Create a new XML input factory
@@ -205,7 +203,7 @@
registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
// Create and register document processors for SCA assembly XML
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, validatingInputFactory));
+ documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, validatingInputFactory, scaDefinitionsSink));
documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, validatingInputFactory));
documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, validatingInputFactory));
@@ -246,8 +244,7 @@
ContributionService contributionService =
new ContributionServiceImpl(repository, packageProcessor, documentProcessor, staxProcessor,
contributionListener, domainModelResolver, modelResolvers, modelFactories,
- assemblyFactory, contributionFactory, inputFactory,
- scaDefinitions);
+ assemblyFactory, contributionFactory, inputFactory, scaDefinitionsSink);
return contributionService;
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java Fri Mar 14 08:11:59 2008
@@ -70,10 +70,6 @@
domain.getDomainComposite().getIncludes().add(myComposite);
- //update for sca definitions processed from contributions.. need to do this before building
- //the composite
- domain.updateContributionSCADefinitions(contributionService.getContributionSCADefinitions());
-
domain.buildComposite(myComposite);
// Start the composite
@@ -124,10 +120,6 @@
// Add the deployable composite to the domain
domain.getDomainComposite().getIncludes().add(myComposite);
-
- //update for sca definitions processed from contributions.. need to do this before building
- //the composite
- domain.updateContributionSCADefinitions(contributionService.getContributionSCADefinitions());
domain.buildComposite(myComposite);
Modified: incubator/tuscany/java/sca/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-ejb-xml/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java Fri Mar 14 08:11:59 2008
@@ -95,7 +95,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
assertTrue(((EJBImplementation)composite.getComponents().get(0).getImplementation()).getEJBLink().equals("module.jar#TestEJB"));
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java Fri Mar 14 08:11:59 2008
@@ -117,7 +117,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, mapper, null);
compositeUtil.build(composite);
}
@@ -139,7 +139,7 @@
staxProcessor.resolve(scaDefns, resolver);
staxProcessor.resolve(composite, resolver);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, mapper, scaDefns.getPolicySets(), null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, mapper, null);
compositeUtil.build(composite);
//intents are computed and aggregate intents from ancestor elements
@@ -214,7 +214,7 @@
staxProcessor.resolve(scaDefns, resolver);
staxProcessor.resolve(composite, resolver);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, mapper, scaDefns.getPolicySets(), null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, mapper, null);
compositeUtil.build(composite);
//test for determination of policysets for implementation
Modified: incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java Fri Mar 14 08:11:59 2008
@@ -99,7 +99,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
}
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java Fri Mar 14 08:11:59 2008
@@ -120,7 +120,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java Fri Mar 14 08:11:59 2008
@@ -119,7 +119,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null);
compositeUtil.build(composite);
//new PrintUtil(System.out).print(composite);
Modified: incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java (original)
+++ incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java Fri Mar 14 08:11:59 2008
@@ -201,10 +201,6 @@
contributionURL,
false);
- //update runtime with contribution sca definitions
- //this should be done before building the composite
- domainManagementRuntime.updateSCADefinitions(domainManagementContributionService.getContributionSCADefinitions());
-
Composite composite = null;
for (Artifact artifact: domainManagementContribution.getArtifacts()) {
Modified: incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANode2Impl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANode2Impl.java?rev=637129&r1=637128&r2=637129&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANode2Impl.java (original)
+++ incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANode2Impl.java Fri Mar 14 08:11:59 2008
@@ -152,10 +152,6 @@
// Include the node composite in the top-level composite
tempComposite.getIncludes().add(composite);
- // Update the policy definitions processed from the contribution.
- // I'm not sure what that exactly does...
- runtime.updateSCADefinitions(contributionService.getContributionSCADefinitions());
-
// Build the composite
runtime.buildComposite(composite);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org