Applied changes from sca-equinox branch.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695349 13f79535-47bb-0310-9956-ffa450edef68
author: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2008-09-15 06:01:45 +0000
committer: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2008-09-15 06:01:45 +0000
commit: dc79a3d21e67c8560e2c35451f2b2c58b675f02a (patch)
tree: 5513fc5f02890d1f365aa22f52c458fa38cc7a00 /branches
parent: d5f1d093fe6fa491cdec392dca7137639e98d149 (diff)
168 files changed, 901 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.
diff --git a/branches/sca-android/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java b/branches/sca-android/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
index 1dcf5b4e88..50f68dcb01 100644
--- a/branches/sca-android/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
+++ b/branches/sca-android/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
@@ -18,6 +18,12 @@
  */
 package calculator.rcp;
 
+import java.io.File;
+
+import org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoverer;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -33,6 +39,8 @@ public class Activator extends AbstractUIPlugin {
     // The shared instance
     private static Activator plugin;
 
+    private SCANode node;
+
     /**
      * The constructor
      */
@@ -46,6 +54,10 @@ public class Activator extends AbstractUIPlugin {
     public void start(BundleContext context) throws Exception {
         super.start(context);
         plugin = this;
+        Class<?> cls = EquinoxServiceDiscoverer.class;
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        node = factory.createSCANode("Calculator.composite", new SCAContribution("c1", new File("target/classes").toURI().toString()));
+        node.start();
     }
 
     /*
@@ -55,6 +67,9 @@ public class Activator extends AbstractUIPlugin {
     public void stop(BundleContext context) throws Exception {
         plugin = null;
         super.stop(context);
+        if (node != null) {
+            node.stop();
+        }
     }
 
     /**
diff --git a/branches/sca-android/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java b/branches/sca-android/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
new file mode 100644
index 0000000000..a1189d91b7
--- /dev/null
+++ b/branches/sca-android/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
@@ -0,0 +1,285 @@
+/*
+ * 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.tools.sca.tuscany.bundle.plugin;
+
+import static org.apache.tuscany.tools.sca.tuscany.bundle.plugin.LibraryBundleUtil.write;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.jar.Manifest;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.dependency.tree.DependencyTree;
+import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
+import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
+
+/**
+ * @version $Rev$ $Date$
+ * @goal build
+ * @phase process-sources
+ * @requiresDependencyResolution test
+ * @description Build a virtual bundle for 3rd party dependencies
+ */
+public class LibraryBundleMojo extends AbstractMojo {
+    /**
+     * The project to create a build for.
+     *
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    private MavenProject project;
+
+    /**
+     * The basedir of the project.
+     * 
+     * @parameter expression="${basedir}"
+     * @required @readonly
+     */
+    private File basedir;
+
+    /**
+     * Used to look up Artifacts in the remote repository.
+     * 
+     * @parameter expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
+     * @required
+     * @readonly
+     */
+    private org.apache.maven.artifact.factory.ArtifactFactory factory;
+
+    /**
+     * Used to look up Artifacts in the remote repository.
+     * 
+     * @parameter expression="${component.org.apache.maven.artifact.resolver.ArtifactResolver}"
+     * @required
+     * @readonly
+     */
+    private org.apache.maven.artifact.resolver.ArtifactResolver resolver;
+
+    /**
+     * Location of the local repository.
+     * 
+     * @parameter expression="${localRepository}"
+     * @readonly
+     * @required
+     */
+    private org.apache.maven.artifact.repository.ArtifactRepository local;
+
+    /**
+     * List of Remote Repositories used by the resolver
+     * 
+     * @parameter expression="${project.remoteArtifactRepositories}"
+     * @readonly
+     * @required
+     */
+    private java.util.List remoteRepos;
+
+    /**
+     * @parameter
+     */
+    private boolean copyJars = false;
+
+    /**
+     * Dependency tree builder
+     * 
+     * @component
+     */
+    private DependencyTreeBuilder dependencyTreeBuilder;
+
+    /**
+     * Artifact factory
+     * 
+     * @component
+     */
+    private ArtifactFactory artifactFactory;
+    
+    /**
+     * @component
+     */
+    private ArtifactMetadataSource artifactMetadataSource;    
+    
+    /**
+     * @component
+     */
+    private ArtifactCollector collector;
+
+    /**
+     * The local repository
+     *
+     * @parameter expression="${localRepository}"
+     * @required
+     */
+    private ArtifactRepository localRepository;
+
+    /**
+     * The remote repositories
+     *
+     * @parameter expression="${project.remoteArtifactRepositories}"
+     */
+    private List remoteRepositories;
+    
+    /**
+     * Artifact resolver
+     * 
+     * @component
+     */
+    private ArtifactResolver artifactResolver;
+
+    public void execute() throws MojoExecutionException {
+        Log log = getLog();
+
+        if (project.getPackaging().equals("pom")) {
+            return;
+        }
+
+        DependencyTree dependencyTree;
+        try {
+            dependencyTree = dependencyTreeBuilder.buildDependencyTree(project, 
+                                                                                  localRepository, artifactFactory,
+                                                                                  artifactMetadataSource, collector );
+                                                                          
+        } catch (DependencyTreeBuilderException e) {
+            throw new MojoExecutionException("Could not build dependency tree", e);
+        }
+        
+        Set<File> jarFiles = new HashSet<File>();
+        for (Object o : dependencyTree.getArtifacts()) {
+            Artifact artifact = (Artifact)o;
+
+            if (!(Artifact.SCOPE_COMPILE.equals(artifact.getScope()) || Artifact.SCOPE_RUNTIME.equals(artifact.getScope()))) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Skipping artifact: " + artifact);
+                }
+                continue;
+            }
+            if (!"jar".equals(artifact.getType())) {
+                continue;
+            }
+            if ("org.apache.tuscany.sca".equals(artifact.getGroupId())) {
+                continue;
+            }
+            
+            VersionRange versionRange = artifact.getVersionRange();
+            if (versionRange == null)
+                versionRange = VersionRange.createFromVersion(artifact.getVersion());
+            Artifact dependencyArtifact = artifactFactory.createDependencyArtifact(artifact.getGroupId(), 
+                                                                                   artifact.getArtifactId(), 
+                                                                                   versionRange, 
+                                                                                   artifact.getType(), 
+                                                                                   artifact.getClassifier(), 
+                                                                                   artifact.getScope());
+                                                                           
+           try {
+               artifactResolver.resolve(dependencyArtifact, remoteRepositories, localRepository);
+           } catch (ArtifactResolutionException e) {
+               log.warn("Artifact " + artifact + " could not be resolved.");
+           } catch (ArtifactNotFoundException e) {
+               log.warn("Artifact " + artifact + " could not be found.");
+           }
+           artifact = dependencyArtifact;
+
+            if (log.isDebugEnabled()) {
+                log.debug("Artifact: " + artifact);
+            }
+            String bundleName = null;
+            try {
+                bundleName = LibraryBundleUtil.getBundleName(artifact.getFile());
+            } catch (IOException e) {
+                throw new MojoExecutionException(e.getMessage(), e);
+            }
+            if (bundleName == null) {
+                if (artifact.getFile().exists()) {
+                    log.info("Adding third party jar: " + artifact);
+                    jarFiles.add(artifact.getFile());
+                } else {
+                    log.warn("Third party jar not found: " + artifact);
+                }
+            }
+        }
+
+        try {
+            String version = project.getVersion();
+            if (version.endsWith(Artifact.SNAPSHOT_VERSION)) {
+                version = version.substring(0, version.length() - Artifact.SNAPSHOT_VERSION.length() - 1);
+            }
+
+            Manifest mf = LibraryBundleUtil.libraryManifest(jarFiles, project.getName(), version, copyJars);
+            File file = new File(project.getBasedir(), "META-INF");
+            file.mkdir();
+            file= new File(file, "MANIFEST.MF");
+            if (log.isDebugEnabled()) {
+                log.debug("Generating " + file);
+            }
+
+            FileOutputStream fos = new FileOutputStream(file);
+            write(mf, fos);
+            fos.close();
+
+            if (copyJars) {
+                File lib = new File(project.getBasedir(), "lib");
+                if (lib.isDirectory()) {
+                    for (File c : lib.listFiles()) {
+                        c.delete();
+                    }
+                }
+                lib.mkdir();
+                byte[] buf = new byte[4096];
+                for (File jar : jarFiles) {
+                    File jarFile = new File(lib, jar.getName());
+                    if (log.isDebugEnabled()) {
+                        log.debug("Copying " + jar + " to " + jarFile);
+                    }
+                    FileInputStream in = new FileInputStream(jar);
+                    FileOutputStream out = new FileOutputStream(jarFile);
+                    for (;;) {
+                        int len = in.read(buf);
+                        if (len > 0) {
+                            out.write(buf, 0, len);
+                        } else {
+                            break;
+                        }
+                    }
+                    in.close();
+                    out.close();
+                }
+            }
+        } catch (Exception e) {
+            throw new MojoExecutionException(e.getMessage(), e);
+        }
+
+    }
+
+}
diff --git a/branches/sca-android/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java b/branches/sca-android/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
new file mode 100644
index 0000000000..39c02bd2b4
--- /dev/null
+++ b/branches/sca-android/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
@@ -0,0 +1,281 @@
+/*
+ * 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.tools.sca.tuscany.bundle.plugin;
+
+import static org.osgi.framework.Constants.BUNDLE_CLASSPATH;
+import static org.osgi.framework.Constants.BUNDLE_MANIFESTVERSION;
+import static org.osgi.framework.Constants.BUNDLE_NAME;
+import static org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME;
+import static org.osgi.framework.Constants.BUNDLE_VERSION;
+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.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import org.osgi.framework.Bundle;
+
+/**
+ * Common functions and constants used by the admin components.
+ *
+ * @version $Rev$ $Date$
+ */
+public final class LibraryBundleUtil {
+
+    private static final String LAUNCHER_EQUINOX_LIBRARIES = "org.apache.tuscany.sca.node.launcher.equinox.libraries";
+
+    static File file(URL url) {
+        if (url == null || !url.getProtocol().equals("file")) {
+            return null;
+        } else {
+            String filename = url.getFile().replace('/', File.separatorChar);
+            int pos = 0;
+            while ((pos = filename.indexOf('%', pos)) >= 0) {
+                if (pos + 2 < filename.length()) {
+                    String hexStr = filename.substring(pos + 1, pos + 3);
+                    char ch = (char)Integer.parseInt(hexStr, 16);
+                    filename = filename.substring(0, pos) + ch + filename.substring(pos + 3);
+                }
+            }
+            return new File(filename);
+        }
+    }
+
+    static Pattern pattern = Pattern.compile("-([0-9.]+)");
+
+    private static String version(String jarFile) {
+        Matcher matcher = pattern.matcher(jarFile);
+        String version = "1.0.0";
+        if (matcher.find()) {
+            version = matcher.group();
+            if (version.endsWith(".")) {
+                version = version.substring(1, version.length() - 1);
+            } else {
+                version = version.substring(1);
+            }
+        }
+        return version;
+    }
+
+    private static void addPackages(File jarFile, Set<String> packages) throws IOException {
+        String version = ";version=" + version(jarFile.getPath());
+        ZipInputStream is = new ZipInputStream(new FileInputStream(jarFile));
+        ZipEntry entry;
+        while ((entry = is.getNextEntry()) != null) {
+            String entryName = entry.getName();
+            if (!entry.isDirectory() && entryName != null
+                && entryName.length() > 0
+                && !entryName.startsWith(".")
+                && entryName.endsWith(".class") // Exclude resources from Export-Package
+                && entryName.lastIndexOf("/") > 0
+                && Character.isJavaIdentifierStart(entryName.charAt(0))) {
+                String pkg = entryName.substring(0, entryName.lastIndexOf("/")).replace('/', '.');
+                if (!("org.apache.commons.lang.enum".equals(pkg))) {
+                    packages.add(pkg + version);
+                }
+            }
+        }
+        is.close();
+    }
+
+    static Manifest libraryManifest(Set<File> jarFiles, String name, String version, boolean copyJars)
+        throws IllegalStateException {
+        try {
+
+            // List exported packages and bundle classpath entries
+            StringBuffer classpath = new StringBuffer();
+            StringBuffer exports = new StringBuffer();
+            StringBuffer imports = new StringBuffer();
+            Set<String> packages = new HashSet<String>();
+            for (File jarFile : jarFiles) {
+                addPackages(jarFile, packages);
+                if (copyJars) {
+                    classpath.append("lib/");
+                    classpath.append(jarFile.getName());
+                    classpath.append(",");
+                } else {
+                    classpath.append("\"external:");
+                    classpath.append(jarFile.getPath().replace(File.separatorChar, '/'));
+                    classpath.append("\",");
+                }
+            }
+
+            Set<String> importPackages = new HashSet<String>();
+            for (String pkg : packages) {
+                exports.append(pkg);
+                exports.append(',');
+
+                String importPackage = pkg;
+                int index = pkg.indexOf(';');
+                if (index != -1) {
+                    importPackage = pkg.substring(0, index);
+                }
+                if (!importPackages.contains(importPackage)) {
+                    imports.append(importPackage);
+                    imports.append(',');
+                    importPackages.add(importPackage);
+                }
+            }
+
+            // Create a manifest
+            Manifest manifest = new Manifest();
+            Attributes attributes = manifest.getMainAttributes();
+            attributes.putValue("Manifest-Version", "1.0");
+            attributes.putValue(BUNDLE_MANIFESTVERSION, "2");
+            attributes.putValue(BUNDLE_SYMBOLICNAME, LAUNCHER_EQUINOX_LIBRARIES);
+            attributes.putValue(BUNDLE_NAME, name);
+            attributes.putValue(BUNDLE_VERSION, version);
+            attributes.putValue(DYNAMICIMPORT_PACKAGE, "*");
+            attributes.putValue(EXPORT_PACKAGE, exports.substring(0, exports.length() - 1));
+            attributes.putValue(IMPORT_PACKAGE, imports.substring(0, imports.length() - 1));
+            attributes.putValue(BUNDLE_CLASSPATH, classpath.substring(0, classpath.length() - 1));
+
+            return manifest;
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    static String dump(Manifest mf) throws IOException {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        mf.write(bos);
+        return new String(bos.toByteArray());
+    }
+
+    static byte[] generateBundle(Manifest mf) throws IOException {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        JarOutputStream jos = new JarOutputStream(bos, mf);
+        jos.close();
+        return bos.toByteArray();
+    }
+
+    static void write(Manifest manifest, OutputStream out) throws IOException {
+        DataOutputStream dos = new DataOutputStream(out);
+        Attributes attributes = manifest.getMainAttributes();
+        write(attributes, "Manifest-Version", dos);
+        write(attributes, BUNDLE_MANIFESTVERSION, dos);
+        write(attributes, BUNDLE_SYMBOLICNAME, dos);
+        write(attributes, BUNDLE_NAME, dos);
+        write(attributes, BUNDLE_VERSION, dos);
+        write(attributes, DYNAMICIMPORT_PACKAGE, dos);
+        write(attributes, EXPORT_PACKAGE, dos);
+        write(attributes, IMPORT_PACKAGE, dos);
+        write(attributes, BUNDLE_CLASSPATH, dos);
+        dos.flush();
+    }
+    
+    private static void write(Attributes attributes, String key, DataOutputStream dos) throws IOException {
+        StringBuffer line = new StringBuffer();
+        line.append(key);
+        line.append(": ");
+        String value = attributes.getValue(key); 
+        line.append(new String(value.getBytes("UTF8")));
+        line.append("\r\n");
+        int l = line.length();
+        if (l > 72) {
+            for (int i = 70; i < l - 2;) {
+                line.insert(i, "\r\n ");
+                i += 72;
+                l += 3;
+            }
+        }
+        dos.writeBytes(line.toString());
+    }
+
+    /**
+     * Returns the name of a bundle, or null if the given file is not a bundle.
+     *  
+     * @param file
+     * @return
+     * @throws IOException
+     */
+    static String getBundleName(File file) throws IOException {
+        if (!file.exists()) {
+            return null;
+        }
+        String bundleName = null;
+        if (file.isDirectory()) {
+            File mf = new File(file, "META-INF/MANIFEST.MF");
+            if (mf.isFile()) {
+                Manifest manifest = new Manifest(new FileInputStream(mf));
+                bundleName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME);
+            }
+        } else {
+            JarFile jar = new JarFile(file, false);
+            Manifest manifest = jar.getManifest();
+            bundleName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME);
+            jar.close();
+        }
+        if (bundleName == null) {
+            return bundleName;
+        }
+        int sc = bundleName.indexOf(';');
+        if (sc != -1) {
+            bundleName = bundleName.substring(0, sc);
+        }
+        return bundleName;
+    }
+
+    public static String string(Bundle b, boolean verbose) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName());
+        int s = b.getState();
+        if ((s & Bundle.UNINSTALLED) != 0) {
+            sb.append(" UNINSTALLED");
+        }
+        if ((s & Bundle.INSTALLED) != 0) {
+            sb.append(" INSTALLED");
+        }
+        if ((s & Bundle.RESOLVED) != 0) {
+            sb.append(" RESOLVED");
+        }
+        if ((s & Bundle.STARTING) != 0) {
+            sb.append(" STARTING");
+        }
+        if ((s & Bundle.STOPPING) != 0) {
+            sb.append(" STOPPING");
+        }
+        if ((s & Bundle.ACTIVE) != 0) {
+            sb.append(" ACTIVE");
+        }
+
+        if (verbose) {
+            sb.append(" ").append(b.getLocation());
+            sb.append(" ").append(b.getHeaders());
+        }
+        return sb.toString();
+    }
+}
author	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2008-09-15 06:01:45 +0000
committer	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2008-09-15 06:01:45 +0000
commit	dc79a3d21e67c8560e2c35451f2b2c58b675f02a (patch)
tree	5513fc5f02890d1f365aa22f52c458fa38cc7a00 /branches
parent	d5f1d093fe6fa491cdec392dca7137639e98d149 (diff)