You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/03/27 23:22:02 UTC
svn commit: r523084 - in
/incubator/tuscany/java/sca/runtime/services/contribution:
contribution-installer/
contribution/src/main/java/org/apache/tuscany/services/contribution/
contribution/src/test/java/org/apache/tuscany/services/contribution/processor/
Author: lresende
Date: Tue Mar 27 14:22:01 2007
New Revision: 523084
URL: http://svn.apache.org/viewvc?view=rev&rev=523084
Log:
Contribution services - updating testcase
Modified:
incubator/tuscany/java/sca/runtime/services/contribution/contribution-installer/pom.xml
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution-installer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution-installer/pom.xml?view=diff&rev=523084&r1=523083&r2=523084
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution-installer/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution-installer/pom.xml Tue Mar 27 14:22:01 2007
@@ -34,25 +34,28 @@
This library will typically be added to the application's classpath and so should
should have as few dependencies as possible and nothing from the Tuscany runtime.
-->
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
- <artifactId>contribution-framework</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
- <artifactId>contribution-contribution</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.osoa</groupId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
+ <artifactId>contribution-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.runtime.services.contribution</groupId>
+ <artifactId>contribution-contribution</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
<build>
<plugins>
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java?view=diff&rev=523084&r1=523083&r2=523084
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/main/java/org/apache/tuscany/services/contribution/ContributionServiceImpl.java Tue Mar 27 14:22:01 2007
@@ -32,6 +32,7 @@
import org.apache.tuscany.services.contribution.model.Contribution;
import org.apache.tuscany.services.contribution.util.IOHelper;
+import org.apache.tuscany.services.spi.contribution.ArtifactResolverRegistry;
import org.apache.tuscany.services.spi.contribution.ContributionException;
import org.apache.tuscany.services.spi.contribution.ContributionProcessorRegistry;
import org.apache.tuscany.services.spi.contribution.ContributionRepository;
@@ -69,16 +70,16 @@
*/
protected Map<URI, Contribution> contributionRegistry = new HashMap<URI, Contribution>();
- //protected ArtifactResolverRegistry resolverRegistry;
+ protected ArtifactResolverRegistry resolverRegistry;
public ContributionServiceImpl(@Reference
ContributionRepository repository, @Reference
- ContributionProcessorRegistry processorRegistry/*, @Reference
- ArtifactResolverRegistry resolverRegistry*/) {
+ ContributionProcessorRegistry processorRegistry, @Reference
+ ArtifactResolverRegistry resolverRegistry) {
super();
this.contributionRepository = repository;
this.processorRegistry = processorRegistry;
- //this.resolverRegistry = resolverRegistry;
+ this.resolverRegistry = resolverRegistry;
this.xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
this.contributionLoader = new ContributionLoader();
@@ -219,21 +220,13 @@
}
public <T> T resolve(URI contribution, Class<T> definitionType, String namespace, String name) {
- /*
- Contribution contributionObject = (Contribution)getContribution(contribution);
- return resolverRegistry.resolve(contributionObject, definitionType, namespace, name, null, null);
- */
-
- return null;
+ Contribution contributionObject = getContribution(contribution);
+ return resolverRegistry.resolve(contributionObject, definitionType, namespace, name, null);
}
public URL resolve(URI contribution, String namespace, URI uri, URI baseURI) {
- /*
- Contribution contributionObject = (Contribution)getContribution(contribution);
+ Contribution contributionObject = getContribution(contribution);
return resolverRegistry.resolve(contributionObject, namespace, uri.toString(), baseURI.toString());
- */
-
- return null;
}
}
Modified: incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java?view=diff&rev=523084&r1=523083&r2=523084
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/services/contribution/contribution/src/test/java/org/apache/tuscany/services/contribution/processor/JarContributionProcessorTestCase.java Tue Mar 27 14:22:01 2007
@@ -18,29 +18,59 @@
*/
package org.apache.tuscany.services.contribution.processor;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+
import junit.framework.TestCase;
+import org.apache.tuscany.services.contribution.model.Contribution;
+import org.apache.tuscany.services.contribution.model.DeployedArtifact;
+import org.apache.tuscany.services.contribution.util.IOHelper;
+import org.apache.tuscany.services.spi.contribution.ContributionProcessorRegistry;
+import org.easymock.EasyMock;
+
public class JarContributionProcessorTestCase extends TestCase {
+ private static final String CONTRIBUTION_URI = "sca://contributions/001/";
private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
-
+
+ private JarContributionProcessor jarProcessor;
+
protected void setUp() throws Exception {
super.setUp();
+
+ this.jarProcessor = new JarContributionProcessor();
}
public final void testProcessJarArtifacts() throws Exception {
- /*
- JarContributionProcessor jarContribution = new JarContributionProcessor();
ContributionProcessorRegistry mockRegistry = EasyMock.createMock(ContributionProcessorRegistry.class);
- mockRegistry.register(JarContributionProcessor.CONTENT_TYPE, jarContribution);
- EasyMock.expectLastCall().once();
+ mockRegistry.register(JarContributionProcessor.CONTENT_TYPE, jarProcessor);
+ mockRegistry.processContent((Contribution)EasyMock.anyObject(), (URI) EasyMock.anyObject(), (InputStream) EasyMock.anyObject() );
+ EasyMock.expectLastCall().anyTimes();
EasyMock.replay(mockRegistry);
- jarContribution.setContributionProcessorRegistry(mockRegistry);
- jarContribution.start();
+ jarProcessor.setContributionProcessorRegistry(mockRegistry);
+ jarProcessor.start();
EasyMock.verify(mockRegistry);
- URL jarURL = getClass().getResource(JarContributionProcessorTestCase.JAR_CONTRIBUTION);
- Contribution contribution = new Contribution(URI.create("sca://contributions/001"));
+
+
+ //start processing the jar
+ URL jarURL = getClass().getResource(JAR_CONTRIBUTION);
+ URI contributionURI = URI.create(CONTRIBUTION_URI);
+ URI artifactURI = contributionURI.resolve(JAR_CONTRIBUTION);
+
+ Contribution contribution = new Contribution(contributionURI);
contribution.setLocation(jarURL);
- jarContribution.processContent(contribution, contribution.getUri(), jarURL.openStream());
- */
+
+ DeployedArtifact artifact = new DeployedArtifact(artifactURI);
+ artifact.setLocation(jarURL);
+ contribution.addArtifact(artifact);
+
+ InputStream jarStream = jarURL.openStream();
+
+ try{
+ jarProcessor.processContent(contribution, contributionURI.resolve(JAR_CONTRIBUTION), jarStream);
+ }finally{
+ IOHelper.closeQuietly(jarStream);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org