diff options
Diffstat (limited to 'branches')
5 files changed, 1 insertions, 323 deletions
diff --git a/branches/sca-equinox/itest/validation/pom.xml b/branches/sca-equinox/itest/validation/pom.xml index 3d1d0c04f5..deb8a90f23 100644 --- a/branches/sca-equinox/itest/validation/pom.xml +++ b/branches/sca-equinox/itest/validation/pom.xml @@ -80,12 +80,6 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-osgi</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-ejb</artifactId> <version>1.4-SNAPSHOT</version> <exclusions> @@ -96,19 +90,6 @@ </exclusions> </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-osgi-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> @@ -163,4 +144,4 @@ <build> <finalName>${artifactId}</finalName> </build> -</project>
\ No newline at end of file +</project> diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java deleted file mode 100644 index 6f54ad140c..0000000000 --- a/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java +++ /dev/null @@ -1,64 +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 impl.osgi; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; -import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime; - -import domain.CustomCompositeBuilder; - -/** - * This shows how to test the Calculator service component. - */ -public class CouldNotLocateOSGiBundleTestCase extends TestCase { - - private CustomCompositeBuilder customDomain; - - @Override - protected void setUp() throws Exception - { - //OSGiTestBundles.createBundle("src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class); - - customDomain = CustomCompositeBuilder.getInstance(); - try { - customDomain.loadContribution("src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite", - "TestContribution", "src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/"); - } catch (Exception ex){ - //throw ex; - } - } - - @Override - protected void tearDown() throws Exception { - //nothing to do - OSGiRuntime.stop(); - } - - public void testCalculator() { - Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); - - assertNotNull(problem); - assertEquals("CouldNotLocateOSGiBundle", problem.getMessageId()); - } -} diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java deleted file mode 100644 index 3d75fa8ccc..0000000000 --- a/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java +++ /dev/null @@ -1,64 +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 impl.osgi; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; -import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime; - -import domain.CustomCompositeBuilder; - -/** - * This shows how to test the Calculator service component. - */ -public class MissingComponentTypeFileTestCase extends TestCase { - - private CustomCompositeBuilder customDomain; - - @Override - protected void setUp() throws Exception - { - OSGiTestBundles.createBundle("src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class); - - customDomain = CustomCompositeBuilder.getInstance(); - try { - customDomain.loadContribution("src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite", - "TestContribution", "src/main/resources/impl/osgi/MissingComponentTypeFile/"); - } catch (Exception ex){ - //throw ex; - } - } - - @Override - protected void tearDown() throws Exception { - //nothing to do - OSGiRuntime.stop(); - } - - public void testCalculator() { - Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); - - assertNotNull(problem); - assertEquals("MissingComponentTypeFile", problem.getMessageId()); - } -} diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java deleted file mode 100644 index 398c028dd8..0000000000 --- a/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java +++ /dev/null @@ -1,111 +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 impl.osgi; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.net.URL; -import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; -import java.util.zip.ZipEntry; - - -/** - * - * Utility class to create OSGi bundles - * - * @version $Rev$ $Date$ - */ -public class OSGiTestBundles { - - public static void createBundle(String jarName, - Class<?> interfaceClass, Class<?> implClass) throws Exception { - - ByteArrayOutputStream out = new ByteArrayOutputStream(); - - String EOL = System.getProperty("line.separator"); - - String packageName = interfaceClass.getPackage().getName(); - String bundleName = interfaceClass.getName(); - - String manifestStr = "Manifest-Version: 1.0" + EOL - + "Bundle-ManifestVersion: 2" + EOL + "Bundle-Name: " - + bundleName + EOL + "Bundle-SymbolicName: " + bundleName + EOL - + "Bundle-Version: " + "1.0.0" + EOL - + "Bundle-Localization: plugin" + EOL; - - StringBuilder manifestBuf = new StringBuilder(); - manifestBuf.append(manifestStr); - manifestBuf.append("Export-Package: " + packageName + EOL); - manifestBuf.append("Import-Package: org.osgi.framework" + EOL); - manifestBuf.append("Bundle-Activator: " + implClass.getName() + EOL); - - ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes()); - Manifest manifest = new Manifest(); - manifest.read(manifestStream); - - - JarOutputStream jarOut = new JarOutputStream(out, manifest); - - String interfaceClassName = interfaceClass.getName().replaceAll("\\.", - "/") - + ".class"; - - URL url = interfaceClass.getClassLoader().getResource( - interfaceClassName); - String path = url.getPath(); - - ZipEntry ze = new ZipEntry(interfaceClassName); - - jarOut.putNextEntry(ze); - FileInputStream file = new FileInputStream(path); - byte[] fileContents = new byte[file.available()]; - file.read(fileContents); - jarOut.write(fileContents); - - String implClassName = implClass.getName().replaceAll("\\.", - "/") - + ".class"; - - url = implClass.getClassLoader().getResource(implClassName); - path = url.getPath(); - - ze = new ZipEntry(implClassName); - - jarOut.putNextEntry(ze); - file = new FileInputStream(path); - fileContents = new byte[file.available()]; - file.read(fileContents); - jarOut.write(fileContents); - - file.close(); - - jarOut.close(); - out.close(); - - FileOutputStream fileOut = new FileOutputStream(jarName); - fileOut.write(out.toByteArray()); - fileOut.close(); - - - } -} diff --git a/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java deleted file mode 100644 index 117a94337a..0000000000 --- a/branches/sca-equinox/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java +++ /dev/null @@ -1,64 +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 impl.osgi; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; -import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime; - -import domain.CustomCompositeBuilder; - -/** - * This shows how to test the Calculator service component. - */ -public class PropertyShouldSpecifySRTestCase extends TestCase { - - private CustomCompositeBuilder customDomain; - - @Override - protected void setUp() throws Exception - { - OSGiTestBundles.createBundle("src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class); - - customDomain = CustomCompositeBuilder.getInstance(); - try { - customDomain.loadContribution("src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite", - "TestContribution", "src/main/resources/impl/osgi/PropertyShouldSpecifySR/"); - } catch (Exception ex){ - //throw ex; - } - } - - @Override - protected void tearDown() throws Exception { - //nothing to do - OSGiRuntime.stop(); - } - - public void testCalculator() { - Monitor monitor = customDomain.getMonitorInstance(); - Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); - - assertNotNull(problem); - assertEquals("PropertyShouldSpecifySR", problem.getMessageId()); - } -} |