Author: rsivaram
Date: Fri Aug 22 11:39:18 2008
New Revision: 688168
URL: http://svn.apache.org/viewvc?rev=688168&view=rev
Log:
Fixes for itest/osgi-tuscany
Removed:
tuscany/java/sca/itest/osgi-tuscany/sca-api/
tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/
tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/
tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/
tuscany/java/sca/itest/osgi-tuscany/tuscany-spi/
Modified:
tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
tuscany/java/sca/modules/node-api/pom.xml
tuscany/java/sca/modules/node-impl/pom.xml
tuscany/java/sca/modules/node-launcher-osgi/pom.xml
tuscany/java/sca/modules/node-launcher-webapp/pom.xml
tuscany/java/sca/modules/node-launcher/pom.xml
tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
tuscany/java/sca/tools/maven/pom.xml
Modified:
tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
---
tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
(original)
+++
tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
Fri Aug 22 11:39:18 2008
@@ -25,10 +25,7 @@
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 @@
*/
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<Bundle> tuscanyBundles = new ArrayList<Bundle>();
private static final String[] immutableJars = {
@@ -78,7 +70,7 @@
};
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 @@
}
}
- 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 @@
}
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 @@
bundleManifestStream.close();
}
- private void installTuscanyIntoOSGi(BundleContext bundleContext) {
-
- try {
- Bundle[] installedBundles = bundleContext.getBundles();
- HashSet<String> installedBundleSet = new HashSet<String>();
- 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<File> tuscanyJars = new HashSet<File>();
- HashMap<File, InputStream> thirdPartyJarsWithManifests = new
HashMap<File, InputStream>();
- HashSet<File> thirdPartyJars = new HashSet<File>();
-
- 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<File> jarSet = new HashSet<File>();
- 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<File> jarSet = new HashSet<File>();
- 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 @@
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 @@
// 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<String> packages = getPackagesInJar(bundleName, jar);
String version = getJarVersion(bundleName);
@@ -347,102 +259,6 @@
return in;
}
-
- private void findJars(BundleContext bundleContext,
- HashSet<File> tuscanyJars,
- HashSet<File> thirdPartyJars,
- HashMap<File, InputStream> 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 @@
}
}
- 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<String> 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<String> getPackagesInJar(String bundleName, JarInputStream
jar) throws Exception {
HashSet<String> packages = new HashSet<String>();
ZipEntry entry;
Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml Fri Aug 22
11:39:18 2008
@@ -488,17 +488,17 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-node2-api</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-node2-impl</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-node2-launcher</artifactId>
+ <artifactId>tuscany-node-launcher</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
Modified: tuscany/java/sca/modules/node-api/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/pom.xml?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-api/pom.xml (original)
+++ tuscany/java/sca/modules/node-api/pom.xml Fri Aug 22 11:39:18 2008
@@ -48,7 +48,7 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.node2.api</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.node.api</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.node*</Export-Package>
<DynamicImport-Package>org.apache.tuscany.sca.node.impl</DynamicImport-Package>
Modified: tuscany/java/sca/modules/node-impl/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/pom.xml?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/pom.xml (original)
+++ tuscany/java/sca/modules/node-impl/pom.xml Fri Aug 22 11:39:18 2008
@@ -142,7 +142,7 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.node2.impl</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.node.impl</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.node.impl*</Export-Package>
</instructions>
Modified: tuscany/java/sca/modules/node-launcher-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-osgi/pom.xml?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-launcher-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/node-launcher-osgi/pom.xml Fri Aug 22 11:39:18 2008
@@ -137,7 +137,7 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.node2.launcher.osgi</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.node.launcher.osgi</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.node.osgi.launcher*</Export-Package>
</instructions>
Modified: tuscany/java/sca/modules/node-launcher-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-webapp/pom.xml?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-launcher-webapp/pom.xml (original)
+++ tuscany/java/sca/modules/node-launcher-webapp/pom.xml Fri Aug 22 11:39:18
2008
@@ -50,7 +50,7 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.node2.launcher.webapp</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.node.launcher.webapp</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.node*</Export-Package>
</instructions>
Modified: tuscany/java/sca/modules/node-launcher/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher/pom.xml?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-launcher/pom.xml (original)
+++ tuscany/java/sca/modules/node-launcher/pom.xml Fri Aug 22 11:39:18 2008
@@ -60,7 +60,7 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.node2.launcher</Bundle-SymbolicName>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.node.launcher</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.node*</Export-Package>
</instructions>
Modified:
tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
---
tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
(original)
+++
tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
Fri Aug 22 11:39:18 2008
@@ -319,6 +319,7 @@
if (!bundleFile.exists())
return;
+ File processedFile = bundleFile;
boolean retainManifestEntries = false;
if (!artifact.getGroupId().equals("org.apache.tuscany.sca")) {
// For pre-bundled 3rd party bundles, retain all OSGi manifest
entries except Require-Bundle
@@ -342,6 +343,8 @@
if (!bundleSymName.startsWith("org.apache.tuscany.sca")) {
bundleSymName = "org.apache.tuscany.sca.3rdparty." + bundleSymName;
attributes.putValue("Bundle-SymbolicName", bundleSymName);
+
+ processedFile = new File(bundleFile.getParent(),
"org.apache.tuscany.sca.3rdparty." + bundleFile.getName());
}
String imports = (String)attributes.getValue("Import-Package");
@@ -408,7 +411,7 @@
jarOut.close();
out.close();
bundleFile.delete();
- FileOutputStream fileOut = new FileOutputStream(bundleFile);
+ FileOutputStream fileOut = new FileOutputStream(processedFile);
fileOut.write(out.toByteArray());
fileOut.close();
Modified: tuscany/java/sca/tools/maven/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/pom.xml?rev=688168&r1=688167&r2=688168&view=diff
==============================================================================
--- tuscany/java/sca/tools/maven/pom.xml (original)
+++ tuscany/java/sca/tools/maven/pom.xml Fri Aug 22 11:39:18 2008
@@ -43,6 +43,7 @@
<module>maven-java2wsdl</module>
<module>maven-web-junit</module>
<module>maven-wsdl2java</module>
+ <module>maven-tuscany-bundle-plugin</module>
</modules>
</profile>
</profiles>
