diff options
Diffstat (limited to 'branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test')
23 files changed, 0 insertions, 2107 deletions
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/pom.xml deleted file mode 100644 index fa1ace68ac..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/pom.xml +++ /dev/null @@ -1,99 +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>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-osgi-tuscany-test</artifactId>
- <name>Apache Tuscany OSGi-Based Tuscany Runtime Tests</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <version>3.3.2.R33x_v20080105</version>
- </dependency>
-
-
-<!-- Uncomment this section and comment out the Equinox dependency above to run tests using Felix.
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>1.0.2</version>
- </dependency>
-
-End Felix dependencies -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>ops4j-repository</id>
- <url>http://repository.ops4j.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
-</project>
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java deleted file mode 100644 index 2e3137239e..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java +++ /dev/null @@ -1,92 +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.osgi.runtime.impl; - -import java.lang.reflect.Method; - -import org.osgi.framework.BundleContext; - -public class EquinoxTestRuntime extends OSGiTestRuntime { - - - private static BundleContext bundleContext; - - private static EquinoxTestRuntime instance; - - private static Class<?> eclipseStarterClass; - - public static OSGiTestRuntime getInstance() throws Exception { - if (instance == null) { - eclipseStarterClass = EquinoxTestRuntime.class.getClassLoader().loadClass("org.eclipse.core.runtime.adaptor.EclipseStarter"); - EquinoxTestRuntime runtime = new EquinoxTestRuntime(); - instance = runtime; - } - return instance; - } - - - protected BundleContext startRuntime() throws Exception { - - if (bundleContext != null) - return bundleContext; - - Method startupMethod = eclipseStarterClass.getMethod("startup", String [].class, Runnable.class); - - System.setProperty("org.osgi.framework.system.packages", getSystemPackages()); - // Equinox version 3.2 upwards have a startup method which returns BundleContext - bundleContext = (BundleContext) startupMethod.invoke(null, - new String[] {/*"-clean", */"-console", "-configuration", "target/configuration"}, - null ); - - return bundleContext; - - } - - @Override - public BundleContext getBundleContext() { - return bundleContext; - } - - @Override - protected void setBundleContext(BundleContext bundleContext) { - super.setBundleContext(bundleContext); - EquinoxTestRuntime.bundleContext = bundleContext; - } - - @Override - public void shutdown() throws Exception { - - if (bundleContext == null) - return; - bundleContext = null; - instance = null; - if (eclipseStarterClass != null) { - Method shutdownMethod = eclipseStarterClass.getMethod("shutdown"); - try { - shutdownMethod.invoke(eclipseStarterClass); - } catch (Exception e) { - // Ignore errors. - } - } - super.shutdown(); - } - - - -} diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java deleted file mode 100644 index 0dafffdb8c..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java +++ /dev/null @@ -1,163 +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.osgi.runtime.impl;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class FelixTestRuntime extends OSGiTestRuntime implements BundleActivator {
-
- private static BundleContext bundleContext;
-
- private static FelixTestRuntime instance;
-
- private static Bundle felix;
-
-
- public static OSGiTestRuntime getInstance() throws Exception {
- if (instance == null) {
-
- FelixTestRuntime runtime = new FelixTestRuntime();
- instance = runtime;
- }
- return instance;
- }
-
-
-// private void deleteDirectory(File dir) {
-// File[] files = dir.listFiles();
-// for (int i = 0; i < files.length; i++) {
-// if (files[i].isDirectory())
-// deleteDirectory(files[i]);
-// else {
-// files[i].delete();
-// }
-// }
-// dir.delete();
-//
-// }
-
-// private void deleteProfile() {
-// String profileDirName = System.getProperty("felix.cache.profiledir");
-// if (profileDirName == null) profileDirName = ".felix";
-// File profileDir = new File(profileDirName);
-// if (profileDir.isDirectory())
-// deleteDirectory(profileDir);
-// else
-// profileDir.delete();
-// }
-
- protected BundleContext startRuntime() throws Exception {
-
- if (bundleContext != null)
- return bundleContext;
-
- ClassLoader cl = this.getClass().getClassLoader();
- Class<?> felixMainClass = cl.loadClass("org.apache.felix.main.Main");
- Class<?> felixClass = cl.loadClass("org.apache.felix.framework.Felix");
- Method propsMethod = felixMainClass.getMethod("loadConfigProperties");
- Properties props = (Properties)propsMethod.invoke(null);
-
- //deleteProfile();
- // Create profile directory
- String profileDirName = System.getProperty("felix.cache.profiledir");
- if (profileDirName == null) profileDirName = ".felix";
- File profileDir = new File(profileDirName);
- profileDir.mkdir();
-
- props.put("felix.cache.profiledir", profileDir.getAbsolutePath());
- props.put("felix.embedded.execution", "true");
- String systemPackages = getSystemPackages() +
- ", org.apache.felix.main";
-
-
- props.put("org.osgi.framework.system.packages", systemPackages);
-
- Constructor felixConstructor = felixClass.getConstructor(Map.class, List.class);
- List<BundleActivator> activators = new ArrayList<BundleActivator>();
-
- Class<?> autoActivatorClass = cl.loadClass("org.apache.felix.main.AutoActivator");
- Constructor autoActivatorConstructor = autoActivatorClass.getConstructor(Map.class);
- BundleActivator autoActivator = (BundleActivator)autoActivatorConstructor.newInstance(props);
- activators.add(autoActivator);
- felix = (Bundle)felixConstructor.newInstance(props, activators);
- felix.start();
- bundleContext = felix.getBundleContext();
-
- return bundleContext;
-
- }
-
- public void start(BundleContext context) throws Exception {
-
- bundleContext = context;
- synchronized (this) {
- this.notify();
- }
- }
-
- public void stop(BundleContext context) throws Exception {
- bundleContext = null;
- }
-
-
-
- @Override
- public BundleContext getBundleContext() {
- return bundleContext;
- }
-
- @Override
- protected void setBundleContext(BundleContext bundleContext) {
- super.setBundleContext(bundleContext);
- FelixTestRuntime.bundleContext = bundleContext;
- }
-
-
- @Override
- public void shutdown() throws Exception {
-
- if (bundleContext == null)
- return;
-
- bundleContext = null;
- instance = null;
-
- felix.stop();
- int retries = 50;
- synchronized (felix) {
- while (retries-- > 0 && felix.getState() != Bundle.UNINSTALLED) {
- felix.wait(100);
- }
- }
-
- super.shutdown();
- }
-
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java deleted file mode 100644 index 6356718fe5..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java +++ /dev/null @@ -1,163 +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.osgi.runtime.impl;
-
-import java.lang.reflect.Method;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-
-public abstract class OSGiTestRuntime {
-
- public abstract BundleContext getBundleContext();
-
- protected abstract BundleContext startRuntime() throws Exception;
-
- private static OSGiTestRuntime instance;
-
- private BundleContext bundleContext;
-
-
- /**
- * System property org.apache.tuscany.implementation.osgi.runtime.OSGiRuntime can be set to the
- * name of the OSGiRuntime class (eg. EquinoxRuntime). If set, start this runtime and return the
- * system bundlecontext. If not set, start Felix from the classpath.
- *
- * @throws BundleException
- */
- public synchronized static OSGiTestRuntime findRuntime() throws Exception {
- if (instance != null) {
- return instance;
- }
- String runtimeClassName = System.getProperty(OSGiTestRuntime.class.getName());
-
- if (instance != null)
- return instance;
-
- if (runtimeClassName != null) {
- try {
- Class<?> runtimeClass = OSGiTestRuntime.class.getClassLoader().loadClass(runtimeClassName);
- Method method = runtimeClass.getMethod("getInstance");
- instance = (OSGiTestRuntime) method.invoke(null);
- return instance;
-
- } catch (Exception e) {
- throw new BundleException("Could not start OSGi runtime " + runtimeClassName, e);
- }
- }
-
- try {
- instance = EquinoxTestRuntime.getInstance();
- } catch (Throwable e) {
- instance = FelixTestRuntime.getInstance();
- }
-
- return instance;
-
- }
-
-
- public synchronized static OSGiTestRuntime getRuntime() throws Exception {
-
- instance = findRuntime();
-
- if (instance != null) {
-
- if (instance.bundleContext == null) {
- instance.startRuntime();
- instance.bundleContext = instance.getBundleContext();
- }
- return instance;
- }
- return instance;
- }
-
-
- public void shutdown() throws Exception {
-
- bundleContext = null;
- if (this == instance)
- instance = null;
- }
-
- protected void setBundleContext(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
-
- /**
- * @return the instance
- */
- public synchronized static void stop() throws Exception {
- if (instance != null) {
- instance.shutdown();
- instance = null;
- }
- }
-
-
- /**
- * @return the list of packages to be exported by the system bundle
- */
- protected String getSystemPackages() {
- String systemPackages =
- "org.osgi.framework; version=1.3.0," +
- "org.osgi.service.packageadmin; version=1.2.0, " +
- "org.osgi.service.startlevel; version=1.0.0, " +
- "org.osgi.service.url; version=1.0.0, " +
- "org.osgi.util.tracker; version=1.3.2, " +
- "javax.xml, " +
- "javax.xml.datatype, " +
- "javax.xml.namespace, " +
- "javax.xml.parsers, " +
- "javax.xml.transform, " +
- "javax.xml.transform.dom, " +
- "javax.xml.transform.sax, " +
- "javax.xml.transform.stream, " +
- "javax.xml.validation, " +
- "javax.xml.xpath, " +
- "javax.sql," +
- "org.w3c.dom, " +
- "org.w3c.dom.bootstrap, " +
- "org.w3c.dom.ls, " +
- "org.xml.sax, " +
- "org.xml.sax.ext, " +
- "org.xml.sax.helpers, " +
- "javax.security.auth, " +
- "javax.security.auth.login, " +
- "javax.security.auth.callback, " +
- "javax.security.cert, " +
- "javax.naming, " +
- "javax.naming.spi, " +
- "javax.naming.directory, " +
- "javax.management, " +
- "javax.imageio, " +
- "sun.misc, " +
- "javax.net, " +
- "javax.net.ssl, " +
- "javax.crypto, " +
- "javax.rmi, " +
- "javax.transaction, " +
- "javax.transaction.xa";
-
- return systemPackages;
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java deleted file mode 100644 index c9f77b71cf..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java +++ /dev/null @@ -1,86 +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.util;
-
-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;
-
-
-
-/**
- * OSGi Test Utils : Set up OSGi runtime
- */
-public class OSGiRuntimeLoader {
-
- public static OSGiTestRuntime startOSGiTestRuntime() throws Exception {
-
- setUpFelixTestRuntime();
-
-
- System.setProperty("felix.cache.profiledir", "target/.felix.test");
-
- OSGiTestRuntime osgiRuntime = OSGiTestRuntime.getRuntime();
-
- System.setProperty("felix.cache.profiledir", ".felix");
-
- return osgiRuntime;
-
- }
-
- public static void setUpOSGiTestRuntime() throws Exception {
-
- setUpFelixTestRuntime();
-
- }
-
-
- private static void setUpFelixTestRuntime() throws Exception {
-
- String felixConfigFileName = "file:target/test-classes/felix/felix.config.properties";
-
- System.setProperty("felix.config.properties", felixConfigFileName);
-
- System.setProperty("felix.service.urlhandlers", "false");
-
-
- try {
- Class<?> felixMainClass = OSGiRuntimeLoader.class.getClassLoader().loadClass("org.apache.felix.main.Main");
- String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath();
- int index = 0;
- if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) {
- felixDir = felixDir.substring(0, index);
- System.setProperty("FELIX_DIR", felixDir);
- }
-
- } catch (Throwable e) {
- // Ignore
- }
-
-
- }
-
- public static void shutdownOSGiRuntime() {
- try {
- OSGiTestRuntime.stop();
-
- } catch (Exception e) {
- // Ignore
- }
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java deleted file mode 100644 index 1fba0d6dcd..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java +++ /dev/null @@ -1,136 +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.util;
-
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.lang.reflect.Method;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-
-/**
- * Load Tuscany into an OSGi runtime
- *
- */
-public class TuscanyLoader {
-
- private static final String tuscanyInstallerDir = "../tuscany-osgi-installer";
- private static final String tuscanyInstallerJar = "tuscany-sca-osgi-installer.jar";
-
- // 5-bundle version of Tuscany
- private static final String scaApiDir = "../sca-api";
- private static final String tuscanySpiDir = "../tuscany-spi";
- private static final String tuscanyRuntimeDir = "../tuscany-runtime";
- private static final String tuscanyExtensionsDir = "../tuscany-extensions";
- private static final String thirdPartyDir = "../tuscany-3rdparty";
-
- private static String findBundle(String subDirName, final String jarPrefix) throws Exception {
-
- File dir = new File(subDirName + "/target");
- if (dir.exists() && dir.isDirectory()) {
- File[] files = dir.listFiles(new FilenameFilter() {
-
- public boolean accept(File dir, String name) {
- return name.endsWith(".jar") && (jarPrefix == null || name.startsWith(jarPrefix));
- }
-
- });
-
- if (files != null && files.length > 0)
- return files[0].toURI().toURL().toString();
- }
- return null;
- }
-
- public static Bundle loadTuscanyIntoOSGi(BundleContext bundleContext) throws Exception {
-
- String tuscanyInstallerBundleName = new File(tuscanyInstallerDir + "/target/" + tuscanyInstallerJar).toURI().toURL().toString();
- Bundle tuscanyInstallerBundle = bundleContext.installBundle(tuscanyInstallerBundleName);
- tuscanyInstallerBundle.start();
- Bundle[] bundles = bundleContext.getBundles();
- Bundle tuscanyRuntimeBundle = tuscanyInstallerBundle;
- for (Bundle bundle : bundles) {
- if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) {
- tuscanyRuntimeBundle = bundle;
- break;
- }
- }
- setThreadContextClassLoader(tuscanyRuntimeBundle);
-
- return tuscanyRuntimeBundle;
- }
-
- /**
- * Load four Tuscany bundles (API, Core-SPI, Runtime, Extensions) and combined third party bundle
- *
- * @param bundleContext
- */
- public static Bundle load5BundleTuscanyIntoOSGi(BundleContext bundleContext) throws Exception {
-
-
- String thirdPartyBundleName = findBundle(thirdPartyDir, null);
- Bundle thirdPartyBundle = bundleContext.installBundle(thirdPartyBundleName);
- thirdPartyBundle.start();
-
-
- String scaApiBundleName = findBundle(scaApiDir, null);
- Bundle scaApiBundle = bundleContext.installBundle(scaApiBundleName);
- scaApiBundle.start();
-
- String tuscanySpiBundleName = findBundle(tuscanySpiDir, null);
- Bundle tuscanySpiBundle = bundleContext.installBundle(tuscanySpiBundleName);
-
- String tuscanyRuntimeBundleName = findBundle(tuscanyRuntimeDir, null);
- Bundle tuscanyRuntimeBundle = bundleContext.installBundle(tuscanyRuntimeBundleName);
-
- String tuscanyExtensionsBundleName = findBundle(tuscanyExtensionsDir, null);
- Bundle tuscanyExtensionsBundle = bundleContext.installBundle(tuscanyExtensionsBundleName);
-
-
- tuscanySpiBundle.start();
- tuscanyExtensionsBundle.start();
-
- setThreadContextClassLoader(tuscanyRuntimeBundle);
- return tuscanyRuntimeBundle;
-
- }
-
-
- // Tuscany runtime is started on a different thread when previously cached bundle is used.
- // Set this thread's TCCL to the one used by the runtime.
- public static void setThreadContextClassLoader(Bundle tuscanyRuntimeBundle) throws BundleException {
- if (tuscanyRuntimeBundle != null) {
-
- try {
- Class<?> runtimeClass = tuscanyRuntimeBundle.loadClass("org.apache.tuscany.sca.osgi.runtime.OSGiRuntime");
- Method getRuntimeMethod = runtimeClass.getMethod("findRuntime");
- Object runtime = getRuntimeMethod.invoke(runtimeClass);
- Method getTCCLMethod = runtimeClass.getMethod("getContextClassLoader");
- ClassLoader runtimeTCCL = (ClassLoader) getTCCLMethod.invoke(runtime);
- Thread.currentThread().setContextClassLoader(runtimeTCCL);
-
- } catch (Throwable e) {
- }
- }
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java deleted file mode 100644 index 8bf7a1fb2f..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java +++ /dev/null @@ -1,109 +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.osgi.harness; - -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.HashSet; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.test.util.TuscanyLoader; - -/* - * Test Tuscany running in an OSGi container - * This harness runs Tuscany samples outside OSGi with Tuscany running in OSGi - */ -public class OSGiTuscanyNonOSGiTestHarness extends OSGiTuscanyTestHarness { - - public void runTest(String... testDirs) throws Exception { - - String mainTestDir = testDirs[0]; - - File testDir = new File(mainTestDir + "/target/test-classes"); - if (!testDir.exists()) { - System.err.println("Test directory " + testDir + " does not exist"); - return; - } - - System.out.println("Run tests from : " + mainTestDir); - - long startTime = System.currentTimeMillis(); - - String[] dirs = new String[testDirs.length + 2]; - int i = 0; - dirs[i++] = mainTestDir + "/target/test-classes"; - dirs[i++] = "target/test-classes"; - for (int j = 0; j < testDirs.length; j++) { - dirs[i++] = testDirs[j] + "/target/classes"; - } - - tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(getBundleContext()); - long endTime = System.currentTimeMillis(); - - System.out.println("Loaded Tuscany, time taken = " + (endTime - startTime) + " ms"); - - URL[] dirURLs = new URL[dirs.length]; - for (int j = 0; j < dirs.length; j++) { - dirURLs[j] = new File(dirs[j]).toURI().toURL(); - } - ClassLoader testClassLoader = new URLClassLoader(dirURLs, Thread.currentThread().getContextClassLoader()); - Thread.currentThread().setContextClassLoader(testClassLoader); - - Class<?> testClass = testClassLoader.loadClass(this.getClass().getName()); - Method testMethod = testClass.getMethod("runAllTestsFromDirs", ClassLoader.class, String[].class); - Object testObject = testClass.newInstance(); - testMethod.invoke(testObject, testClassLoader, dirs); - - } - - public void getTestCases(File dir, String prefix, HashSet<String> testCaseSet) { - File[] files = dir.listFiles(); - for (File file : files) { - if (file.isDirectory()) { - String newPrefix = prefix == null ? file.getName() : prefix + "." + file.getName(); - getTestCases(file, newPrefix, testCaseSet); - } else if (file.getName().endsWith("TestCase.class")) { - String name = file.getName(); - name = name.substring(0, name.length() - 6); // remove .class - name = (prefix == null) ? name : prefix + "." + name; - - testCaseSet.add(name); - } - } - } - - public void runAllTestsFromDirs(ClassLoader testClassLoader, String[] testDirs) throws Exception { - - int failures = 0; - HashSet<String> testCaseSet = new HashSet<String>(); - for (String testDir : testDirs) { - getTestCases(new File(testDir), null, testCaseSet); - } - for (String className : testCaseSet) { - Class testClass = testClassLoader.loadClass(className); - failures += runTestCase(testClass).getFailureCount(); - } - - Assert.assertEquals(0, failures); - - } -} diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java deleted file mode 100644 index ba9b7007b4..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java +++ /dev/null @@ -1,243 +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.osgi.harness;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;
-import org.apache.tuscany.sca.test.util.OSGiRuntimeLoader;
-import org.apache.tuscany.sca.test.util.TuscanyLoader;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Request;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/*
- * Test Tuscany running in an OSGi container
- * Harness can be used to run Tuscany samples with Tuscany running in OSGi
- */
-public class OSGiTuscanyTestHarness {
-
- private OSGiTestRuntime osgiRuntime;
- protected Bundle tuscanyRuntime;
- private BundleContext bundleContext;
- private Bundle testBundle;
-
- public void setUp() throws Exception {
-
- osgiRuntime = OSGiRuntimeLoader.startOSGiTestRuntime();
- bundleContext = osgiRuntime.getBundleContext();
-
- // Uninstall any previously installed test bundles
- for (Bundle bundle : bundleContext.getBundles()) {
- if ("org.apache.tuscany.sca.test.samples".equals(bundle.getSymbolicName())) {
- bundle.uninstall();
- }
- }
- }
-
- public void tearDown() throws Exception {
- if (tuscanyRuntime != null) {
- tuscanyRuntime.stop();
- }
- OSGiRuntimeLoader.shutdownOSGiRuntime();
- }
-
- public BundleContext getBundleContext() {
- return bundleContext;
- }
-
- public void runTest(String... testDirs) throws Exception {
-
- String mainTestDir = testDirs[0];
-
- File testDir = new File(mainTestDir + "/target/test-classes");
- if (!testDir.exists()) {
- System.err.println("Test directory " + testDir + " does not exist");
- return;
- }
-
- System.out.println("Run tests from : " + mainTestDir);
-
- long startTime = System.currentTimeMillis();
-
- tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(bundleContext);
-
- String[] dirs = new String[testDirs.length + 2];
- int i = 0;
- dirs[i++] = mainTestDir + "/target/test-classes";
- dirs[i++] = "target/test-classes";
- for (int j = 0; j < testDirs.length; j++) {
- dirs[i++] = testDirs[j] + "/target/classes";
- }
-
- String manifestFile = "target/test-classes/META-INF/MANIFEST.MF";
-
- testBundle = createAndInstallBundle("file:" + mainTestDir + "/target/classes", // Bundle location: used to get File URLs for DefaultSCADomain
- manifestFile, // Test bundle manifest file
- dirs // Directory entries to be added to bundle
- );
-
- long endTime = System.currentTimeMillis();
-
- System.out.println("Loaded Tuscany, time taken = " + (endTime - startTime) + " ms");
-
- testBundle.start();
-
- Class<?> testClass = testBundle.loadClass(this.getClass().getName());
- Method testMethod = testClass.getMethod("runAllTestsFromBundle", Bundle.class);
- Object testObject = testClass.newInstance();
- testMethod.invoke(testObject, testBundle);
-
- testBundle.stop();
- testBundle.uninstall();
- }
-
- // Create and install a bundle with the specified manifest file
- // The bundle contains all files from the list of directories specified
- public Bundle createAndInstallBundle(String bundleLocation, String manifestFileName, String[] dirNames)
- throws Exception {
-
- ByteArrayOutputStream out = new ByteArrayOutputStream();
-
- File manifestFile = new File(manifestFileName);
- Manifest manifest = new Manifest();
- manifest.read(new FileInputStream(manifestFile));
- manifest.getMainAttributes().putValue("Bundle-Version",
- (String)tuscanyRuntime.getHeaders().get("Bundle-Version"));
-
- JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
- for (int i = 0; i < dirNames.length; i++) {
- File dir = new File(dirNames[i]);
- addFilesToJar(dir, dirNames[i], jarOut);
- }
-
- jarOut.close();
- out.close();
-
- ByteArrayInputStream inStream = new ByteArrayInputStream(out.toByteArray());
- return bundleContext.installBundle(bundleLocation, inStream);
-
- }
-
- // Add all the files from a build directory into a jar file
- // This method is used to create bundles on the fly
- private void addFilesToJar(File dir, String rootDirName, JarOutputStream jarOut) throws Exception {
-
- if (dir.getName().equals(".svn"))
- return;
-
- File[] files = dir.listFiles();
-
- if (files == null)
- return;
-
- for (int i = 0; i < files.length; i++) {
-
- if (files[i].isDirectory()) {
- addFilesToJar(files[i], rootDirName, jarOut);
- }
- if (files[i].getName().endsWith("MANIFEST.MF"))
- continue;
-
- String entryName = files[i].getPath().substring(rootDirName.length() + 1);
- entryName = entryName.replaceAll("\\\\", "/");
- if (files[i].isDirectory()) {
- entryName += "/";
- }
- ZipEntry ze = new ZipEntry(entryName);
-
- try {
- jarOut.putNextEntry(ze);
- FileInputStream file = new FileInputStream(files[i]);
- byte[] fileContents = new byte[file.available()];
- file.read(fileContents);
- jarOut.write(fileContents);
- } catch (Exception e) {
- // Ignore duplicate entry errors
- }
- }
- }
-
- public void runAllTestsFromBundle(Bundle bundle) throws Exception {
- int failures = 0;
- Enumeration entries = bundle.findEntries("/", "*TestCase.class", true);
- while (entries.hasMoreElements()) {
- URL entry = (URL)entries.nextElement();
- String className = entry.getFile();
- className = className.substring(1, className.length() - 6); // remove leading / and trailing .class
- className = className.replaceAll("/", ".");
- Class testClass = bundle.loadClass(className);
- failures += runTestCase(testClass).getFailureCount();
- }
-
- Assert.assertEquals(0, failures);
-
- }
-
- public Result runTestCase(Class testClass) throws Exception {
-
- if (testClass.getName().endsWith("TestCase") && !testClass.getName()
- .startsWith("org.apache.tuscany.sca.test.osgi.")) {
- JUnitCore core = new JUnitCore();
- System.out.println("Running test " + testClass.getName() + " ");
- Result result = core.run(Request.aClass(testClass));
- // long duration = result.getRunTime();
- int runs = result.getRunCount();
- int failures = 0, errors = 0;
- int ignores = result.getIgnoreCount();
-
- for (Failure f : result.getFailures()) {
- if (f.getException() instanceof AssertionFailedError) {
- failures++;
- } else {
- errors++;
- }
- }
-
- System.out.println("Test Runs: " + runs
- + ", Failures: "
- + failures
- + ", Errors: "
- + errors
- + ", Ignores: "
- + ignores);
-
- return result;
-
- }
- return new Result();
-
- }
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java deleted file mode 100644 index 85397195bd..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java +++ /dev/null @@ -1,61 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-calculator-implementation-policies
- */
-public class CalculatorImplementationPoliciesTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "calculator-implementation-policies");
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java deleted file mode 100644 index 9346fb8ed2..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java +++ /dev/null @@ -1,62 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-calculator-rmi-reference and samples-calculator-rmi-service
- */
-public class CalculatorRmiTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "calculator-rmi-reference");
- testHarness.runTest("../../../samples/" + "calculator-rmi-service");
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java deleted file mode 100644 index 501cded48d..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java +++ /dev/null @@ -1,63 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-calculator-script
- */
-public class CalculatorScriptTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
-
- System.setProperty("python.cachedir", "target/cachedir");
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "calculator-script");
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java deleted file mode 100644 index 687335b3c4..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java +++ /dev/null @@ -1,61 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-callback-ws
- */
-public class CallbackWsClientTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "callback-ws-client",
- "../../../samples/" + "callback-ws-service");
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java deleted file mode 100644 index f605e024ba..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java +++ /dev/null @@ -1,61 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-callback-ws
- */
-public class CallbackWsServiceTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "callback-ws-service");
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java deleted file mode 100644 index 4f5640960b..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java +++ /dev/null @@ -1,61 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-helloworld-ws-service-jms
- */
-public class HelloworldWsServiceJmsTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "helloworld-ws-service-jms");
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java deleted file mode 100644 index 9a491304bf..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java +++ /dev/null @@ -1,61 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-helloworld-ws-service-secure
- */
-public class HelloworldWsServiceSecureTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "helloworld-ws-service-secure");
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java deleted file mode 100644 index 2e0b49e693..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java +++ /dev/null @@ -1,61 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-helloworld-ws-service
- */
-public class HelloworldWsServiceTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "helloworld-ws-service");
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java deleted file mode 100644 index eac9979f56..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java +++ /dev/null @@ -1,85 +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.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyNonOSGiTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples which use old domain code - */ -public class NonOSGiSamplesTestCase { - - - private static String[] SAMPLES = { - "binding-notification-consumer", - "binding-notification-producer", - "calculator", - "implementation-composite", - "implementation-notification", - "loanapplication", - "simple-bigbank", - "simple-callback", - "supplychain", - "calculator-implementation-policies", - "calculator-rmi-reference", - "calculator-rmi-service", - "callback-ws-service", - "helloworld-ws-service-jms", - "helloworld-ws-service-secure", - "helloworld-ws-service" - - }; - - - private OSGiTuscanyNonOSGiTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyNonOSGiTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - testHarness = null; - } - } - - - @Test - public void runTestsOutsideOSGi() throws Exception { - - for (String testDir : SAMPLES) { - testHarness.runTest("../../../samples/" + testDir); - } - } - - -} diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java deleted file mode 100644 index 62c0eef16d..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java +++ /dev/null @@ -1,71 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples-osgi-supplychain
- */
-public class OSGiSupplyChainTestCase {
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- BundleContext bundleContext = testHarness.getBundleContext();
- if (bundleContext != null) {
- Bundle[] bundles = bundleContext.getBundles();
- for (Bundle bundle : bundles) {
- if (bundle.getSymbolicName() != null && bundle.getSymbolicName().contains("supplychain"))
- bundle.uninstall();
- }
- }
- if (testHarness != null) {
- testHarness.tearDown();
- }
- }
-
-
- @Test
- public void runTest() throws Exception {
-
- testHarness.runTest("../../../samples/" + "osgi-supplychain");
-
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java deleted file mode 100644 index 155dd368a3..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java +++ /dev/null @@ -1,137 +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.osgi.tuscany;
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime;
-import org.apache.tuscany.sca.test.util.OSGiRuntimeLoader;
-import org.apache.tuscany.sca.test.util.TuscanyLoader;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/*
- * Test Tuscany running inside OSGi
- */
-public class OSGiTuscanyRuntimeTestCase {
-
- private OSGiTestRuntime osgiRuntime;
- private Bundle tuscanyRuntime;
-
-
- @Before
- public void setUp() throws Exception {
-
- osgiRuntime = OSGiRuntimeLoader.startOSGiTestRuntime();
- BundleContext bundleContext = osgiRuntime.getBundleContext();
-
- // Uninstall any previously installed test bundles
- for (Bundle bundle : bundleContext.getBundles()) {
- String bundleName = bundle.getSymbolicName();
- if (bundleName != null &&
- (bundleName.equals("org.apache.tuscany.sca.test.samples")||
- bundleName.startsWith("supplychain"))) {
- bundle.uninstall();
- }
- }
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (tuscanyRuntime != null) {
- tuscanyRuntime.stop();
- }
- OSGiRuntimeLoader.shutdownOSGiRuntime();
- }
-
-
-
- @Test
- public void startTuscanyRuntimeInOSGi() throws Exception {
-
- tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(osgiRuntime.getBundleContext());
- Assert.assertNotNull(tuscanyRuntime);
- Bundle[] bundles = osgiRuntime.getBundleContext().getBundles();
- Bundle runtimeBundle = null;
- for (Bundle bundle : bundles) {
- if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) {
- runtimeBundle = bundle;
- break;
- }
- }
- Assert.assertNotNull(runtimeBundle);
- Class<?> clazz = runtimeBundle.loadClass("org.apache.tuscany.sca.osgi.runtime.OSGiRuntime");
- Assert.assertNotNull(clazz);
-
- }
-
- @Test
- public void testOSGiTuscany_ImplementationJava() throws Exception {
- testOSGiTuscanyUsingOSGiClient("SupplyChain.jar");
- }
-
- @Test
- public void testOSGiTuscany_BindingWS() throws Exception {
- testOSGiTuscanyUsingOSGiClient("SupplyChainWS.jar");
- }
-
-
- private void testOSGiTuscanyUsingOSGiClient(String contributionJarName) throws Exception {
-
- tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(osgiRuntime.getBundleContext());
-
- String folderName = "../test-bundles/target/";
- String supplychainJarName = contributionJarName;
- String supplychainClientJarName = "SupplyChainClient.jar";
- URL supplyChainURL = new File(folderName + supplychainJarName).toURI().toURL();
- URL supplyChainClientURL = new File(folderName + supplychainClientJarName).toURI().toURL();
-
- Bundle supplyChainBundle = osgiRuntime.getBundleContext().installBundle(supplyChainURL.toString());
- supplyChainBundle.start();
- Bundle clientBundle = osgiRuntime.getBundleContext().installBundle(supplyChainClientURL.toString());
- clientBundle.start();
-
- String clientClassName = "supplychain.client.SupplyChainClient";
- Class<?> clientClass = clientBundle.loadClass(clientClassName);
- ServiceReference testServiceRef = clientBundle.getBundleContext().getServiceReference(clientClassName);
- Object testService = clientBundle.getBundleContext().getService(testServiceRef);
-
- Method m = clientClass.getMethod("runTest", String.class);
- m.invoke(testService, contributionJarName);
-
- System.out.println("OSGi Client test completed successfully.");
-
- supplyChainBundle.uninstall();
- clientBundle.uninstall();
- }
-
-
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java deleted file mode 100644 index b45c062761..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java +++ /dev/null @@ -1,93 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples which use provide Tuscany extensions
- */
-public class TuscanySampleExtensionsTestCase {
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- testHarness = null;
- }
- }
-
-
- @Test
- public void testBindingEchoExtension() throws Exception {
-
- testHarness.runTest("../../../samples/" + "binding-echo-extension");
- }
-
- @Test
- public void testBindingEcho() throws Exception {
-
- testHarness.runTest("../../../samples/" + "binding-echo", "../../../samples/" + "binding-echo-extension");
-
- }
-
- @Test
- public void testDataBindingEcho() throws Exception {
-
- testHarness.runTest("../../../samples/" + "databinding-echo", "../../../samples/" + "binding-echo-extension");
-
- }
-
- @Test
- public void testImplementationCrudExtension() throws Exception {
-
- testHarness.runTest("../../../samples/" + "implementation-crud-extension");
- }
-
- @Test
- public void testImplementationCrud() throws Exception {
-
- testHarness.runTest("../../../samples/" + "implementation-crud", "../../../samples/" + "implementation-crud-extension");
-
- }
-
- @Test
- public void testImplementationPojoExtension() throws Exception {
-
- testHarness.runTest("../../../samples/" + "implementation-pojo-extension");
- }
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java deleted file mode 100644 index c2dae9eb97..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java +++ /dev/null @@ -1,80 +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.osgi.tuscany;
-
-
-import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Test Tuscany running in an OSGi container
- *
- * Run samples which use old domain code
- */
-public class TuscanySamplesUsingOldDomainTestCase {
-
-
- private static String[] SAMPLES = {
-
- "binding-notification-consumer",
- "binding-notification-producer",
- "calculator",
- "implementation-composite",
- "implementation-notification",
- "loanapplication",
- "quote-xquery",
- "simple-bigbank",
- "simple-callback",
- "supplychain"
-
- };
-
-
- private OSGiTuscanyTestHarness testHarness;
-
- @Before
- public void setUp() throws Exception {
-
- testHarness = new OSGiTuscanyTestHarness();
- testHarness.setUp();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- if (testHarness != null) {
- testHarness.tearDown();
- testHarness = null;
- }
- }
-
-
- @Test
- public void runTestsUsingOldDomainCode() throws Exception {
-
- for (String testDir : SAMPLES) {
- testHarness.runTest("../../../samples/" + testDir);
- }
- }
-
-
-}
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 8985947286..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: tuscany.sca.samples
-Bundle-SymbolicName: org.apache.tuscany.sca.test.samples
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- junit.framework,
- org.junit,
- org.apache.tuscany.sca.host.embedded,
- org.osoa.sca,
- org.osoa.sca.annotations,
- org.apache.tuscany.sca.databinding.annotation
-DynamicImport-Package: *
diff --git a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties deleted file mode 100644 index 6a38f48c4a..0000000000 --- a/branches/trunk-20080910/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties +++ /dev/null @@ -1,45 +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.
-#
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.0.0, \
- org.osgi.service.url; version=1.0.0 \
- org.osgi.util.tracker; version=1.3.2
-
-
-felix.auto.start.1= \
- "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar"
-
-# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar"
-# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \
-# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \
-
-
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
-
-#
-# Bundle config properties.
-#
-org.osgi.service.http.port=8080
-obr.shell.telnet=on
|