Moving 1.x tags

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835157 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 809 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
new file mode 100644
index 0000000000..7daf302487
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.contribution.processor;
+
+import java.io.File;
+import java.net.URI;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProcessor;
+
+/**
+ * Folder Package Processor test case
+ * Verifies proper handle of File System structured contributions
+ * 
+ * @version $Rev$ $Date$
+ */
+public class FolderContributionPackageProcessorTestCase extends TestCase {
+    private static final String FOLDER_CONTRIBUTION = ".";
+    
+    private File contributionRoot;
+
+    @Override
+    protected void setUp() throws Exception {
+        this.contributionRoot = new File(FOLDER_CONTRIBUTION);
+    }
+    
+    public final void testProcessPackageArtifacts() throws Exception {
+        FolderContributionProcessor folderProcessor = new FolderContributionProcessor();
+
+        List<URI> artifacts = folderProcessor.getArtifacts(contributionRoot.toURL(), null);
+        assertNotNull(artifacts);
+    }
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
new file mode 100644
index 0000000000..6ed735292f
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.contribution.processor;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
+import org.apache.tuscany.sca.contribution.service.util.IOHelper;
+
+/**
+ * JAR Package Processor test case
+ * Verifies proper handle of JAR Archives contributions
+ * 
+ * @version $Rev$ $Date$
+ */
+
+public class JarContributionPackageProcessorTestCase extends TestCase {
+    private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
+    
+    @Override
+    protected void setUp() throws Exception {
+    }
+    
+    public final void testProcessPackageArtifacts() throws Exception {
+        JarContributionProcessor jarProcessor = new JarContributionProcessor();
+
+        URL jarURL = getClass().getResource(JAR_CONTRIBUTION);
+        InputStream jarStream = jarURL.openStream();
+        List<URI> artifacts = null;
+        try {
+            artifacts = jarProcessor.getArtifacts(jarURL, jarStream);
+        } finally {
+            IOHelper.closeQuietly(jarStream);
+        }
+        
+        assertNotNull(artifacts);
+    }
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
new file mode 100644
index 0000000000..d3dd49ca5f
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.processor;
+
+import java.net.URI;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+
+
+/**
+ * URL Artifact Processor Extension Point test case
+ * Verifies the right registration and lookup for processors that handle filename and file types
+ * 
+ * @version $Rev$ $Date$
+ */
+public class URLartifactProcessorExtensionPointTestCase extends TestCase {
+    URLArtifactProcessorExtensionPoint artifactProcessors;
+    
+    @Override
+    protected void setUp() throws Exception {
+        artifactProcessors = new DefaultURLArtifactProcessorExtensionPoint(null);
+        artifactProcessors.addArtifactProcessor(new FileTypeArtifactProcessor());
+        artifactProcessors.addArtifactProcessor(new FileNameArtifactProcessor());
+    }
+    
+    
+    public final void testFileTypeProcessor() {
+        URLArtifactProcessor processor = null;
+        
+        processor = artifactProcessors.getProcessor(".m1");
+        assertNotNull(processor);
+    }
+    
+    
+    public final void testFileNameProcessor() {
+        URLArtifactProcessor processor = null;
+        
+        processor = artifactProcessors.getProcessor("file.m2");
+        assertNotNull(processor);
+        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+    }
+    
+    /**
+     * Internal mock classes
+     *
+     */
+    
+    class M1 {
+        
+    }
+    
+    class M2 {
+        
+    }
+    
+    class FileTypeArtifactProcessor implements URLArtifactProcessor<M1> {
+        public FileTypeArtifactProcessor() {
+        }
+
+        public M1 read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
+            return null;
+        }
+        
+        public void resolve(M1 m1, ModelResolver resolver) throws ContributionResolveException {
+            //stub
+        }
+
+        public String getArtifactType() {
+            return ".m1";
+        }
+        
+        public Class<M1> getModelType() {
+            return M1.class;
+        }        
+    }
+    
+    class FileNameArtifactProcessor implements URLArtifactProcessor<M2> {
+        public FileNameArtifactProcessor() {
+        }
+
+        public M2 read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
+            return null;
+        }
+        
+        public void resolve(M2 m2, ModelResolver resolver) throws ContributionResolveException {
+            //stub
+        }
+
+        public String getArtifactType() {
+            return "file.m2";
+        }
+        
+        public Class<M2> getModelType() {
+            return M2.class;
+        }        
+    }
+
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
new file mode 100644
index 0000000000..510febf07a
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.resolver;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.ContributionFactory;
+import org.apache.tuscany.sca.contribution.DeployedArtifact;
+import org.apache.tuscany.sca.contribution.impl.ContributionFactoryImpl;
+import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
+
+/**
+ * Test DefaultArtifactResolver.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ArtifactResolverTestCase extends TestCase {
+    
+    private ModelResolver resolver;
+    private ContributionFactory factory;
+    
+    @Override
+    protected void setUp() throws Exception {
+        resolver = new ModelResolverImpl(getClass().getClassLoader());
+        factory = new ContributionFactoryImpl();
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+    }
+    
+    public void testResolved() {
+        Model a = new Model("a");
+        resolver.addModel(a);
+        Model x = new Model("a");
+        x = resolver.resolveModel(Model.class, x);
+        assertTrue(x == a);
+    }
+    
+    public void testUnresolved() {
+        Model x = new Model("a");
+        Model y = resolver.resolveModel(Model.class, x);
+        assertTrue(x == y);
+    }
+    
+    public void testResolveClass() {
+        ClassReference ref = new ClassReference(getClass().getName());
+        ClassReference clazz = resolver.resolveModel(ClassReference.class, ref);
+        assertTrue(clazz.getJavaClass() == getClass());
+    }
+    
+    public void testUnresolvedClass() {
+        ClassReference ref = new ClassReference("NonExistentClass");
+        ClassReference clazz = resolver.resolveModel(ClassReference.class, ref);
+        assertTrue(clazz.isUnresolved());
+        assertTrue(clazz.getJavaClass() == null);
+    }
+    
+    public void testResolvedArtifact() {
+        DeployedArtifact artifact = factory.createDeployedArtifact();
+        artifact.setURI("foo/bar");
+        resolver.addModel(artifact);
+        DeployedArtifact x = factory.createDeployedArtifact();
+        x.setURI("foo/bar");
+        x = resolver.resolveModel(DeployedArtifact.class, x);
+        assertTrue(x == artifact);
+    }
+    
+    class Model {
+        private String name;
+        
+        Model(String name) {
+            this.name = name;
+        }
+        
+        @Override
+        public int hashCode() {
+            return name.hashCode();
+        }
+        
+        @Override
+        public boolean equals(Object obj) {
+            return name.equals(((Model)obj).name);
+        }
+    }
+
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java
new file mode 100644
index 0000000000..c76c859a25
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java
@@ -0,0 +1,130 @@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.resolver;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.ContributionFactory;
+import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.DeployedArtifact;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.impl.ContributionFactoryImpl;
+
+/**
+ * Test DefaultArtifactResolver.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ExtensibleArtifactResolverTestCase extends TestCase {
+    private ExtensibleModelResolver resolver;
+    
+    private ContributionFactory factory;
+    
+    @Override
+    protected void setUp() throws Exception {
+        
+        ModelResolverExtensionPoint resolvers = new DefaultModelResolverExtensionPoint();
+        resolvers.addResolver(Model.class, TestModelResolver.class);
+        
+        ModelFactoryExtensionPoint factories = new DefaultModelFactoryExtensionPoint();
+        
+        resolver = new ExtensibleModelResolver(null, resolvers, factories);
+
+        factory = new ContributionFactoryImpl();
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+    }
+    
+    public void testResolvedDefault() {
+        OtherModel a = new OtherModel("a");
+        resolver.addModel(a);
+        OtherModel x = new OtherModel("a");
+        x = resolver.resolveModel(OtherModel.class, x);
+        assertTrue(x == a);
+    }
+
+    public void testResolvedRegisteredClass() {
+        Model a = new Model("a");
+        resolver.addModel(a);
+        Model x = new Model("a");
+        x = resolver.resolveModel(Model.class, x);
+        assertTrue(x == a);
+    }
+
+    public void testUnresolvedDefault() {
+        OtherModel x = new OtherModel("a");
+        OtherModel y = resolver.resolveModel(OtherModel.class, x);
+        assertTrue(x == y);
+    }
+    
+    public void testUnresolved() {
+        Model x = new Model("a");
+        Model y = resolver.resolveModel(Model.class, x);
+        assertTrue(x == y);
+    }
+    
+    public void testResolvedArtifact() {
+        DeployedArtifact artifact = factory.createDeployedArtifact();
+        artifact.setURI("foo/bar");
+        resolver.addModel(artifact);
+        DeployedArtifact x = factory.createDeployedArtifact();
+        x.setURI("foo/bar");
+        x = resolver.resolveModel(DeployedArtifact.class, x);
+        assertTrue(x == artifact);
+    }
+    
+    class Model {
+        private String name;
+        
+        Model(String name) {
+            this.name = name;
+        }
+        
+        @Override
+        public int hashCode() {
+            return name.hashCode();
+        }
+        
+        @Override
+        public boolean equals(Object obj) {
+            return name.equals(((Model)obj).name);
+        }
+    }
+
+    class OtherModel {
+        private String name;
+        
+        OtherModel(String name) {
+            this.name = name;
+        }
+        
+        @Override
+        public int hashCode() {
+            return name.hashCode();
+        }
+        
+        @Override
+        public boolean equals(Object obj) {
+            return name.equals(((OtherModel)obj).name);
+        }
+    }
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
new file mode 100644
index 0000000000..d0db01fc09
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.resolver;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+
+/**
+ * A default implementation of an artifact resolver, based on a map.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class TestModelResolver implements ModelResolver {
+    private static final long serialVersionUID = -7826976465762296634L;
+    
+    private Map<Object, Object> map = new HashMap<Object, Object>();
+    
+    protected Contribution contribution;
+    
+    public TestModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
+        this.contribution = contribution;
+    }
+    
+    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+        Object resolved = map.get(unresolved);
+        if (resolved != null) {
+            // Return the resolved object
+            return modelClass.cast(resolved);
+        } 
+        // Return the unresolved object
+        return unresolved;
+    }
+    
+    public void addModel(Object resolved) {
+        map.put(resolved, resolved);
+    }
+    
+    public Object removeModel(Object resolved) {
+        return map.remove(resolved);
+    }
+    
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
new file mode 100644
index 0000000000..e5e84afe7d
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.contribution.services;
+
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.ContentType;
+import org.apache.tuscany.sca.contribution.service.impl.ArtifactTypeDescriberImpl;
+
+public class ContentTypeDescriberImplTestCase extends TestCase {
+    private ArtifactTypeDescriberImpl contentTypeDescriber;
+
+    public void testResolveContentType() throws Exception {
+        URL artifactURL = getClass().getResource("/test.composite");
+        assertEquals(ContentType.COMPOSITE, contentTypeDescriber.getType(artifactURL, null));
+    }
+
+    
+    public void testResolveUnknownContentType() throws Exception {
+        URL artifactURL = getClass().getResource("/test.ext");
+        assertNull(contentTypeDescriber.getType(artifactURL, null));
+    }
+    
+    public void testDefaultContentType() throws Exception {
+        URL artifactURL = getClass().getResource("/test.ext");
+        assertEquals("application/vnd.tuscany.ext", 
+                contentTypeDescriber.getType(artifactURL, "application/vnd.tuscany.ext"));        
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        contentTypeDescriber = new ArtifactTypeDescriberImpl();
+    }
+
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java
new file mode 100644
index 0000000000..0ebee35df7
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.services;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Rev$ $Date$
+ */
+//FIXME Why is this test case all commented out? 
+public class ContributionMetadataDocumentProcessorTestCaseFIXME extends TestCase {
+
+//    private static final String VALID_XML =
+//        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
+//            + "<contribution xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\">"
+//            + "<deployable composite=\"ns:Composite1\"/>"
+//            + "<deployable composite=\"ns:Composite2\"/>"
+//            + "<import namespace=\"http://ns2\" location=\"sca://contributions/002/\"/>"
+//            + "<export namespace=\"http://ns1\"/>"
+//            + "</contribution>";
+//
+//    private static final String INVALID_XML =
+//        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
+//            + "<contribution xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\">"
+//            + "<deployable composite=\"ns:Composite1\"/>"
+//            + "<deployable composite=\"ns3:Composite1\"/>"
+//            + "<import namespace=\"http://ns2\" location=\"sca://contributions/002/\"/>"
+//            + "<export namespace=\"http://ns1\"/>"
+//            + "</contribution>";
+
+//    private XMLInputFactory xmlFactory;
+
+    @Override
+    protected void setUp() throws Exception {
+//        xmlFactory = XMLInputFactory.newInstance();
+    }
+
+    public void testLoad() throws Exception {
+//        XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(VALID_XML));
+//
+//        ContributionFactory factory = new ContributionFactoryImpl();
+//        ContributionMetadataLoaderImpl loader = 
+//            new ContributionMetadataLoaderImpl(new DefaultAssemblyFactory(), factory);
+//        Contribution contribution = factory.createContribution();
+//        contribution.setModelResolver(new ModelResolverImpl(getClass().getClassLoader()));
+//        loader.load(contribution, reader);
+//        assertNotNull(contribution);
+//        assertEquals(1, contribution.getImports().size());
+//        assertEquals(1, contribution.getExports().size());
+//        assertEquals(2, contribution.getDeployables().size());
+    }
+
+    public void testLoadInvalid() throws Exception {
+//        XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(INVALID_XML));
+//        ContributionFactory factory = new ContributionFactoryImpl();
+//        ContributionMetadataLoaderImpl loader = 
+//            new ContributionMetadataLoaderImpl(new DefaultAssemblyFactory(), factory);
+//        Contribution contribution = factory.createContribution();
+//        contribution.setModelResolver(new ModelResolverImpl(getClass().getClassLoader()));
+//        try {
+//            loader.load(contribution, reader);
+//            fail("InvalidException should have been thrown");
+//        } catch (InvalidValueException e) {
+//            assertTrue(true);
+//        }
+    }    
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
new file mode 100644
index 0000000000..8a476a86bc
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.services;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl;
+import org.apache.tuscany.sca.contribution.service.util.FileHelper;
+
+public class ContributionRepositoryTestCase extends TestCase {
+    private ContributionRepositoryImpl repository;
+
+    @Override
+    protected void setUp() throws Exception {
+        // create repository (this should re-create the root directory)
+        this.repository = new ContributionRepositoryImpl("target/repository/");
+        repository.init();
+    }
+
+    public void testStore() throws Exception {
+        String resourceLocation = "/repository/sample-calculator.jar";
+        String contribution = "sample-calculator.jar";
+        URL contributionLocation = getClass().getResource(resourceLocation);
+        InputStream contributionStream = getClass().getResourceAsStream(resourceLocation);
+        repository.store(contribution, contributionLocation, contributionStream);
+
+        URL contributionURL = repository.find(contribution);
+        assertNotNull(contributionURL);
+    }
+
+    public void testRemove() throws Exception {
+        String resourceLocation = "/repository/sample-calculator.jar";
+        String contribution = "sample-calculator.jar";
+        URL contributionLocation = getClass().getResource(resourceLocation);
+        InputStream contributionStream = getClass().getResourceAsStream(resourceLocation);
+        repository.store(contribution, contributionLocation, contributionStream);
+
+        repository.remove(contribution);
+        URL contributionURL = repository.find(contribution);
+        assertNull(contributionURL);
+    }
+
+    public void testList() throws Exception {
+        String resourceLocation = "/repository/sample-calculator.jar";
+        String contribution = "sample-calculator.jar";
+        URL contributionLocation = getClass().getResource(resourceLocation);
+        InputStream contributionStream = getClass().getResourceAsStream(resourceLocation);
+        repository.store(contribution, contributionLocation, contributionStream);
+
+        assertEquals(1, repository.list().size());
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        FileHelper.deleteDirectory(new File("target/repository"));
+    }
+}
diff --git a/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
new file mode 100644
index 0000000000..13d3e45d66
--- /dev/null
+++ b/sca-java-1.x/tags/0.99-incubating/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.contribution.services;
+
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.ContentType;
+import org.apache.tuscany.sca.contribution.service.impl.PackageTypeDescriberImpl;
+
+public class PackageTypeDescriberImplTestCase extends TestCase {
+    private PackageTypeDescriberImpl packageTypeDescriber;
+
+    public void testResolveArchivePackageType() throws Exception {
+        URL artifactURL = getClass().getResource("/deployables/sample-calculator.jar");
+        assertEquals(ContentType.JAR, this.packageTypeDescriber.getType(artifactURL, null));
+    }
+
+    public void testResolveFolderPackageType() throws Exception {
+        URL artifactURL = getClass().getResource("/deployables/");
+        assertEquals(ContentType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));
+    }
+
+    public void testResolveFolder2PackageType() throws Exception {
+        URL artifactURL = getClass().getResource("/deployables");
+        assertEquals(ContentType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));
+    }
+
+    
+    public void testResolveUnknownPackageType() throws Exception {
+        URL artifactURL = getClass().getResource("/test.ext");
+        assertNull(this.packageTypeDescriber.getType(artifactURL, null));
+    }
+    
+    public void testDefaultPackageType() throws Exception {
+        URL artifactURL = getClass().getResource("/test.ext");
+        assertEquals("application/vnd.tuscany.ext", 
+                packageTypeDescriber.getType(artifactURL, "application/vnd.tuscany.ext"));        
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        packageTypeDescriber = new PackageTypeDescriberImpl();
+    }
+
+}