Author: rfeng
Date: Fri Oct 10 11:35:10 2008
New Revision: 703556
URL: http://svn.apache.org/viewvc?rev=703556&view=rev
Log:
Make the o.a.t.s.a.builder.impl package private
Modified:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
tuscany/branches/sca-equinox/modules/assembly/pom.xml
Modified:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java?rev=703556&r1=703555&r2=703556&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
Fri Oct 10 11:35:10 2008
@@ -28,13 +28,12 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.OperationsConfigurator;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
@@ -47,12 +46,10 @@
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.definitions.SCADefinitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
/**
* Test reading SCA XML assembly documents.
@@ -71,9 +68,10 @@
public void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
FactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
- AssemblyFactory assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
- IntentAttachPointTypeFactory attachPointTypeFactory =
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
+ modelFactories.addFactory(scaBindingFactory);
+ compositeBuilder =
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
+
List<SCADefinitions> policyDefinitions = new
ArrayList<SCADefinitions>();
resolver = new DefaultModelResolver();
@@ -83,7 +81,6 @@
UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
InterfaceContractMapper mapper =
utilities.getUtility(InterfaceContractMapper.class);
- compositeBuilder = new CompositeBuilderImpl(assemblyFactory,
scaBindingFactory, attachPointTypeFactory, mapper);
URLArtifactProcessorExtensionPoint documentProcessors = new
DefaultURLArtifactProcessorExtensionPoint(extensionPoints);
documentProcessor = new
ExtensibleURLArtifactProcessor(documentProcessors, null);
policyDefinitionsProcessor =
documentProcessors.getProcessor(SCADefinitions.class);
Modified:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?rev=703556&r1=703555&r2=703556&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
Fri Oct 10 11:35:10 2008
@@ -28,12 +28,11 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
@@ -49,7 +48,6 @@
import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
/**
* Test the wiring of SCA XML assemblies.
@@ -77,13 +75,12 @@
monitor = monitorFactory.createMonitor();
FactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
- AssemblyFactory assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
- IntentAttachPointTypeFactory attachPointTypeFactory =
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
+ modelFactories.addFactory(scaBindingFactory);
+ compositeBuilder =
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
InterfaceContractMapper mapper =
utilities.getUtility(InterfaceContractMapper.class);
- compositeBuilder = new CompositeBuilderImpl(assemblyFactory,
scaBindingFactory, attachPointTypeFactory, mapper);
URLArtifactProcessorExtensionPoint documentProcessors =
extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
policyDefinitionsProcessor =
documentProcessors.getProcessor(SCADefinitions.class);
Modified:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java?rev=703556&r1=703555&r2=703556&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
Fri Oct 10 11:35:10 2008
@@ -31,13 +31,12 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
@@ -52,7 +51,6 @@
import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
/**
* Test writing SCA XML assemblies.
@@ -78,9 +76,9 @@
resolver = new DefaultModelResolver();
FactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
- AssemblyFactory assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
- IntentAttachPointTypeFactory attachPointTypeFactory =
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
+ modelFactories.addFactory(scaBindingFactory);
+ compositeBuilder =
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
InterfaceContractMapper mapper =
utilities.getUtility(InterfaceContractMapper.class);
@@ -88,8 +86,6 @@
MonitorFactory monitorFactory = new DefaultMonitorFactory();
monitor = monitorFactory.createMonitor();
- compositeBuilder = new CompositeBuilderImpl(assemblyFactory,
scaBindingFactory, attachPointTypeFactory, mapper);
-
URLArtifactProcessorExtensionPoint documentProcessors =
extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
policyDefinitionsProcessor =
documentProcessors.getProcessor(SCADefinitions.class);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/pom.xml?rev=703556&r1=703555&r2=703556&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/assembly/pom.xml Fri Oct 10 11:35:10
2008
@@ -66,7 +66,11 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.assembly</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
-
<Export-Package>org.apache.tuscany.sca.assembly*</Export-Package>
+ <Export-Package>
+ org.apache.tuscany.sca.assembly,
+ org.apache.tuscany.sca.assembly.builder,
+ org.apache.tuscany.sca.assembly.impl,
+ </Export-Package>
</instructions>
</configuration>
</plugin>
