Moving 1.x branches

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

6 files changed, 0 insertions, 181 deletions

diff --git a/branches/sca-java-integration/testing/sca/itest/contribution/pom.xml b/branches/sca-java-integration/testing/sca/itest/contribution/pom.xml
deleted file mode 100644
index 5da30f99d8..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/contribution/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

--->

-<project>

-    <parent>

-        <groupId>org.apache.tuscany.testing</groupId>

-        <artifactId>sca-itest</artifactId>

-        <version>0.1-integration-incubating-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <modelVersion>4.0.0</modelVersion>

-    <artifactId>iTest-Contribution</artifactId>

-    <version>SNAPSHOT</version>

-    <packaging>jar</packaging>

-    <name>Test Suite for SCA Contribution</name>

-

-</project>

diff --git a/branches/sca-java-integration/testing/sca/itest/contribution/src/main/resources/META-INF/sca/application.composite b/branches/sca-java-integration/testing/sca/itest/contribution/src/main/resources/META-INF/sca/application.composite
deleted file mode 100644
index 2b5153a28a..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/contribution/src/main/resources/META-INF/sca/application.composite
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

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

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-	   xmlns:foo="http://foo" 

-           name="ContributionTest">

-   

-</composite>

diff --git a/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionDirectoryWatcherTestCase.java b/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionDirectoryWatcherTestCase.java
deleted file mode 100644
index 466ba18c78..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionDirectoryWatcherTestCase.java
+++ /dev/null
@@ -1,41 +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.test.contribution;

-

-import org.apache.tuscany.core.services.deployment.ContributionDirectoryWatcher;

-import org.apache.tuscany.spi.annotation.Autowire;

-import org.apache.tuscany.test.SCATestCase;

-

-/**

- * This is more intended to be a integration test then a unit test. *

- */

-public class ContributionDirectoryWatcherTestCase extends SCATestCase {

-    @Autowire

-    private ContributionDirectoryWatcher contributionDirectoryWatcher; // NOPMD

-    

-    protected void setUp() throws Exception {

-        super.setUp();

-    }

-

-    public void testContributeURL() throws Exception {

-

-    }

-

-}

diff --git a/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
deleted file mode 100644
index 2bd9de672a..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ /dev/null
@@ -1,83 +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.test.contribution;

-

-import java.io.File;

-import java.net.URI;

-import java.net.URL;

-

-import org.apache.tuscany.api.SCARuntime;

-import org.apache.tuscany.core.bootstrap.DefaultSCARuntime;

-import org.apache.tuscany.core.util.FileHelper;

-import org.apache.tuscany.host.deployment.ContributionService;

-import org.apache.tuscany.spi.bootstrap.ComponentNames;

-import org.apache.tuscany.spi.model.Contribution;

-import org.apache.tuscany.test.SCATestCase;

-

-/**

- * This is more intended to be a integration test then a unit test. *

- */

-public class ContributionServiceTestCase extends SCATestCase {

-    private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";

-    private static final String FOLDER_CONTRIBUTION = "/repository/calculator/";

-

-    private ContributionService contributionService;

-

-    protected void setUp() throws Exception {

-        super.setUp();

-        

-        this.contributionService = (ContributionService) ((DefaultSCARuntime)SCARuntime.getInstance()).getSystemService(ComponentNames.TUSCANY_CONTRIBUTION_SERVICE);

-    }

-

-    public void testContributeJAR() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        URI contributionId = contributionService.contribute(contributionLocation, false);

-        assertNotNull(contributionId);

-    }

-

-    public void testStoreContributionInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        URI contributionId = contributionService.contribute(contributionLocation, true);

-

-        assertNotNull(contributionId);

-

-        Contribution contributionModel = (Contribution) contributionService.getContribution(contributionId);

-        

-        File contributionFile = FileHelper.toFile(contributionModel.getLocation());

-        assertTrue(contributionFile.exists());

-    }

-    

-    public void testStoreDuplicatedContributionInRepository() throws Exception {

-        URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);

-        URI contributionId1 = contributionService.contribute(contributionLocation, true);

-        assertNotNull(contributionId1);

-        URI contributionId2 = contributionService.contribute(contributionLocation, true);

-        assertNotNull(contributionId2);

-    }

-    

-    

-//    public void testContributeFolder() throws Exception {

-//        File rootContributionFolder = new File(FOLDER_CONTRIBUTION);

-//        

-//        URI contributionURI = contributionService.contribute(rootContributionFolder.toURL(), false);

-//        assertNotNull(contributionURI);

-//    }

-

-}

diff --git a/branches/sca-java-integration/testing/sca/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/branches/sca-java-integration/testing/sca/itest/contribution/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ /dev/null
diff --git a/branches/sca-java-integration/testing/sca/itest/contribution/src/test/resources/repository/sample-calculator.jar b/branches/sca-java-integration/testing/sca/itest/contribution/src/test/resources/repository/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ /dev/null