From b003942c4e5046a2a480d1db7d49f1936c4e0f6c Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 30 Oct 2009 12:03:25 +0000 Subject: Delete tag and redo as it had a duff global change when updating the version from snapshot to 2.0-M4 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831277 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/hello/deployer/HelloWorld.java | 30 ----- .../test/java/hello/deployer/HelloWorldImpl.java | 30 ----- .../sca/deployment/impl/DeployerImplTestCase.java | 135 --------------------- .../test/resources/META-INF/sca-contribution.xml | 24 ---- .../sca/deployment/impl/HelloWorld.composite | 29 ----- 5 files changed, 248 deletions(-) delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorld.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite (limited to 'tags/java/sca/2.0-M4-RC1/modules/deployment/src/test') diff --git a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorld.java b/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorld.java deleted file mode 100644 index 2480a5e4d9..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorld.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 hello.deployer; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * HelloWorld interface - */ -@Remotable -public interface HelloWorld { - String hello(String name); -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java b/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java deleted file mode 100644 index fc81dc2167..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.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 hello.deployer; - -/** - * HelloWorldImpl - */ -public class HelloWorldImpl implements HelloWorld { - public String hello(String name) { - System.out.println("Hello: " + name); - return "Hello, " + name; - } -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java b/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java deleted file mode 100644 index cc2bf92dcf..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java +++ /dev/null @@ -1,135 +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.deployment.impl; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.StringWriter; -import java.io.Writer; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Arrays; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.monitor.Monitor; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * - */ -public class DeployerImplTestCase { - private static ExtensionPointRegistry registry; - private static Deployer deployer; - - private static URL contributionURL; - private static URL compositeURL; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - compositeURL = DeployerImplTestCase.class.getResource("HelloWorld.composite"); - contributionURL = new URL(compositeURL, "../"); - registry = new DefaultExtensionPointRegistry(); - deployer = new DeployerImpl(registry); - deployer.start(); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - deployer.stop(); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#build(java.util.List, java.util.Map, org.apache.tuscany.sca.monitor.Monitor)}. - */ - @Test - public void testBuild() throws Exception { - Monitor monitor = deployer.createMonitor(); - Contribution contribution = deployer.loadContribution(contributionURL.toURI(), contributionURL, monitor); - Composite composite = deployer.build(Arrays.asList(contribution), null, monitor); - assertTrue(composite != null); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#loadArtifact(java.net.URI, java.net.URL, org.apache.tuscany.sca.monitor.Monitor)}. - */ - @Test - public void testLoadArtifact() throws Exception { - Monitor monitor = deployer.createMonitor(); - Artifact artifact = deployer.loadArtifact(compositeURL.toURI(), compositeURL, monitor); - assertTrue(artifact.getModel() instanceof Composite); - Composite composite = artifact.getModel(); - assertEquals(composite.getName(), new QName("http://sample/composite", "HelloWorld1")); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#loadDocument(java.net.URI, java.net.URL, org.apache.tuscany.sca.monitor.Monitor)}. - */ - @Test - public void testLoadDocument() throws Exception { - Monitor monitor = deployer.createMonitor(); - Composite composite = deployer.loadDocument(compositeURL.toURI(), compositeURL, monitor); - assertEquals(composite.getName(), new QName("http://sample/composite", "HelloWorld1")); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#loadXMLDocument(java.net.URL, org.apache.tuscany.sca.monitor.Monitor)}. - */ - @Test - public void testLoadXMLDocumentURLMonitor() throws Exception { - Monitor monitor = deployer.createMonitor(); - Composite composite = deployer.loadXMLDocument(compositeURL, monitor); - assertEquals(composite.getName(), new QName("http://sample/composite", "HelloWorld1")); - Writer sw = new StringWriter(); - deployer.saveXMLDocument(composite, sw, monitor); - assertTrue(sw.toString() != null); - } - - /** - * Test method for {@link org.apache.tuscany.sca.deployment.impl.DeployerImpl#loadContribution(java.net.URI, java.net.URL, org.apache.tuscany.sca.monitor.Monitor)}. - * @throws URISyntaxException - * @throws ContributionReadException - */ - @Test - public void testLoadContribution() throws Exception { - Monitor monitor = deployer.createMonitor(); - Contribution contribution = deployer.loadContribution(contributionURL.toURI(), contributionURL, monitor); - Composite composite = contribution.getDeployables().get(0); - assertEquals(composite.getName(), new QName("http://sample/composite", "HelloWorld1")); - assertTrue(contribution.getArtifacts().size() >= 2); - } - -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/resources/META-INF/sca-contribution.xml b/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/resources/META-INF/sca-contribution.xml deleted file mode 100644 index f00e00a373..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite b/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite deleted file mode 100644 index b4fee2c7a6..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - -- cgit v1.2.3