Author: rfeng
Date: Wed Oct 15 14:52:38 2008
New Revision: 705071
URL: http://svn.apache.org/viewvc?rev=705071&view=rev
Log:
Fix the model class registration
Modified:
tuscany/branches/sca-equinox/modules/binding-sca-xml/pom.xml
tuscany/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
Modified: tuscany/branches/sca-equinox/modules/binding-sca-xml/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca-xml/pom.xml?rev=705071&r1=705070&r2=705071&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-sca-xml/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-sca-xml/pom.xml Wed Oct 15
14:52:38 2008
@@ -58,8 +58,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.binding.sca.xml</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
-
<Export-Package>org.apache.tuscany.sca.binding.sca.xml*</Export-Package>
-
<Import-Package>org.apache.tuscany.sca.binding.sca.impl,*</Import-Package>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified:
tuscany/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=705071&r1=705070&r2=705071&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/branches/sca-equinox/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Wed Oct 15 14:52:38 2008
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.sca,model=org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl
+org.apache.tuscany.sca.binding.sca.xml.SCABindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding
Modified:
tuscany/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java?rev=705071&r1=705070&r2=705071&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
Wed Oct 15 14:52:38 2008
@@ -27,23 +27,16 @@
import junit.framework.Assert;
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.SCABinding;
-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;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
/**
* Test reading WSDL interfaces.
@@ -64,15 +57,7 @@
StAXArtifactProcessorExtensionPoint staxProcessors =
extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors,
inputFactory, null, null);
- FactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
- AssemblyFactory assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
- SCABindingFactory scaBindingFactory =
modelFactories.getFactory(SCABindingFactory.class);
- IntentAttachPointTypeFactory attachPointTypeFactory =
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-
- UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- InterfaceContractMapper mapper =
utilities.getUtility(InterfaceContractMapper.class);
- compositeBuilder = new CompositeBuilderImpl(assemblyFactory,
scaBindingFactory, attachPointTypeFactory, mapper);
-
+ compositeBuilder =
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
}
public void testReadComponentType() throws Exception {
