From 9a885a1f48a4e8bd4d57d5fe4cef038bd8613ffd Mon Sep 17 00:00:00 2001 From: rsivaram Date: Fri, 22 Aug 2008 18:39:18 +0000 Subject: Fixes for itest/osgi-tuscany git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@688168 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/itest/osgi-tuscany/sca-api/pom.xml | 60 ---- .../itest/osgi-tuscany/tuscany-3rdparty/pom.xml | 324 ------------------- .../itest/osgi-tuscany/tuscany-extensions/pom.xml | 348 --------------------- .../sca/installer/InstallerBundleActivator.java | 248 +-------------- .../sca/itest/osgi-tuscany/tuscany-runtime/pom.xml | 177 ----------- java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml | 120 ------- .../itest/osgi-tuscany/tuscany-versioned/pom.xml | 6 +- 7 files changed, 9 insertions(+), 1274 deletions(-) delete mode 100644 java/sca/itest/osgi-tuscany/sca-api/pom.xml delete mode 100644 java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml delete mode 100644 java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml delete mode 100644 java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml delete mode 100644 java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml (limited to 'java/sca/itest') diff --git a/java/sca/itest/osgi-tuscany/sca-api/pom.xml b/java/sca/itest/osgi-tuscany/sca-api/pom.xml deleted file mode 100644 index 3c74d327e1..0000000000 --- a/java/sca/itest/osgi-tuscany/sca-api/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../../pom.xml - - itest-osgi-tuscany-sca-api - Apache Tuscany OSGi - SCA API Bundle - bundle - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.4-SNAPSHOT - - - - - - - - org.apache.felix - maven-bundle-plugin - 1.4.0 - true - - - 2.0 - org.apache.tuscany.sca.api - Apache Tuscany SCA API Bundle - org.osoa.sca*;version="2.0" - - - - - - - diff --git a/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml deleted file mode 100644 index ce12ba36e3..0000000000 --- a/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml +++ /dev/null @@ -1,324 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../../pom.xml - - itest-osgi-tuscany-3rdparty - Apache Tuscany OSGi - Tuscany 3rdParty Bundle - bundle - - - - org.apache.tuscany.sca - tuscany-core - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-java - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-namespace - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-osgi - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-assembly-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-osgi-runtime - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-sca - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-rmi - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-notification - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-http-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-jsonrpc-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-jms-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-dwr - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-groovy - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-fastinfoset - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-json - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-sdo-axiom - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-xmlbeans - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-http - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-webapp - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-das - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-node-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-notification - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-osgi - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-script - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-widget-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-xquery - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-resource-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-spring - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-ejb - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-extension-helper - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-core-spring - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy-logging - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy-transaction - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy-security - 1.4-SNAPSHOT - - - org.apache.activemq - apache-activemq - 4.1.1 - - - org.mortbay.jetty - jetty-util - 6.1.7 - - - - - - - - - org.apache.felix - maven-bundle-plugin - 1.4.0 - true - - - 2.0 - org.apache.tuscany.sca.3rdparty - Apache Tuscany SCA 3rd party Bundle - true - true - true - - tuscany-sdo*, - tuscany-das*, - !tuscany* - - <_exportcontents> - !org.apache.tuscany.sca*, - !org.osoa.sca*, - org.mortbay*;version="6.1.7", - commonj.sdo*;version="2.1.0", - * - - *;resolution:=optional - * - - - - - - - diff --git a/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml deleted file mode 100644 index b9648a201c..0000000000 --- a/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../../pom.xml - - itest-osgi-tuscany-tuscany-extensions - Apache Tuscany OSGi - Tuscany Extensions Bundle - bundle - - - - org.apache.tuscany.sca - tuscany-assembly-xsd - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-atom - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-atom-abdera - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-sca - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-sca-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-ws - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-ws-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-rmi - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-notification - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-http-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-jsonrpc-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-jms-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-binding-dwr - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-groovy - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-fastinfoset - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-json - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-saxon - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-sdo-axiom - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-xmlbeans - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-endpoint - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-http - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-rmi - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-das - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-data-api - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-data-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-java - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-java-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-node - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-node-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-notification - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-osgi - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-script - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-widget-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-xquery - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-resource-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-spring - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-ejb - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-ejb - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-data-engine-helper - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-extension-helper - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-core-spring - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy-logging - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-policy-security - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-policy-security-ws - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - - - - - - - - org.apache.felix - maven-bundle-plugin - 1.4.0 - true - - - 2.0 - org.apache.tuscany.sca.extensions - Apache Tuscany SCA Extensions Bundle - true - true - tuscany* - <_exportcontents> - org.apache.tuscany.sca.*;version="2.0" - - *;version="0" - * - - - - - - - diff --git a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java index 059200302c..0c26477a43 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java +++ b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java @@ -25,10 +25,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.URL; -import java.security.CodeSource; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.jar.Attributes; import java.util.jar.JarInputStream; @@ -48,11 +45,6 @@ import org.osgi.framework.BundleContext; */ public class InstallerBundleActivator implements BundleActivator { - private static final String TUSCANY_INSTALLER_JAR = "tuscany-sca-osgi-installer.jar"; - private static final String TUSCANY_CLASSPATH = "org/apache/tuscany/sca/installer/.classpath"; - - private static final String TUSCANY_OSGI_MANIFEST_DIR = "org/apache/tuscany/sca/manifest"; - private ArrayList tuscanyBundles = new ArrayList(); private static final String[] immutableJars = { @@ -78,7 +70,7 @@ public class InstallerBundleActivator implements BundleActivator { }; private static final String[] rebundleJars = { - "org.apache.tuscany.sdo", // Recreate export statements + "org.apache.tuscany.sca.3rdparty.org.apache.tuscany.sdo", // Recreate export statements }; public void start(BundleContext bundleContext) throws Exception { @@ -91,14 +83,8 @@ public class InstallerBundleActivator implements BundleActivator { } } - if (tuscanyHome == null) { - System.out.println("Installing Tuscany bundles and virtual 3rd party bundles."); - installTuscanyIntoOSGi(bundleContext); - } - else { - System.out.println("Installing Tuscany from TUSCANY_HOME=" + tuscanyHome); - installVersionedTuscanyIntoOSGi(bundleContext, tuscanyHome); - } + System.out.println("Installing Tuscany from TUSCANY_HOME=" + tuscanyHome); + installVersionedTuscanyIntoOSGi(bundleContext, tuscanyHome); } public void stop(BundleContext bundleContext) throws Exception { @@ -168,7 +154,7 @@ public class InstallerBundleActivator implements BundleActivator { } private void rebundleAndInstall(BundleContext bundleContext, File tuscanyInstallDir, File bundleFile) throws Exception { - String bundleSymbolicName = "org.apache.tuscany.sca.3rdparty." + bundleFile.getName(); + String bundleSymbolicName = bundleFile.getName(); if (bundleSymbolicName.endsWith(".jar")) bundleSymbolicName = bundleSymbolicName.substring(0, bundleSymbolicName.length()-4); String bundleLocation = bundleFile.toURI().toURL().toString(); @@ -181,80 +167,6 @@ public class InstallerBundleActivator implements BundleActivator { bundleManifestStream.close(); } - private void installTuscanyIntoOSGi(BundleContext bundleContext) { - - try { - Bundle[] installedBundles = bundleContext.getBundles(); - HashSet installedBundleSet = new HashSet(); - for (Bundle bundle : installedBundles) { - if (bundle.getSymbolicName() != null) - installedBundleSet.add(bundle.getSymbolicName()); - } - - // FIXME: SDO bundles dont have the correct dependencies - System.setProperty("commonj.sdo.impl.HelperProvider", "org.apache.tuscany.sdo.helper.HelperProviderImpl"); - - HashSet tuscanyJars = new HashSet(); - HashMap thirdPartyJarsWithManifests = new HashMap(); - HashSet thirdPartyJars = new HashSet(); - - findJars(bundleContext, tuscanyJars, thirdPartyJars, thirdPartyJarsWithManifests); - File tuscanyInstallDir = findTuscanyInstallDir(bundleContext.getBundle()); - - for (File bundleFile : thirdPartyJarsWithManifests.keySet()) { - - String bundleLocation = bundleFile.toURI().toURL().toString(); - InputStream bundleManifestStream = thirdPartyJarsWithManifests.get(bundleFile); - HashSet jarSet = new HashSet(); - jarSet.add(bundleFile); - - File realBundleFile = new File(tuscanyInstallDir, "org.apache.tuscany.sca."+bundleFile.getName()); - if (realBundleFile.exists()) - bundleContext.installBundle(realBundleFile.toURI().toURL().toString()); - else - createAndInstallBundle(bundleContext, bundleLocation, realBundleFile, bundleManifestStream, jarSet); - bundleManifestStream.close(); - - } - - for (File bundleFile : thirdPartyJars) { - - String bundleName = bundleFile.getName(); - if (bundleName.startsWith("org.apache.felix")) - continue; - - String bundleSymbolicName = "org.apache.tuscany.sca.3rdparty." + bundleName; - if (bundleSymbolicName.endsWith(".jar")) bundleSymbolicName = bundleSymbolicName.substring(0, bundleSymbolicName.length()-4); - if (installedBundleSet.contains(bundleSymbolicName)) - continue; - - String bundleLocation = bundleFile.toURI().toURL().toString(); - InputStream bundleManifestStream = createBundleManifest(bundleFile, bundleSymbolicName); - HashSet jarSet = new HashSet(); - jarSet.add(bundleFile); - - File realBundleFile = new File(tuscanyInstallDir, "org.apache.tuscany.sca."+bundleFile.getName()); - if (realBundleFile.exists()) - bundleContext.installBundle(realBundleFile.toURI().toURL().toString()); - else - createAndInstallBundle(bundleContext, bundleLocation, realBundleFile, bundleManifestStream, jarSet); - bundleManifestStream.close(); - - } - - Bundle osgiRuntimeBundle = null; - for (File bundleFile : tuscanyJars) { - Bundle bundle = bundleContext.installBundle(bundleFile.toURI().toURL().toString()); - if ("org.apache.tuscany.sca.osgi.runtime".equals(bundle.getSymbolicName())) - osgiRuntimeBundle = bundle; - } - if (osgiRuntimeBundle != null) - osgiRuntimeBundle.start(); - - } catch (Exception e) { - e.printStackTrace(); - } - } private void findBundles(BundleContext bundleContext, File tuscanyInstallDir, @@ -269,7 +181,7 @@ public class InstallerBundleActivator implements BundleActivator { if (!jarName.endsWith(".jar")) continue; - if (!jarName.startsWith("org.apache.tuscany.sca")) { + if (!jarName.startsWith("org.apache.tuscany.sca")||jarName.startsWith("org.apache.tuscany.sca.3rdparty")) { if (jarName.endsWith(".jar")) { thirdPartyJars.add(jar); @@ -330,7 +242,7 @@ public class InstallerBundleActivator implements BundleActivator { // Existing export statements in bundles may contain versions, so they should be used as is // SDO exports are not sufficient, and should be changed - if (attributes.getValue("Export-Package") == null || bundleName.startsWith("org.apache.tuscany.sdo.tuscany-sdo-impl")) { + if (attributes.getValue("Export-Package") == null || bundleName.startsWith("org.apache.tuscany.sca.3rdparty.org.apache.tuscany.sdo.tuscany-sdo-impl")) { HashSet packages = getPackagesInJar(bundleName, jar); String version = getJarVersion(bundleName); @@ -347,102 +259,6 @@ public class InstallerBundleActivator implements BundleActivator { return in; } - - private void findJars(BundleContext bundleContext, - HashSet tuscanyJars, - HashSet thirdPartyJars, - HashMap thirdPartyBundleManifests) - throws IOException - { - - Bundle installerBundle = bundleContext.getBundle(); - File tuscanyInstallDir = findTuscanyInstallDir(installerBundle); - - URL classPathURL = installerBundle.getResource(TUSCANY_CLASSPATH); - InputStream stream = classPathURL.openStream(); - byte[] classPathBytes = new byte[stream.available()]; - stream.read(classPathBytes); - String classPath = new String(classPathBytes); - - // Path separator overrides are not supported by older versions of maven - String pathSeparator = ":"; - if (classPath.indexOf(";") > 0) pathSeparator = ";"; - - String[] classPathEntries = classPath.split(pathSeparator); - for (String classPathEntry : classPathEntries) { - classPathEntry = classPathEntry.trim(); - File jar = new File(classPathEntry); - if (!jar.exists()) { - jar = new File(tuscanyInstallDir, jar.getName()); - if (!jar.exists()) - jar = new File(tuscanyInstallDir, "modules" + File.separator + jar.getName()); - if (!jar.exists()) - jar = new File(tuscanyInstallDir, "lib" + File.separator + jar.getName()); - } - - String jarName = jar.getName(); - if (!jarName.startsWith("tuscany") || jarName.startsWith("tuscany-sdo") || jarName.startsWith("tuscany-das")) { - if (jarName.endsWith(".jar")) { - String manifestName = TUSCANY_OSGI_MANIFEST_DIR + "/" + jarName.substring(0, jarName.length()-4) + ".mf"; - InputStream manifestStream; - if ((manifestStream = this.getClass().getClassLoader().getResourceAsStream(manifestName)) != null) - thirdPartyBundleManifests.put(jar, manifestStream); - else - thirdPartyJars.add(jar); - } - } else { - boolean installTuscanyJar = true; - for (String name : tuscanyModulesToIgnore) { - if (jarName.startsWith("tuscany-" + name)) { - installTuscanyJar = false; - break; - } - } - if (installTuscanyJar) - tuscanyJars.add(jar); - } - } - } - - - - private File findTuscanyInstallDir(Bundle installerBundle) - throws IOException - { - String tuscanyDirName; - if ((tuscanyDirName = System.getenv("TUSCANY_HOME")) != null) { - File tuscanyInstallDir = new File(tuscanyDirName); - if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory()) - return tuscanyInstallDir; - } - if ((tuscanyDirName = System.getProperty("TUSCANY_HOME")) != null) { - File tuscanyInstallDir = new File(tuscanyDirName); - if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory()) - return tuscanyInstallDir; - } - - String location = installerBundle.getLocation(); - - if (location != null && location.startsWith("file:") && location.endsWith(TUSCANY_INSTALLER_JAR)) { - tuscanyDirName = location.substring(5, location.length()-TUSCANY_INSTALLER_JAR.length()); // strip "file:" and installer jar name - File tuscanyInstallDir = new File(tuscanyDirName); - if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory()) - return tuscanyInstallDir; - } - if (this.getClass().getProtectionDomain() != null) { - CodeSource codeSource = this.getClass().getProtectionDomain().getCodeSource(); - if (codeSource != null) { - try { - File tuscanyInstallDir = new File(codeSource.getLocation().toURI()); - if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory()) - return tuscanyInstallDir; - } catch (Exception e) { - // ignore - } - } - } - return null; - } public Bundle createAndInstallBundle(BundleContext bundleContext, String bundleLocation, @@ -531,58 +347,6 @@ public class InstallerBundleActivator implements BundleActivator { } } - private InputStream createBundleManifest(File jarFile, String bundleSymbolicName) throws Exception { - - if (!jarFile.exists()) - return null; - JarInputStream jar = new JarInputStream(new FileInputStream(jarFile)); - Manifest manifest = jar.getManifest(); - if (manifest == null) - manifest = new Manifest(); - - String bundleName = jarFile.getName(); - boolean isImmutableJar = false; - for (String immutableJar : immutableJars) { - if (bundleName.startsWith(immutableJar)) { - isImmutableJar = true; - break; - } - } - Attributes attributes = manifest.getMainAttributes(); - if (attributes.getValue("Manifest-Version") == null) { - attributes.putValue("Manifest-Version", "1.0"); - } - if (isImmutableJar) - attributes.putValue("Bundle-ClassPath", bundleName); - - HashSet packages = getPackagesInJar(bundleName, jar); - String version = getJarVersion(bundleName); - - attributes.remove(new Attributes.Name("Require-Bundle")); - attributes.remove(new Attributes.Name("Import-Package")); - - if (attributes.getValue("Bundle-SymbolicName") == null) - attributes.putValue("Bundle-SymbolicName", bundleSymbolicName); - if (attributes.getValue("Bundle-Version") == null) - attributes.putValue("Bundle-Version", version); - // Existing export statements in bundles may contain versions, so they should be used as is - // SDO exports are not sufficient, and should be changed - if (attributes.getValue("Export-Package") == null || bundleName.startsWith("tuscany-sdo-impl")) { - attributes.putValue("Export-Package", packagesToString(packages, version)); - attributes.putValue("Import-Package", packagesToString(packages, null)); - } - - attributes.putValue("DynamicImport-Package", "*"); - - ByteArrayOutputStream out = new ByteArrayOutputStream(); - manifest.write(out); - ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); - out.close(); - - return in; - - } - private HashSet getPackagesInJar(String bundleName, JarInputStream jar) throws Exception { HashSet packages = new HashSet(); ZipEntry entry; diff --git a/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml deleted file mode 100644 index 1d0fba8a83..0000000000 --- a/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../../pom.xml - - itest-osgi-tuscany-runtime - Apache Tuscany OSGi - Tuscany Runtime Bundle - bundle - - - - org.apache.tuscany.sca - tuscany-assembly-xsd - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-core - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-core-databinding - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-java - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-namespace - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-osgi - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution-resource - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-assembly-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy-xml-ws - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-definitions - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-definitions-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-osgi-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-node2-api - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-node2-impl - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-node2-launcher - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-workspace - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-domain-manager - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-workspace-impl - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-workspace-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-monitor - 1.4-SNAPSHOT - - - - - - - - org.apache.felix - maven-bundle-plugin - 1.4.0 - true - - - 2.0 - org.apache.tuscany.sca.runtime - Apache Tuscany SCA Runtime Bundle - org.apache.tuscany.sca.osgi.runtime.OSGiBundleActivator - org.apache.felix.main,org.eclipse.core.runtime.adaptor - true - true - tuscany* - <_exportcontents> - org.apache.tuscany.sca.*;version="2.0" - - - - - - - - diff --git a/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml deleted file mode 100644 index 9f59a9303a..0000000000 --- a/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../../pom.xml - - itest-osgi-tuscany-tuscany-spi - Apache Tuscany OSGi - Tuscany SPI Bundle - bundle - - - - org.apache.tuscany.sca - tuscany-core-spi - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-policy - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-assembly - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface-java - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface-java-jaxws - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface-java-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface-wsdl - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface-wsdl-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-extensibility - 1.4-SNAPSHOT - - - - - - - - org.apache.felix - maven-bundle-plugin - 1.4.0 - true - - - 2.0 - org.apache.tuscany.sca.spi - Apache Tuscany SCA SPI Bundle - true - true - tuscany* - <_exportcontents> - org.apache.tuscany.sca.*;version="2.0" - - - - - - - - diff --git a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml index 2a0ff0dcc8..88c5fae221 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml @@ -488,17 +488,17 @@ ${pom.groupId} - tuscany-node2-api + tuscany-node-api ${pom.version} ${pom.groupId} - tuscany-node2-impl + tuscany-node-impl ${pom.version} ${pom.groupId} - tuscany-node2-launcher + tuscany-node-launcher ${pom.version} -- cgit v1.2.3