Deleted modules moved under the modules directory.

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

2 files changed, 0 insertions, 144 deletions

diff --git a/branches/sca-android/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/branches/sca-android/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
deleted file mode 100644
index 6d33db5810..0000000000
--- a/branches/sca-android/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*

- * 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 javax.xml.stream.XMLInputFactory;

-

-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/", XMLInputFactory.newInstance());

-        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/branches/sca-android/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/branches/sca-android/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
deleted file mode 100644
index 124a3a8b1b..0000000000
--- a/branches/sca-android/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*

- * 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.PackageType;

-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(PackageType.JAR, this.packageTypeDescriber.getType(artifactURL, null));

-    }

-

-    public void testResolveFolderPackageType() throws Exception {

-        URL artifactURL = getClass().getResource("/deployables/");

-        assertEquals(PackageType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));

-    }

-

-    public void testResolveFolder2PackageType() throws Exception {

-        URL artifactURL = getClass().getResource("/deployables");

-        assertEquals(PackageType.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();

-    }

-

-}