summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-03-16 23:42:13 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-03-16 23:42:13 +0000
commitc3a25512d429a56b04df984aa868170c7558bf69 (patch)
treeadc1a7d76d44f0fed4eec0cff3392d9aef6d888d
parentd4031259e8e887baf50feacd72bf1e57de175109 (diff)
Remove the unused files
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@755048 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java180
-rw-r--r--java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java50
-rw-r--r--java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java32
-rw-r--r--java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java10
4 files changed, 0 insertions, 272 deletions
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
deleted file mode 100644
index 6d55f6b7ec..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
+++ /dev/null
@@ -1,180 +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.implementation.osgi.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.Constants;
-
-/**
- *
- * Utility class to create OSGi bundles
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTestBundles {
- private static String getPackageName(Class<?> cls) {
- String name = cls.getName();
- int index = name.lastIndexOf('.');
- return index == -1 ? "" : name.substring(0, index);
- }
-
- public static URL createBundle(String jarName, String mfFile, String[] resources, Class<?>... classes)
- throws IOException {
- InputStream is = OSGiTestBundles.class.getClassLoader().getResourceAsStream(mfFile);
- Manifest manifest = new Manifest(is);
- is.close();
-
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
- for (Class<?> cls : classes) {
- addClass(jarOut, cls);
- }
-
- if (resources != null) {
- for (String resource : resources) {
- addResource(jarOut, OSGiTestBundles.class.getClassLoader(), resource);
- }
- }
-
- jarOut.close();
- out.close();
-
- File jar = new File(jarName);
- FileOutputStream fileOut = new FileOutputStream(jar);
- fileOut.write(out.toByteArray());
- fileOut.close();
-
- return jar.toURI().toURL();
- }
-
- public static URL createBundle(String jarName,
- String bundleName,
- String exports,
- String imports,
- String[] resources,
- Class<?>... classes) throws IOException {
-
- Class<?> activator = null;
- Set<String> packages = new HashSet<String>();
- StringBuffer exportPackages = new StringBuffer();
- if (exports != null) {
- exportPackages.append(exports);
- }
- for (Class<?> cls : classes) {
- if (BundleActivator.class.isAssignableFrom(cls)) {
- activator = cls;
- }
- if (exports == null && cls.isInterface()) {
- String pkg = getPackageName(cls);
- if (packages.add(pkg)) {
- exportPackages.append(pkg).append(",");
- }
- }
- }
- int len = exportPackages.length();
- if (len > 0 && exportPackages.charAt(len - 1) == ',') {
- exportPackages.deleteCharAt(len - 1);
- }
-
- Manifest manifest = new Manifest();
- // This attribute Manifest-Version is required so that the MF will be added to the jar
- manifest.getMainAttributes().putValue("Manifest-Version", "1.0");
- manifest.getMainAttributes().putValue(Constants.BUNDLE_MANIFESTVERSION, "2");
- manifest.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, bundleName);
- manifest.getMainAttributes().putValue(Constants.BUNDLE_VERSION, "1.0.0");
- manifest.getMainAttributes().putValue(Constants.BUNDLE_NAME, bundleName);
- manifest.getMainAttributes().putValue(Constants.EXPORT_PACKAGE, exportPackages.toString());
- StringBuffer importPackages = new StringBuffer();
- if (imports != null) {
- importPackages.append(imports).append(",org.osgi.framework");
- } else {
- importPackages.append("org.osgi.framework");
- }
- manifest.getMainAttributes().putValue(Constants.IMPORT_PACKAGE, importPackages.toString());
-
- if (activator != null) {
- manifest.getMainAttributes().putValue(Constants.BUNDLE_ACTIVATOR, activator.getName());
- }
-
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
- for (Class<?> cls : classes) {
- addClass(jarOut, cls);
- }
-
- if (resources != null) {
- for (String resource : resources) {
- addResource(jarOut, OSGiTestBundles.class.getClassLoader(), resource);
- }
- }
-
- jarOut.close();
- out.close();
-
- File jar = new File(jarName);
- FileOutputStream fileOut = new FileOutputStream(jar);
- fileOut.write(out.toByteArray());
- fileOut.close();
-
- return jar.toURI().toURL();
- }
-
- private static void addClass(JarOutputStream jarOut, Class<?> javaClass) throws IOException, FileNotFoundException {
- String classFile = javaClass.getName().replace('.', '/') + ".class";
- URL url = javaClass.getResource(javaClass.getSimpleName() + ".class");
- addEntry(jarOut, url, classFile);
- }
-
- private static void addResource(JarOutputStream jarOut, ClassLoader cl, String resourceName) throws IOException,
- FileNotFoundException {
- URL url = cl.getResource(resourceName);
- addEntry(jarOut, url, resourceName);
- }
-
- private static void addEntry(JarOutputStream jarOut, URL url, String resourceName) throws IOException,
- FileNotFoundException {
- String path = url.getPath();
-
- ZipEntry ze = new ZipEntry(resourceName);
-
- jarOut.putNextEntry(ze);
- FileInputStream file = new FileInputStream(path);
- byte[] fileContents = new byte[file.available()];
- file.read(fileContents);
- jarOut.write(fileContents);
- jarOut.closeEntry();
- }
-}
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
deleted file mode 100644
index f6db6edc12..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
+++ /dev/null
@@ -1,50 +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.implementation.osgi.test;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- *
- * Test class - Implementation of an OSGi service
- *
- * @version $Rev$ $Date$
- */
-public class OSGiTestImpl implements OSGiTestInterface, BundleActivator {
-
- public String testService() {
-
- return OSGiTestImpl.class.getName();
-
- }
-
- public void start(BundleContext bc) throws Exception {
-
- bc.registerService(OSGiTestInterface.class.getName(), this, new Hashtable<String, Object>());
-
- }
-
- public void stop(BundleContext bc) throws Exception {
- }
-
-}
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
deleted file mode 100644
index 499ec8082e..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
+++ /dev/null
@@ -1,32 +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.implementation.osgi.test;
-
-/**
- *
- * Test class - Interface for an OSGi service
- *
- * @version $Rev$ $Date$
- */
-public interface OSGiTestInterface {
-
- String testService() throws Exception;
-
-}
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 4573bdb1f0..511356c90b 100644
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
@@ -41,9 +41,6 @@ import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.implementation.osgi.OSGiImplementation;
import org.apache.tuscany.sca.implementation.osgi.OSGiProperty;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestBundles;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestImpl;
-import org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -70,13 +67,6 @@ public class OSGiReadImplTestCase {
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class)
.getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
- OSGiTestBundles.createBundle("target/test-classes/OSGiTestService.jar",
- "osgi.test",
- null,
- null,
- (String[]) null,
- OSGiTestImpl.class, OSGiTestInterface.class);
-
}
@Test