Fix the MANIFEST.MF to make OSGi working with the fact that axis2 jars are now treated as plain jars

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@786265 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 48 insertions, 24 deletions

diff --git a/java/sca/modules/binding-sca-axis2-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca-axis2-runtime/META-INF/MANIFEST.MF
index a07cfabc61..ac355e0f33 100644
--- a/java/sca/modules/binding-sca-axis2-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-sca-axis2-runtime/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.assembly;version="2.0.0",

  org.apache.tuscany.sca.assembly.builder;version="2.0.0",

  org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional,

+ org.apache.tuscany.sca.binding.sca.axis2;version="2.0.0",

  org.apache.tuscany.sca.binding.ws;version="2.0.0",

  org.apache.tuscany.sca.binding.ws.axis2;version="2.0.0",

  org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",

@@ -36,4 +37,5 @@ Import-Package: javax.xml.namespace,
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.axis2.runtime

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Export-Package: org.apache.tuscany.sca.binding.sca.axis2

+Export-Package: org.apache.tuscany.sca.binding.sca.axis2;version="2.0.0"

+

diff --git a/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
index 0f0213707a..992af5dd44 100644
--- a/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF
@@ -44,7 +44,6 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.contribution.processor;version="2.0.0",

  org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

  org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.databinding.axiom;version="2.0.0",

  org.apache.tuscany.sca.interfacedef;version="2.0.0",

  org.apache.tuscany.sca.invocation;version="2.0.0",

  org.apache.tuscany.sca.monitor;version="2.0.0",

diff --git a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index adef101ef7..74869d3c4a 100644
--- a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
@@ -76,7 +76,14 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Axis2-based WS Binding Extensio

  n

 Eclipse-RegisterBuddy: org.apache.axis2.kernel

-Import-Package: javax.security.auth.callback;resolution:=optional,

+Import-Package: javax.xml.stream,

+ javax.xml.transform,

+ javax.xml.transform.dom,

+ javax.xml.parsers,

+ org.w3c.dom,

+ javax.activation;resolution:=optional,

+ org.xml.sax, 

+ javax.security.auth.callback;resolution:=optional,

  javax.servlet,

  javax.servlet.http,

  javax.wsdl,

@@ -86,9 +93,6 @@ Import-Package: javax.security.auth.callback;resolution:=optional,
  javax.wsdl.factory;resolution:=optional,

  javax.wsdl.xml;resolution:=optional,

  javax.xml.namespace,

- javax.xml.stream,

- javax.xml.transform,

- javax.xml.transform.dom,

  org.apache.axiom.om,

  org.apache.axiom.om.impl.builder,

  org.apache.axiom.om.util,

@@ -112,6 +116,7 @@ Import-Package: javax.security.auth.callback;resolution:=optional,
  org.apache.axis2.util.threadpool,

  org.apache.commons.httpclient,

  org.apache.commons.httpclient.params,

+ org.apache.commons.logging;resolution:=optional,

  org.apache.neethi,

  org.apache.tuscany.sca.assembly;version="2.0.0",

  org.apache.tuscany.sca.binding.ws;version="2.0.0",

@@ -144,12 +149,8 @@ Import-Package: javax.security.auth.callback;resolution:=optional,
  org.apache.ws.security,

  org.apache.ws.security.handler,

  org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

- org.w3c.dom,

- javax.activation;resolution:=optional,

- org.xml.sax

+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2

-Fragment-Host: org.apache.axis2.kernel

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,

  JavaSE-1.6

diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml
index 7cccaac584..d6def3229d 100644
--- a/java/sca/modules/binding-ws-axis2/pom.xml
+++ b/java/sca/modules/binding-ws-axis2/pom.xml
@@ -86,8 +86,15 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
diff --git a/java/sca/modules/contribution/META-INF/MANIFEST.MF b/java/sca/modules/contribution/META-INF/MANIFEST.MF
index aeda1d66a6..6d2c1e8380 100644
--- a/java/sca/modules/contribution/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution/META-INF/MANIFEST.MF
@@ -49,6 +49,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.monitor;version="2.0.0",

  org.apache.tuscany.sca.policy;version="2.0.0",

  org.w3c.dom,

+ org.w3c.dom.ls,

  org.xml.sax,

  org.xml.sax.helpers

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
index cd86fd21aa..b9eb6c117b 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
@@ -61,7 +61,7 @@ public class EndpointSerializerImpl implements EndpointSerializer {
             endpoint.setBinding(result.getBinding());

             endpoint.setInterfaceContract(result.getService().getInterfaceContract());

         } catch (Exception e) {

-            throw new IOException(e);

+            throw new IOException(e.getMessage());

         }

 

     }

@@ -75,7 +75,7 @@ public class EndpointSerializerImpl implements EndpointSerializer {
             writer.close();

             return sw.toString();

         } catch (Exception e) {

-            throw new IOException(e);

+            throw new IOException(e.getMessage());

         }

     }

 

