summaryrefslogtreecommitdiffstats
path: root/branches/sca-android/modules
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2008-09-15 06:01:45 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2008-09-15 06:01:45 +0000
commitdc79a3d21e67c8560e2c35451f2b2c58b675f02a (patch)
tree5513fc5f02890d1f365aa22f52c458fa38cc7a00 /branches/sca-android/modules
parentd5f1d093fe6fa491cdec392dca7137639e98d149 (diff)
Applied changes from sca-equinox branch.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695349 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--branches/sca-android/modules/api/META-INF/README1
-rw-r--r--branches/sca-android/modules/assembly-java-dsl/META-INF/README1
-rw-r--r--branches/sca-android/modules/assembly-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/assembly-xsd/META-INF/README1
-rw-r--r--branches/sca-android/modules/assembly/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-atom-abdera/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-atom/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-corba-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-corba/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-dwr/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-ejb-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-ejb/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-feed/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-gdata-gsoc/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-gdata-runtime-gsoc/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-gdata-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-gdata/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-http-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-http/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-jms-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-jms/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-jsonrpc-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-jsonrpc/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-notification/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-rmi/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-rss-rome/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-rss/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-sca-axis2/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-sca-corba/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-sca-jms/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-sca-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-sca/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-ws-axis2-policy/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-ws-axis2/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-ws-wsdlgen/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-ws-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/binding-ws/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-groovy/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-impl/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-java/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-jee/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-namespace/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-osgi/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-resource/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-updater-impl/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-updater/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/contribution/META-INF/README1
-rw-r--r--branches/sca-android/modules/core-databinding/META-INF/README1
-rw-r--r--branches/sca-android/modules/core-spi/META-INF/README1
-rw-r--r--branches/sca-android/modules/core-spring/META-INF/README1
-rw-r--r--branches/sca-android/modules/core/META-INF/README1
-rw-r--r--branches/sca-android/modules/data-api/META-INF/README1
-rw-r--r--branches/sca-android/modules/data-engine-helper/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-axiom/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-fastinfoset/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-jaxb-axiom/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-jaxb/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-job/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-json/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-saxon/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-sdo-axiom/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-sdo/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-xmlbeans/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding-xstream/META-INF/README1
-rw-r--r--branches/sca-android/modules/databinding/META-INF/README1
-rw-r--r--branches/sca-android/modules/definitions-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/definitions/META-INF/README1
-rw-r--r--branches/sca-android/modules/domain-manager/META-INF/README1
-rw-r--r--branches/sca-android/modules/endpoint/META-INF/README1
-rw-r--r--branches/sca-android/modules/extensibility-equinox/META-INF/README1
-rw-r--r--branches/sca-android/modules/extensibility-equinox/pom.xml3
-rw-r--r--branches/sca-android/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java4
-rw-r--r--branches/sca-android/modules/extensibility-osgi/META-INF/README1
-rw-r--r--branches/sca-android/modules/extensibility/META-INF/README1
-rw-r--r--branches/sca-android/modules/extensibility/pom.xml1
-rw-r--r--branches/sca-android/modules/extension-helper/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-corba-jee/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-corba-jse-tns/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-corba-jse/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-corba/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-ejb/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-embedded/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-http/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-jetty/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-openejb/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-osgi/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-rmi/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-tomcat/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-webapp-junit/META-INF/README1
-rw-r--r--branches/sca-android/modules/host-webapp/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-bpel-jbpm/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-bpel-ode/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-bpel/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-das/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-data-api/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-data-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-ejb/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-java-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-java-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-java/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-jee/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-node-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-node/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-notification/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-openjpa/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-osgi/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-resource-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-resource/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-script/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-spring/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-web-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-web/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-widget-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-widget/META-INF/README1
-rw-r--r--branches/sca-android/modules/implementation-xquery/META-INF/README1
-rw-r--r--branches/sca-android/modules/interface-java-jaxws/META-INF/README1
-rw-r--r--branches/sca-android/modules/interface-java-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/interface-java/META-INF/README1
-rw-r--r--branches/sca-android/modules/interface-wsdl-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/interface-wsdl/META-INF/README1
-rw-r--r--branches/sca-android/modules/interface/META-INF/README1
-rw-r--r--branches/sca-android/modules/monitor-logging/META-INF/README1
-rw-r--r--branches/sca-android/modules/monitor/META-INF/README1
-rw-r--r--branches/sca-android/modules/node-api/META-INF/README1
-rw-r--r--branches/sca-android/modules/node-impl/META-INF/README1
-rw-r--r--branches/sca-android/modules/node-launcher-equinox/META-INF/README1
-rw-r--r--branches/sca-android/modules/node-launcher-equinox/pom.xml3
-rw-r--r--branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java72
-rw-r--r--branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java3
-rw-r--r--branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java36
-rw-r--r--branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java148
-rw-r--r--branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java7
-rw-r--r--branches/sca-android/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties16
-rw-r--r--branches/sca-android/modules/node-launcher-osgi/META-INF/README1
-rw-r--r--branches/sca-android/modules/node-launcher-osgi/pom.xml2
-rw-r--r--branches/sca-android/modules/node-launcher-webapp/META-INF/README1
-rw-r--r--branches/sca-android/modules/node-launcher/META-INF/README1
-rw-r--r--branches/sca-android/modules/node-manager/META-INF/README1
-rw-r--r--branches/sca-android/modules/osgi-runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/policy-logging/META-INF/README1
-rw-r--r--branches/sca-android/modules/policy-security-jsr250/META-INF/README1
-rw-r--r--branches/sca-android/modules/policy-security-ws/META-INF/README1
-rw-r--r--branches/sca-android/modules/policy-security/META-INF/README1
-rw-r--r--branches/sca-android/modules/policy-transaction/META-INF/README1
-rw-r--r--branches/sca-android/modules/policy-xml-ws/META-INF/README1
-rw-r--r--branches/sca-android/modules/policy-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/policy/META-INF/README1
-rw-r--r--branches/sca-android/modules/pom.xml74
-rw-r--r--branches/sca-android/modules/runtime-standalone/META-INF/README1
-rw-r--r--branches/sca-android/modules/runtime-tomcat/META-INF/README1
-rw-r--r--branches/sca-android/modules/runtime-war/META-INF/README1
-rw-r--r--branches/sca-android/modules/runtime/META-INF/README1
-rw-r--r--branches/sca-android/modules/runtime2/META-INF/README1
-rw-r--r--branches/sca-android/modules/sca-api/META-INF/README1
-rw-r--r--branches/sca-android/modules/scdl4j/META-INF/README1
-rw-r--r--branches/sca-android/modules/thirdparty-library/META-INF/README1
-rw-r--r--branches/sca-android/modules/thirdparty-library/pom.xml76
-rw-r--r--branches/sca-android/modules/tracing-aspectj/META-INF/README1
-rw-r--r--branches/sca-android/modules/tracing-aspectj/pom.xml12
-rw-r--r--branches/sca-android/modules/workspace-impl/META-INF/README1
-rw-r--r--branches/sca-android/modules/workspace-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/workspace/META-INF/README1
-rw-r--r--branches/sca-android/modules/xsd-xml/META-INF/README1
-rw-r--r--branches/sca-android/modules/xsd/META-INF/README1
165 files changed, 320 insertions, 288 deletions
diff --git a/branches/sca-android/modules/api/META-INF/README b/branches/sca-android/modules/api/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/api/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/assembly-java-dsl/META-INF/README b/branches/sca-android/modules/assembly-java-dsl/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/assembly-java-dsl/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/assembly-xml/META-INF/README b/branches/sca-android/modules/assembly-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/assembly-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/assembly-xsd/META-INF/README b/branches/sca-android/modules/assembly-xsd/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/assembly-xsd/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/assembly/META-INF/README b/branches/sca-android/modules/assembly/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/assembly/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-atom-abdera/META-INF/README b/branches/sca-android/modules/binding-atom-abdera/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-atom-abdera/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-atom/META-INF/README b/branches/sca-android/modules/binding-atom/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-atom/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-corba-runtime/META-INF/README b/branches/sca-android/modules/binding-corba-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-corba-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-corba/META-INF/README b/branches/sca-android/modules/binding-corba/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-corba/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-dwr/META-INF/README b/branches/sca-android/modules/binding-dwr/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-dwr/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-ejb-runtime/META-INF/README b/branches/sca-android/modules/binding-ejb-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-ejb-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-ejb/META-INF/README b/branches/sca-android/modules/binding-ejb/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-ejb/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-feed/META-INF/README b/branches/sca-android/modules/binding-feed/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-feed/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-gdata-gsoc/META-INF/README b/branches/sca-android/modules/binding-gdata-gsoc/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-gdata-gsoc/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-gdata-runtime-gsoc/META-INF/README b/branches/sca-android/modules/binding-gdata-runtime-gsoc/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-gdata-runtime-gsoc/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-gdata-runtime/META-INF/README b/branches/sca-android/modules/binding-gdata-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-gdata-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-gdata/META-INF/README b/branches/sca-android/modules/binding-gdata/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-gdata/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-http-runtime/META-INF/README b/branches/sca-android/modules/binding-http-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-http-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-http/META-INF/README b/branches/sca-android/modules/binding-http/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-http/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-jms-runtime/META-INF/README b/branches/sca-android/modules/binding-jms-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-jms/META-INF/README b/branches/sca-android/modules/binding-jms/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-jms/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-jsonrpc-runtime/META-INF/README b/branches/sca-android/modules/binding-jsonrpc-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-jsonrpc-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-jsonrpc/META-INF/README b/branches/sca-android/modules/binding-jsonrpc/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-jsonrpc/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-notification/META-INF/README b/branches/sca-android/modules/binding-notification/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-notification/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-rmi/META-INF/README b/branches/sca-android/modules/binding-rmi/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-rmi/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-rss-rome/META-INF/README b/branches/sca-android/modules/binding-rss-rome/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-rss-rome/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-rss/META-INF/README b/branches/sca-android/modules/binding-rss/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-rss/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-sca-axis2/META-INF/README b/branches/sca-android/modules/binding-sca-axis2/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-sca-axis2/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-sca-corba/META-INF/README b/branches/sca-android/modules/binding-sca-corba/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-sca-corba/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-sca-jms/META-INF/README b/branches/sca-android/modules/binding-sca-jms/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-sca-jms/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-sca-xml/META-INF/README b/branches/sca-android/modules/binding-sca-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-sca-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-sca/META-INF/README b/branches/sca-android/modules/binding-sca/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-sca/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-ws-axis2-policy/META-INF/README b/branches/sca-android/modules/binding-ws-axis2-policy/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-ws-axis2-policy/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-ws-axis2/META-INF/README b/branches/sca-android/modules/binding-ws-axis2/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-ws-axis2/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-ws-wsdlgen/META-INF/README b/branches/sca-android/modules/binding-ws-wsdlgen/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-ws-wsdlgen/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-ws-xml/META-INF/README b/branches/sca-android/modules/binding-ws-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-ws-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/binding-ws/META-INF/README b/branches/sca-android/modules/binding-ws/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/binding-ws/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-groovy/META-INF/README b/branches/sca-android/modules/contribution-groovy/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-groovy/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-impl/META-INF/README b/branches/sca-android/modules/contribution-impl/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-impl/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-java/META-INF/README b/branches/sca-android/modules/contribution-java/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-java/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-jee/META-INF/README b/branches/sca-android/modules/contribution-jee/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-jee/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-namespace/META-INF/README b/branches/sca-android/modules/contribution-namespace/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-namespace/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-osgi/META-INF/README b/branches/sca-android/modules/contribution-osgi/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-osgi/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-resource/META-INF/README b/branches/sca-android/modules/contribution-resource/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-resource/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-updater-impl/META-INF/README b/branches/sca-android/modules/contribution-updater-impl/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-updater-impl/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-updater/META-INF/README b/branches/sca-android/modules/contribution-updater/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-updater/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-xml/META-INF/README b/branches/sca-android/modules/contribution-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution/META-INF/README b/branches/sca-android/modules/contribution/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/contribution/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/core-databinding/META-INF/README b/branches/sca-android/modules/core-databinding/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/core-databinding/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/core-spi/META-INF/README b/branches/sca-android/modules/core-spi/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/core-spi/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/core-spring/META-INF/README b/branches/sca-android/modules/core-spring/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/core-spring/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/core/META-INF/README b/branches/sca-android/modules/core/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/core/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/data-api/META-INF/README b/branches/sca-android/modules/data-api/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/data-api/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/data-engine-helper/META-INF/README b/branches/sca-android/modules/data-engine-helper/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/data-engine-helper/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-axiom/META-INF/README b/branches/sca-android/modules/databinding-axiom/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-axiom/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-fastinfoset/META-INF/README b/branches/sca-android/modules/databinding-fastinfoset/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-fastinfoset/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-jaxb-axiom/META-INF/README b/branches/sca-android/modules/databinding-jaxb-axiom/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-jaxb-axiom/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-jaxb/META-INF/README b/branches/sca-android/modules/databinding-jaxb/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-jaxb/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-job/META-INF/README b/branches/sca-android/modules/databinding-job/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-job/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-json/META-INF/README b/branches/sca-android/modules/databinding-json/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-json/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-saxon/META-INF/README b/branches/sca-android/modules/databinding-saxon/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-saxon/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-sdo-axiom/META-INF/README b/branches/sca-android/modules/databinding-sdo-axiom/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-sdo-axiom/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-sdo/META-INF/README b/branches/sca-android/modules/databinding-sdo/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-sdo/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-xmlbeans/META-INF/README b/branches/sca-android/modules/databinding-xmlbeans/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-xmlbeans/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding-xstream/META-INF/README b/branches/sca-android/modules/databinding-xstream/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding-xstream/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/databinding/META-INF/README b/branches/sca-android/modules/databinding/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/databinding/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/definitions-xml/META-INF/README b/branches/sca-android/modules/definitions-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/definitions-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/definitions/META-INF/README b/branches/sca-android/modules/definitions/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/definitions/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/domain-manager/META-INF/README b/branches/sca-android/modules/domain-manager/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/domain-manager/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/endpoint/META-INF/README b/branches/sca-android/modules/endpoint/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/endpoint/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/extensibility-equinox/META-INF/README b/branches/sca-android/modules/extensibility-equinox/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/extensibility-equinox/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/extensibility-equinox/pom.xml b/branches/sca-android/modules/extensibility-equinox/pom.xml
index 84ad3633f6..9547e92f34 100644
--- a/branches/sca-android/modules/extensibility-equinox/pom.xml
+++ b/branches/sca-android/modules/extensibility-equinox/pom.xml
@@ -101,7 +101,8 @@
<Bundle-Description>${pom.name}</Bundle-Description>
<Bundle-Activator>org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator</Bundle-Activator>
<Export-Package>org.apache.tuscany.sca.extensibility.equinox*</Export-Package>
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
diff --git a/branches/sca-android/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/branches/sca-android/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index fcc7f21483..5ab5a66077 100644
--- a/branches/sca-android/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/branches/sca-android/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
@@ -116,6 +116,10 @@ public class EquinoxServiceDiscoverer implements ServiceDiscoverer {
}
}
+
+ public static void init() {
+ // Empty static method to trigger the activation of this bundle
+ }
private static String toString(Bundle b) {
StringBuffer sb = new StringBuffer();
diff --git a/branches/sca-android/modules/extensibility-osgi/META-INF/README b/branches/sca-android/modules/extensibility-osgi/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/extensibility-osgi/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/extensibility/META-INF/README b/branches/sca-android/modules/extensibility/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/extensibility/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/extensibility/pom.xml b/branches/sca-android/modules/extensibility/pom.xml
index b4e3b9ead7..01cd2d0ca9 100644
--- a/branches/sca-android/modules/extensibility/pom.xml
+++ b/branches/sca-android/modules/extensibility/pom.xml
@@ -41,7 +41,6 @@
<Bundle-SymbolicName>org.apache.tuscany.sca.extensibility</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.*</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
diff --git a/branches/sca-android/modules/extension-helper/META-INF/README b/branches/sca-android/modules/extension-helper/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/extension-helper/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-corba-jee/META-INF/README b/branches/sca-android/modules/host-corba-jee/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-corba-jee/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-corba-jse-tns/META-INF/README b/branches/sca-android/modules/host-corba-jse-tns/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-corba-jse-tns/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-corba-jse/META-INF/README b/branches/sca-android/modules/host-corba-jse/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-corba-jse/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-corba/META-INF/README b/branches/sca-android/modules/host-corba/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-corba/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-ejb/META-INF/README b/branches/sca-android/modules/host-ejb/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-ejb/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-embedded/META-INF/README b/branches/sca-android/modules/host-embedded/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-embedded/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-http/META-INF/README b/branches/sca-android/modules/host-http/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-http/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-jetty/META-INF/README b/branches/sca-android/modules/host-jetty/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-jetty/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-openejb/META-INF/README b/branches/sca-android/modules/host-openejb/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-openejb/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-osgi/META-INF/README b/branches/sca-android/modules/host-osgi/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-osgi/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-rmi/META-INF/README b/branches/sca-android/modules/host-rmi/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-rmi/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-tomcat/META-INF/README b/branches/sca-android/modules/host-tomcat/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-tomcat/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-webapp-junit/META-INF/README b/branches/sca-android/modules/host-webapp-junit/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-webapp-junit/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/host-webapp/META-INF/README b/branches/sca-android/modules/host-webapp/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/host-webapp/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-bpel-jbpm/META-INF/README b/branches/sca-android/modules/implementation-bpel-jbpm/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-bpel-jbpm/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-bpel-ode/META-INF/README b/branches/sca-android/modules/implementation-bpel-ode/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-bpel-ode/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-bpel/META-INF/README b/branches/sca-android/modules/implementation-bpel/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-bpel/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-das/META-INF/README b/branches/sca-android/modules/implementation-das/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-das/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-data-api/META-INF/README b/branches/sca-android/modules/implementation-data-api/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-data-api/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-data-xml/META-INF/README b/branches/sca-android/modules/implementation-data-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-data-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-ejb/META-INF/README b/branches/sca-android/modules/implementation-ejb/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-ejb/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-java-runtime/META-INF/README b/branches/sca-android/modules/implementation-java-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-java-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-java-xml/META-INF/README b/branches/sca-android/modules/implementation-java-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-java-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-java/META-INF/README b/branches/sca-android/modules/implementation-java/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-java/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-jee/META-INF/README b/branches/sca-android/modules/implementation-jee/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-jee/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-node-runtime/META-INF/README b/branches/sca-android/modules/implementation-node-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-node-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-node/META-INF/README b/branches/sca-android/modules/implementation-node/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-node/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-notification/META-INF/README b/branches/sca-android/modules/implementation-notification/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-notification/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-openjpa/META-INF/README b/branches/sca-android/modules/implementation-openjpa/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-openjpa/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-osgi/META-INF/README b/branches/sca-android/modules/implementation-osgi/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-osgi/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-resource-runtime/META-INF/README b/branches/sca-android/modules/implementation-resource-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-resource-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-resource/META-INF/README b/branches/sca-android/modules/implementation-resource/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-resource/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-script/META-INF/README b/branches/sca-android/modules/implementation-script/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-script/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-spring/META-INF/README b/branches/sca-android/modules/implementation-spring/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-spring/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-web-runtime/META-INF/README b/branches/sca-android/modules/implementation-web-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-web-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-web/META-INF/README b/branches/sca-android/modules/implementation-web/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-web/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-widget-runtime/META-INF/README b/branches/sca-android/modules/implementation-widget-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-widget-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-widget/META-INF/README b/branches/sca-android/modules/implementation-widget/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-widget/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/implementation-xquery/META-INF/README b/branches/sca-android/modules/implementation-xquery/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/implementation-xquery/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/interface-java-jaxws/META-INF/README b/branches/sca-android/modules/interface-java-jaxws/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/interface-java-jaxws/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/interface-java-xml/META-INF/README b/branches/sca-android/modules/interface-java-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/interface-java-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/interface-java/META-INF/README b/branches/sca-android/modules/interface-java/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/interface-java/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/interface-wsdl-xml/META-INF/README b/branches/sca-android/modules/interface-wsdl-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/interface-wsdl-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/interface-wsdl/META-INF/README b/branches/sca-android/modules/interface-wsdl/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/interface-wsdl/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/interface/META-INF/README b/branches/sca-android/modules/interface/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/interface/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/monitor-logging/META-INF/README b/branches/sca-android/modules/monitor-logging/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/monitor-logging/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/monitor/META-INF/README b/branches/sca-android/modules/monitor/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/monitor/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/node-api/META-INF/README b/branches/sca-android/modules/node-api/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/node-api/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/node-impl/META-INF/README b/branches/sca-android/modules/node-impl/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/node-impl/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/node-launcher-equinox/META-INF/README b/branches/sca-android/modules/node-launcher-equinox/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/node-launcher-equinox/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/node-launcher-equinox/pom.xml b/branches/sca-android/modules/node-launcher-equinox/pom.xml
index 8c4735d537..4459ec0038 100644
--- a/branches/sca-android/modules/node-launcher-equinox/pom.xml
+++ b/branches/sca-android/modules/node-launcher-equinox/pom.xml
@@ -111,9 +111,6 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.node.launcher.equinox</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <!--
- <Bundle-Activator>org.apache.tuscany.sca.node.equinox.launcher.LauncherBundleActivator</Bundle-Activator>
- -->
<Export-Package>org.apache.tuscany.sca.node.equinox.launcher*</Export-Package>
<Eclipse-AutoStart>true</Eclipse-AutoStart>
</instructions>
diff --git a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
deleted file mode 100644
index efe4d7bf8a..0000000000
--- a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
+++ /dev/null
@@ -1,72 +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.node.equinox.launcher;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.jar.Manifest;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.eclipse.osgi.baseadaptor.HookConfigurator;
-import org.eclipse.osgi.baseadaptor.HookRegistry;
-
-/**
- * Hook Configurator for Equinox.
- *
- * @version $Rev: $ $Date: $
- */
-public class EquinoxHookConfigurator implements HookConfigurator {
- private static Logger logger = Logger.getLogger(HookConfigurator.class.getName());
-
- private String[] jarFiles;
- private Manifest manifest;
-
- public EquinoxHookConfigurator() {
-
- // Get the list of JAR files to install
- String jarFilesProperty = System.getProperty("org.apache.tuscany.sca.node.launcher.equinox.jarFiles");
- jarFiles = jarFilesProperty.split(";");
-
- // Create a single 'library' bundle for them
- long libraryStart = System.currentTimeMillis();
- manifest = NodeLauncherUtil.libraryManifest(jarFiles);
-
- if (logger.isLoggable(Level.FINE)) {
- try {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- manifest.write(bos);
- bos.close();
- logger.fine(new String(bos.toByteArray()));
- } catch (IOException e) {
- }
- }
-
- logger.info("Third-party library manifest generated in " + (System.currentTimeMillis() - libraryStart) + " ms");
-
- }
-
- public void addHooks(HookRegistry registry) {
-
- // Register our BundleFileFactory hook
- registry.addBundleFileFactoryHook(new LibrariesBundleFileFactoryHook(manifest));
- }
-
-}
diff --git a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index 63313b6f39..6efdcb0da5 100644
--- a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
@@ -101,9 +101,6 @@ public class EquinoxHost {
// Use the boot classloader as the parent classloader
props.put("osgi.contextClassLoaderParent", "boot");
- // Set the extension bundle
- props.put("osgi.framework.extensions", "org.apache.tuscany.sca.node.launcher.equinox");
-
// Set startup properties
props.put(EclipseStarter.PROP_CLEAN, "true");
diff --git a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
index 97cc094f2b..3f88bd89e9 100644
--- a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
+++ b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
@@ -1,6 +1,12 @@
package org.apache.tuscany.sca.node.equinox.launcher;
-import java.io.ByteArrayInputStream;
+import static java.lang.System.currentTimeMillis;
+import static java.lang.System.getProperty;
+import static java.lang.System.setProperty;
+import static org.apache.tuscany.sca.node.equinox.launcher.NodeLauncherUtil.libraryBundle;
+import static org.apache.tuscany.sca.node.equinox.launcher.NodeLauncherUtil.string;
+
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -32,20 +38,22 @@ public class EquinoxLauncherBundleHelper implements BundleListener {
this.bundleContext.addBundleListener(this);
// Install the Tuscany bundles
- long start = System.currentTimeMillis();
+ long start = currentTimeMillis();
// FIXME: SDO bundles dont have the correct dependencies
- System.setProperty("commonj.sdo.impl.HelperProvider", "org.apache.tuscany.sdo.helper.HelperProviderImpl");
+ setProperty("commonj.sdo.impl.HelperProvider", "org.apache.tuscany.sdo.helper.HelperProviderImpl");
// Get the list of JAR files to install
- String jarFilesProperty = System.getProperty("org.apache.tuscany.sca.node.launcher.equinox.jarFiles");
+ String jarFilesProperty = getProperty("org.apache.tuscany.sca.node.launcher.equinox.jarFiles");
String[] jarFiles = jarFilesProperty.split(";");
// Create a single 'library' bundle for them
- long libraryStart = System.currentTimeMillis();
- //InputStream library = NodeLauncherUtil.libraryBundle(jarFiles);
- Bundle libraryBundle = bundleContext.installBundle("org.apache.tuscany.sca.node.launcher.equinox.libraries", new ByteArrayInputStream(new byte[0]));
- logger.info("Third-party library bundle installed in " + (System.currentTimeMillis() - libraryStart) + " ms: " + NodeLauncherUtil.string(libraryBundle, false));
+ long libraryStart = currentTimeMillis();
+ InputStream library = libraryBundle(jarFiles);
+ logger.info("Third-party library bundle generated in " + (currentTimeMillis() - libraryStart) + " ms.");
+ libraryStart = currentTimeMillis();
+ Bundle libraryBundle = bundleContext.installBundle("org.apache.tuscany.sca.node.launcher.equinox.libraries", library);
+ logger.info("Third-party library bundle installed in " + (currentTimeMillis() - libraryStart) + " ms: " + string(libraryBundle, false));
installedBundles.add(libraryBundle);
// Get the set of already installed bundles
@@ -55,9 +63,9 @@ public class EquinoxLauncherBundleHelper implements BundleListener {
}
// Get the list of bundle files and names to install
- String bundleFilesProperty = System.getProperty("org.apache.tuscany.sca.node.launcher.equinox.bundleFiles");
+ String bundleFilesProperty = getProperty("org.apache.tuscany.sca.node.launcher.equinox.bundleFiles");
String[] bundleFiles = bundleFilesProperty.split(";");
- String bundleNamesProperty = System.getProperty("org.apache.tuscany.sca.node.launcher.equinox.bundleNames");
+ String bundleNamesProperty = getProperty("org.apache.tuscany.sca.node.launcher.equinox.bundleNames");
String[] bundleNames = bundleNamesProperty.split(";");
// Install all the bundles that are not already installed
@@ -68,14 +76,14 @@ public class EquinoxLauncherBundleHelper implements BundleListener {
if (bundleName.contains("org.eclipse.jdt.junit")) {
continue;
}
- long installStart = System.currentTimeMillis();
+ long installStart = currentTimeMillis();
Bundle bundle = bundleContext.installBundle(bundleFile);
- logger.info("Bundle installed in " + (System.currentTimeMillis() - installStart) + " ms: " + NodeLauncherUtil.string(bundle, false));
+ logger.info("Bundle installed in " + (currentTimeMillis() - installStart) + " ms: " + string(bundle, false));
installedBundles.add(bundle);
}
}
- long end = System.currentTimeMillis();
+ long end = currentTimeMillis();
logger.info("Tuscany bundles are installed in " + (end - start) + " ms.");
}
@@ -86,7 +94,7 @@ public class EquinoxLauncherBundleHelper implements BundleListener {
Bundle bundle = installedBundles.get(i);
try {
//if (logger.isLoggable(Level.FINE)) {
- logger.info("Uninstalling bundle: " + NodeLauncherUtil.string(bundle, false));
+ logger.info("Uninstalling bundle: " + string(bundle, false));
//}
bundle.uninstall();
} catch (Exception e) {
diff --git a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
deleted file mode 100644
index 4ff93ea84b..0000000000
--- a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
+++ /dev/null
@@ -1,148 +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.node.equinox.launcher;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.jar.Manifest;
-
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-
-/**
- * A bundle file factory hook that.
- *
- * @version $Rev: $ $Date: $
-*/
-public class LibrariesBundleFileFactoryHook implements org.eclipse.osgi.baseadaptor.hooks.BundleFileFactoryHook {
-
- private Manifest manifest;
-
- private static class LibrariesBundleFile extends BundleFile {
-
- private static class ManifestBundleEntry extends BundleEntry {
-
- private byte[] bytes;
-
- public ManifestBundleEntry(Manifest manifest) {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- try {
- manifest.write(bos);
- bytes = bos.toByteArray();
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
- }
-
- @Override
- public URL getFileURL() {
- return null;
- }
-
- @Override
- public InputStream getInputStream() throws IOException {
- return new ByteArrayInputStream(bytes);
- }
-
- @Override
- public URL getLocalURL() {
- return null;
- }
-
- @Override
- public String getName() {
- return "META-INF/MANIFEST.MF";
- }
-
- @Override
- public long getSize() {
- return bytes.length;
- }
-
- @Override
- public long getTime() {
- return -1;
- }
-
- @Override
- public byte[] getBytes() throws IOException {
- return bytes;
- }
- }
-
- private Manifest manifest;
-
- public LibrariesBundleFile(Object baseFile, Manifest manifest) {
- super((File)baseFile);
- this.manifest = manifest;
- }
-
- @Override
- public void close() throws IOException {
- }
-
- @Override
- public boolean containsDir(String dir) {
- return false;
- }
-
- @Override
- public BundleEntry getEntry(String path) {
- if ("META-INF/MANIFEST.MF".equals(path)) {
- return new ManifestBundleEntry(manifest);
- }
- return null;
- }
-
- @Override
- public Enumeration getEntryPaths(String path) {
- return null;
- }
-
- @Override
- public File getFile(String path, boolean nativeCode) {
- return null;
- }
-
- @Override
- public void open() throws IOException {
- }
- }
-
- public LibrariesBundleFileFactoryHook(Manifest manifest) {
- this.manifest = manifest;
- }
-
- public BundleFile createBundleFile(Object content, BaseData data, boolean base) throws IOException {
- // Equinox will resolve external classpath against the base bundle
- if ("org.apache.tuscany.sca.node.launcher.equinox.libraries".equals(data.getLocation()) && base) {
- return new LibrariesBundleFile(content, manifest);
- } else {
- return null;
- }
- }
-
-}
diff --git a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index b422651244..bf65c3f323 100644
--- a/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/branches/sca-android/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
@@ -26,11 +26,13 @@ import static org.osgi.framework.Constants.DYNAMICIMPORT_PACKAGE;
import static org.osgi.framework.Constants.EXPORT_PACKAGE;
import static org.osgi.framework.Constants.IMPORT_PACKAGE;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.net.URI;
import java.net.URISyntaxException;
@@ -308,11 +310,12 @@ final class NodeLauncherUtil {
}
}
- static byte[] generateBundle(Manifest mf) throws IOException {
+ static InputStream libraryBundle(String[] jarFiles) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ Manifest mf = libraryManifest(jarFiles);
JarOutputStream jos = new JarOutputStream(bos, mf);
jos.close();
- return bos.toByteArray();
+ return new ByteArrayInputStream(bos.toByteArray());
}
/**
diff --git a/branches/sca-android/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties b/branches/sca-android/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
deleted file mode 100644
index cf9c0f74df..0000000000
--- a/branches/sca-android/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-hook.configurators=org.apache.tuscany.sca.node.equinox.launcher.EquinoxHookConfigurator \ No newline at end of file
diff --git a/branches/sca-android/modules/node-launcher-osgi/META-INF/README b/branches/sca-android/modules/node-launcher-osgi/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/node-launcher-osgi/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/node-launcher-osgi/pom.xml b/branches/sca-android/modules/node-launcher-osgi/pom.xml
index 18e38323f6..d5754530c9 100644
--- a/branches/sca-android/modules/node-launcher-osgi/pom.xml
+++ b/branches/sca-android/modules/node-launcher-osgi/pom.xml
@@ -132,7 +132,6 @@
</configuration>
</plugin>
-<!--
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -146,7 +145,6 @@
</instructions>
</configuration>
</plugin>
- -->
</plugins>
</build>
diff --git a/branches/sca-android/modules/node-launcher-webapp/META-INF/README b/branches/sca-android/modules/node-launcher-webapp/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/node-launcher-webapp/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/node-launcher/META-INF/README b/branches/sca-android/modules/node-launcher/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/node-launcher/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/node-manager/META-INF/README b/branches/sca-android/modules/node-manager/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/node-manager/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/osgi-runtime/META-INF/README b/branches/sca-android/modules/osgi-runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/osgi-runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/policy-logging/META-INF/README b/branches/sca-android/modules/policy-logging/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/policy-logging/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/policy-security-jsr250/META-INF/README b/branches/sca-android/modules/policy-security-jsr250/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/policy-security-jsr250/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/policy-security-ws/META-INF/README b/branches/sca-android/modules/policy-security-ws/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/policy-security-ws/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/policy-security/META-INF/README b/branches/sca-android/modules/policy-security/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/policy-security/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/policy-transaction/META-INF/README b/branches/sca-android/modules/policy-transaction/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/policy-transaction/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/policy-xml-ws/META-INF/README b/branches/sca-android/modules/policy-xml-ws/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/policy-xml-ws/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/policy-xml/META-INF/README b/branches/sca-android/modules/policy-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/policy-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/policy/META-INF/README b/branches/sca-android/modules/policy/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/policy/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/pom.xml b/branches/sca-android/modules/pom.xml
index 37f7741115..b0610a1342 100644
--- a/branches/sca-android/modules/pom.xml
+++ b/branches/sca-android/modules/pom.xml
@@ -156,9 +156,8 @@
<module>node-api</module>
<module>node-impl</module>
<module>node-launcher</module>
- <!--
<module>node-launcher-equinox</module>
- -->
+ <module>thirdparty-library</module>
<module>node-launcher-osgi</module>
<module>node-launcher-webapp</module>
<module>node-manager</module>
@@ -206,30 +205,53 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
- </manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <buildcommands>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ </buildcommands>
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ </projectnatures>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ <!--
+ <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+ -->
+ </classpathContainers>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <manifestLocation>${basedir}/META-INF</manifestLocation>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/branches/sca-android/modules/runtime-standalone/META-INF/README b/branches/sca-android/modules/runtime-standalone/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/runtime-standalone/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/runtime-tomcat/META-INF/README b/branches/sca-android/modules/runtime-tomcat/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/runtime-tomcat/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/runtime-war/META-INF/README b/branches/sca-android/modules/runtime-war/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/runtime-war/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/runtime/META-INF/README b/branches/sca-android/modules/runtime/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/runtime/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/runtime2/META-INF/README b/branches/sca-android/modules/runtime2/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/runtime2/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/sca-api/META-INF/README b/branches/sca-android/modules/sca-api/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/sca-api/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/scdl4j/META-INF/README b/branches/sca-android/modules/scdl4j/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/scdl4j/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/thirdparty-library/META-INF/README b/branches/sca-android/modules/thirdparty-library/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/thirdparty-library/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/thirdparty-library/pom.xml b/branches/sca-android/modules/thirdparty-library/pom.xml
new file mode 100644
index 0000000000..db55bd3093
--- /dev/null
+++ b/branches/sca-android/modules/thirdparty-library/pom.xml
@@ -0,0 +1,76 @@
+<?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-modules</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-thirdparty-library</artifactId>
+ <name>Apache Tuscany OSGi Bundle for Third Party Jars</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-all</artifactId>
+ <type>pom</type>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/lib</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-bundle-plugin</artifactId>
+ <configuration>
+ <copyJars>true</copyJars>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build-manifest</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
diff --git a/branches/sca-android/modules/tracing-aspectj/META-INF/README b/branches/sca-android/modules/tracing-aspectj/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/tracing-aspectj/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/tracing-aspectj/pom.xml b/branches/sca-android/modules/tracing-aspectj/pom.xml
index 6172b2a445..00790ed621 100644
--- a/branches/sca-android/modules/tracing-aspectj/pom.xml
+++ b/branches/sca-android/modules/tracing-aspectj/pom.xml
@@ -93,6 +93,18 @@
<argLine>-ea -Xmx128m -javaagent:target/dependency/aspectjweaver-1.6.1.jar</argLine>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-Version>1.4</Bundle-Version>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.tracing.aspect</Bundle-SymbolicName>
+ <Bundle-Description>${pom.description}</Bundle-Description>
+ <Export-Package></Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project> \ No newline at end of file
diff --git a/branches/sca-android/modules/workspace-impl/META-INF/README b/branches/sca-android/modules/workspace-impl/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/workspace-impl/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/workspace-xml/META-INF/README b/branches/sca-android/modules/workspace-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/workspace-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/workspace/META-INF/README b/branches/sca-android/modules/workspace/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/workspace/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/xsd-xml/META-INF/README b/branches/sca-android/modules/xsd-xml/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/xsd-xml/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/xsd/META-INF/README b/branches/sca-android/modules/xsd/META-INF/README
new file mode 100644
index 0000000000..009570154d
--- /dev/null
+++ b/branches/sca-android/modules/xsd/META-INF/README
@@ -0,0 +1 @@
+This directory contains a generated MANIFEST.MF file.