From 07b7dfd1a70ba222b899d9813f8c449dbf3b785f Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:28 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835124 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-1.1/itest/contribution/pom.xml | 45 ------ .../src/main/java/calculator/AddService.java | 25 --- .../src/main/java/calculator/AddServiceImpl.java | 30 ---- .../src/main/java/calculator/CalculatorClient.java | 46 ------ .../main/java/calculator/CalculatorService.java | 35 ----- .../java/calculator/CalculatorServiceImpl.java | 70 --------- .../src/main/java/calculator/DivideService.java | 25 --- .../main/java/calculator/DivideServiceImpl.java | 30 ---- .../src/main/java/calculator/MultiplyService.java | 25 --- .../main/java/calculator/MultiplyServiceImpl.java | 30 ---- .../src/main/java/calculator/SubtractService.java | 25 --- .../main/java/calculator/SubtractServiceImpl.java | 30 ---- .../src/main/resources/ContributionTest.composite | 24 --- .../main/resources/calculator/Calculator.composite | 51 ------ .../main/resources/calculator/sca-contribution.xml | 24 --- .../contribution/ContributionServiceTestCase.java | 175 --------------------- .../resources/deployables/sample-calculator.jar | Bin 26901 -> 0 bytes .../resources/repository/sample-calculator.jar | Bin 26901 -> 0 bytes 18 files changed, 690 deletions(-) delete mode 100644 branches/sca-java-1.1/itest/contribution/pom.xml delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/AddService.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorClient.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorService.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/DivideService.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/MultiplyService.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/SubtractService.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/resources/ContributionTest.composite delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/resources/calculator/Calculator.composite delete mode 100644 branches/sca-java-1.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml delete mode 100644 branches/sca-java-1.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java delete mode 100644 branches/sca-java-1.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar delete mode 100644 branches/sca-java-1.1/itest/contribution/src/test/resources/repository/sample-calculator.jar (limited to 'branches/sca-java-1.1/itest/contribution') diff --git a/branches/sca-java-1.1/itest/contribution/pom.xml b/branches/sca-java-1.1/itest/contribution/pom.xml deleted file mode 100644 index 9bc6521d8f..0000000000 --- a/branches/sca-java-1.1/itest/contribution/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution - Apache Tuscany SCA Contribution Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.1-incubating-SNAPSHOT - - - - diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/AddService.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 6392676e76..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,25 +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 calculator; - -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index e9c635e3c8..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,30 +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 calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - return n1 + n2; - } - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 40ca4d9b0f..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,46 +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 calculator; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - - SCADomain domain = SCADomain.newInstance("Calculator.composite"); - - CalculatorService calculatorService = domain.getService(CalculatorService.class, - "CalculatorServiceComponent"); - - // Calculate - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - domain.close(); - - } - -} \ No newline at end of file diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorService.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index ad87375529..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,35 +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 calculator; - - -/** - * The Calculator service interface. - */ -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index ae4ed12b7b..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,70 +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 calculator; - -import org.osoa.sca.annotations.Reference; - - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - @Reference - public void setAddService(AddService addService) { - this.addService = addService; - } - - @Reference - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - @Reference - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - @Reference - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - public double add(double n1, double n2) { - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divideService.divide(n1, n2); - } - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/DivideService.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index 3158458b5e..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,25 +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 calculator; - -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 8c33862f6d..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,30 +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 calculator; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/MultiplyService.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 62db05175e..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,25 +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 calculator; - -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c7fbc73c00..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,30 +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 calculator; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/SubtractService.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 309f88f098..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,25 +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 calculator; - -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1a7f145ad8..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,30 +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 calculator; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - return n1 - n2; - } - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/main/resources/ContributionTest.composite b/branches/sca-java-1.1/itest/contribution/src/main/resources/ContributionTest.composite deleted file mode 100644 index d814e439e2..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/resources/ContributionTest.composite +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.1/itest/contribution/src/main/resources/calculator/Calculator.composite b/branches/sca-java-1.1/itest/contribution/src/main/resources/calculator/Calculator.composite deleted file mode 100644 index 657a2f95d8..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/resources/calculator/Calculator.composite +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/branches/sca-java-1.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml deleted file mode 100644 index e95796d83a..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/branches/sca-java-1.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java deleted file mode 100644 index 946f505ead..0000000000 --- a/branches/sca-java-1.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java +++ /dev/null @@ -1,175 +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.io.InputStream; -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.DeployedArtifact; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.contribution.service.util.FileHelper; -import org.apache.tuscany.sca.contribution.service.util.IOHelper; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * This is more intended to be a integration test then a unit test. * - */ -public class ContributionServiceTestCase extends TestCase { - private static final String CONTRIBUTION_001_ID = "contribution001/"; - private static final String CONTRIBUTION_002_ID = "contribution002/"; - private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar"; - private static final String FOLDER_CONTRIBUTION = "target/classes/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - public void testContributeJAR() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - //URL contributionLocation = new URL("file:/D:/dev/Opensource/Apache/Tuscany/source/java/sca/samples/calculator/target/sample-calculator.jar"); - String contributionId = CONTRIBUTION_001_ID; - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId, contributionLocation, resolver, false); - assertNotNull(contributionService.getContribution(contributionId)); - } - - public void testStoreContributionPackageInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId, contributionLocation, resolver, true); - - assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation())) - .exists()); - - assertNotNull(contributionId); - - Contribution contributionModel = contributionService.getContribution(contributionId); - - File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation())); - assertTrue(contributionFile.exists()); - } - - public void testStoreContributionStreamInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - - InputStream contributionStream = contributionLocation.openStream(); - try { - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId, contributionLocation, contributionStream, resolver); - } finally { - IOHelper.closeQuietly(contributionStream); - } - - assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation())) - .exists()); - - assertNotNull(contributionId); - - Contribution contributionModel = contributionService.getContribution(contributionId); - - File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation())); - assertTrue(contributionFile.exists()); - } - - public void testStoreDuplicatedContributionInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId1 = CONTRIBUTION_001_ID; - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId1, contributionLocation, resolver, true); - assertNotNull(contributionService.getContribution(contributionId1)); - String contributionId2 = CONTRIBUTION_002_ID; - ModelResolver resolver2 = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId2, contributionLocation, resolver2, true); - assertNotNull(contributionService.getContribution(contributionId2)); - } - - public void testContributeFolder() throws Exception { - File rootContributionFolder = new File(FOLDER_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - //first rename the sca-contribution metadata file - //File calculatorMetadataFile = new File("target/classes/calculator/sca-contribution.xml"); - //File metadataDirectory = new File("target/classes/META-INF/"); - //if (!metadataDirectory.exists()) { - // FileHelper.forceMkdir(metadataDirectory); - //} - //FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory); - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId, rootContributionFolder.toURL(), resolver, false); - assertNotNull(contributionService.getContribution(contributionId)); - } - - public void testAddDeploymentComposites() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - Contribution contribution = contributionService.contribute(contributionId, contributionLocation, resolver, false); - assertNotNull(contributionService.getContribution(contributionId)); - - String artifactId = "contributionComposite.composite"; - Composite composite = (new DefaultAssemblyFactory()).createComposite(); - composite.setName(new QName(null, "contributionComposite")); - composite.setURI("contributionComposite.composite"); - - contributionService.addDeploymentComposite(contribution, composite); - - List deployables = contributionService.getContribution(contributionId).getDeployables(); - Composite composite1 = (Composite)deployables.get(deployables.size() - 1); - assertEquals("contributionComposite", composite1.getName().toString()); - - DeployedArtifact artifact = null; - contribution = contributionService.getContribution(contributionId); - String id = artifactId.toString(); - for (DeployedArtifact a : contribution.getArtifacts()) { - if (id.equals(a.getURI())) { - artifact = a; - break; - } - } - Composite composite2 = (Composite)artifact.getModel(); - assertEquals("contributionComposite", composite2.getName().toString()); - } - -} diff --git a/branches/sca-java-1.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/branches/sca-java-1.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar deleted file mode 100644 index 0ca3a1b781..0000000000 Binary files a/branches/sca-java-1.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar and /dev/null differ diff --git a/branches/sca-java-1.1/itest/contribution/src/test/resources/repository/sample-calculator.jar b/branches/sca-java-1.1/itest/contribution/src/test/resources/repository/sample-calculator.jar deleted file mode 100644 index 0ca3a1b781..0000000000 Binary files a/branches/sca-java-1.1/itest/contribution/src/test/resources/repository/sample-calculator.jar and /dev/null differ -- cgit v1.2.3