@@ -89,7 +89,7 @@ public class EndpointSerializerImpl implements EndpointSerializer {
             endpointReference.setBinding(result.getBinding());

             endpointReference.setInterfaceContract(result.getReference().getInterfaceContract());

         } catch (Exception e) {

-            throw new IOException(e);

+            throw new IOException(e.getMessage());

         }

     }

 

@@ -102,7 +102,7 @@ public class EndpointSerializerImpl implements EndpointSerializer {
             writer.close();

             return sw.toString();

         } catch (Exception e) {

-            throw new IOException(e);

+            throw new IOException(e.getMessage());

         }

     }

 }
\ No newline at end of file
diff --git a/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF b/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
index d1b38bea6c..bc9ebc0bc8 100644
--- a/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-axiom/META-INF/MANIFEST.MF
@@ -18,9 +18,6 @@ Import-Package: javax.xml.namespace,
  javax.xml.stream,

  org.apache.axiom.om,

  org.apache.axiom.om.impl.builder,

- org.apache.axiom.om.impl.llom.factory;resolution:=optional,

- org.apache.axiom.soap.impl.llom.soap11;resolution:=optional,

- org.apache.axiom.soap.impl.llom.soap12;resolution:=optional,

  org.apache.tuscany.sca.databinding;version="2.0.0",

  org.apache.tuscany.sca.databinding.axiom;version="2.0.0",

  org.apache.tuscany.sca.databinding.impl;version="2.0.0",

@@ -30,6 +27,5 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.interfacedef.util;version="1.4",

  org.apache.tuscany.sca.policy;version="2.0.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.axiom

-Fragment-Host: org.apache.ws.commons.axiom.axiom-api

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 7fe79d6c00..f467fcfaba 100644
--- a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
@@ -191,6 +191,7 @@ public class DefaultExtensionPointRegistry implements ExtensionPointRegistry {
     private static Set<Class<?>> getAllInterfaces(Class<?> clazz) {
         Set<Class<?>> implemented = new HashSet<Class<?>>();
         getAllInterfaces(clazz, implemented);
+        implemented.remove(LifeCycleListener.class);
         return implemented;
     }
 
diff --git a/java/sca/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
index fcf9d25ad0..181aa5a40d 100644
--- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Bnd-LastModified: 1225397240796
 Bundle-ManifestVersion: 2

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Node Implementation

-Import-Package: javax.xml.namespace,

+Import-Package: javax.management,

+ javax.xml.namespace,

  javax.xml.stream,

  org.apache.tuscany.sca.assembly;version="2.0.0",

  org.apache.tuscany.sca.assembly.builder;version="2.0.0",

diff --git a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index 08f962fb0a..e2de1b5246 100644
--- a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
@@ -35,15 +35,14 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.PosixParser;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
 
 /**
  * A launcher for SCA nodes.
  *
  * Agruments:
  * [-config <equinoxConfiguration>]: The configuration folder for Equinox
+ * [-bundles <osgiBundles>]: A list of bundles to be installed
  * [-c <compositeURI>]: The composite URI
  * [-t <ttl>]: Time to live in milliseconds before the node is started
  * contribution1 ... contributionN: A list of contribution files or URLs
@@ -128,6 +127,20 @@ public class NodeLauncher {
             if (cli.hasOption("config")) {
                 System.setProperty("osgi.configuration.area", cli.getOptionValue("config"));
             }
+
+            // if(cli.hasOption("bundles")) {
+                /**
+                 * osgi.bundles
+                 * The comma-separated list of bundles which are automatically installed and optionally started once the system is up
+                 * and running. Each entry is of the form:
+                 * <URL | simple bundle location>[@ [<start-level>] [":start"]]
+                 * If the start-level (>0 integer) is omitted then the framework will use the default start level for the bundle.
+                 * If the "start" tag is added then the bundle will be marked as started after being installed. Simple bundle locations are
+                 * interepreted as relative to the framework's parent directory. The start-level indicates the OSGi start level at which the
+                 * bundle should run. If this value is not set, the system computes an appropriate default.
+                 */
+                // System.setProperty("osgi.bundles", cli.getOptionValue("bundles"));
+            // }
             while (true) {
                 if (cli.hasOption("node")) {
                     // Create a node from a configuration URI
@@ -139,7 +152,9 @@ public class NodeLauncher {
                     equinox = launcher.equinoxHost;
 
                     node = launcher.createNode(configurationURI);
-                } else if (cli.hasOption("bundles")) {
+                }
+                /*
+                else if (cli.hasOption("bundles")) {
                     // Create a node launcher
                     NodeLauncher launcher = newInstance();
                     equinox = launcher.equinoxHost;
@@ -160,7 +175,8 @@ public class NodeLauncher {
                         }
                     }
 
-                } else {
+                } */
+                else {
                     // Create a node from a composite URI and a contribution location
                     String compositeURI = cli.getOptionValue("composite");
                     List<String> contribs = cli.getArgList();