Author: antelder
Date: Tue Feb 17 15:19:07 2009
New Revision: 745114
URL: http://svn.apache.org/viewvc?rev=745114&view=rev
Log:
Get implementation.web building cleanly
Modified:
tuscany/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
tuscany/java/sca/modules/implementation-web/pom.xml
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
Modified: tuscany/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/META-INF/MANIFEST.MF?rev=745114&r1=745113&r2=745114&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/implementation-web/META-INF/MANIFEST.MF Tue Feb 17
15:19:07 2009
@@ -1,10 +1,6 @@
Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.implementation.web;
-
uses:="org.apache.tuscany.sca.assembly";version="2.0.0",org.apache.tuscany.sca.imple
- mentation.java;uses:="org.apache.tuscany.sca.assembly,org.apache.tusc
- any.sca.implementation.java.introspect,org.apache.tuscany.sca.core,or
- g.apache.tuscany.sca.policy,org.apache.tuscany.sca.interfacedef.java"
- ;version="2.0.0"
+Export-Package: org.apache.tuscany.sca.implementation.web;uses:="org.apache.t
+ uscany.sca.assembly";version="2.0.0"
Private-Package: org.apache.tuscany.sca.implementation.web.impl;version="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA Web Implementation Web Model
@@ -16,9 +12,8 @@
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Implementation Web Model
Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.impl;version="2.0.0"
- org.oasisopen.sca;version="2.0.0",
- org.oasisopen.sca.annotation;version="2.0.0"
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.implementation.web;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.web
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/java/sca/modules/implementation-web/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/pom.xml?rev=745114&r1=745113&r2=745114&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-web/pom.xml Tue Feb 17 15:19:07 2009
@@ -36,27 +36,19 @@
<artifactId>tuscany-assembly</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xml</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution-xml</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-core-spi</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java?rev=745114&r1=745113&r2=745114&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
(original)
+++
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
Tue Feb 17 15:19:07 2009
@@ -22,12 +22,12 @@
import java.util.Collections;
import java.util.List;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;
import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;
import org.apache.tuscany.sca.implementation.web.WebImplementation;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
Modified:
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java?rev=745114&r1=745113&r2=745114&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
(original)
+++
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
Tue Feb 17 15:19:07 2009
@@ -28,17 +28,17 @@
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import
org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
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.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.implementation.web.WebImplementation;
import org.apache.tuscany.sca.implementation.web.WebImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-
+import
org.apache.tuscany.sca.implementation.web.impl.WebImplementationFactoryImpl;
/**
* Implements a StAX artifact processor for Web implementations.
@@ -48,12 +48,11 @@
private AssemblyFactory assemblyFactory;
private WebImplementationFactory implementationFactory;
- private Monitor monitor;
- public WebImplementationProcessor(ModelFactoryExtensionPoint
modelFactories, Monitor monitor) {
+ public WebImplementationProcessor(ExtensionPointRegistry extensionPoints) {
+ FactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
this.assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
- this.implementationFactory =
modelFactories.getFactory(WebImplementationFactory.class);
- this.monitor = monitor;
+ this.implementationFactory = new WebImplementationFactoryImpl();
}
public QName getArtifactType() {
Modified:
tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java?rev=745114&r1=745113&r2=745114&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
(original)
+++
tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
Tue Feb 17 15:19:07 2009
@@ -26,21 +26,15 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Composite;
-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.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.implementation.web.WebImplementation;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
/**
* Test reading Web implementations.
@@ -57,14 +51,7 @@
inputFactory = XMLInputFactory.newInstance();
StAXArtifactProcessorExtensionPoint staxProcessors = new
DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors,
inputFactory, null, null);
-
- ModelFactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
- AssemblyFactory assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
- SCABindingFactory scaBindingFactory =
modelFactories.getFactory(SCABindingFactory.class);
- UtilityExtensionPoint utilities =
extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- InterfaceContractMapper mapper =
utilities.getUtility(InterfaceContractMapper.class);
- IntentAttachPointTypeFactory attachPointTypeFactory =
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
- compositeBuilder = new CompositeBuilderImpl(assemblyFactory,
scaBindingFactory, attachPointTypeFactory, mapper, null);
+ compositeBuilder =
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
}
public void testReadComposite() throws Exception {
@@ -73,7 +60,7 @@
Composite composite = (Composite) staxProcessor.read(reader);
assertNotNull(composite);
- compositeBuilder.build(composite);
+ compositeBuilder.build(composite, null, null);
assertTrue(((WebImplementation)
composite.getComponents().get(0).getImplementation()).getWebURI().equals("MyWebapp"));
}
