Starting to fix jetty OSGi import/exports.

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

10 files changed, 18 insertions, 15 deletions

diff --git a/branches/sca-equinox/distribution/features/all/pom.xml b/branches/sca-equinox/distribution/features/all/pom.xml
index f70bb16bf0..f88efa792e 100644
--- a/branches/sca-equinox/distribution/features/all/pom.xml
+++ b/branches/sca-equinox/distribution/features/all/pom.xml
@@ -100,12 +100,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-das</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-tracing-aspectj</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
diff --git a/branches/sca-equinox/distribution/features/ejava/pom.xml b/branches/sca-equinox/distribution/features/ejava/pom.xml
index 85fe239a11..abdc08f435 100644
--- a/branches/sca-equinox/distribution/features/ejava/pom.xml
+++ b/branches/sca-equinox/distribution/features/ejava/pom.xml
@@ -68,6 +68,7 @@
             <artifactId>tuscany-host-corba-jee</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
+        <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-ejb</artifactId>
@@ -78,6 +79,7 @@
             <artifactId>tuscany-host-openejb</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
+        -->
 
         <!-- Implementations -->
         <dependency>
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml b/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
index 4b922be0a7..42a484bde6 100644
--- a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
+++ b/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
@@ -206,7 +206,10 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom.abdera</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.atom*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.binding.atom.collection,
+                            org.apache.tuscany.sca.binding.atom.provider
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/binding-atom/pom.xml b/branches/sca-equinox/modules/binding-atom/pom.xml
index 388f203e1d..8c8aad875a 100644
--- a/branches/sca-equinox/modules/binding-atom/pom.xml
+++ b/branches/sca-equinox/modules/binding-atom/pom.xml
@@ -71,8 +71,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.atom*</Export-Package>
-                        <Import-Package>org.apache.tuscany.sca.assembly.xml;version="1.4", *</Import-Package>
+                        <Export-Package>org.apache.tuscany.sca.binding.atom</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/host-jetty/pom.xml b/branches/sca-equinox/modules/host-jetty/pom.xml
index 736a6f8dde..ee76b73ab4 100644
--- a/branches/sca-equinox/modules/host-jetty/pom.xml
+++ b/branches/sca-equinox/modules/host-jetty/pom.xml
@@ -66,7 +66,9 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.host.jetty</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.http.jetty*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.http.jetty,
+                        </Export-Package>
                         <Import-Package>
                             org.mortbay.jetty;version="6.1.7",
                             org.mortbay.jetty.handler;version="6.1.7",
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
index 884c8a4cce..31c8397f8b 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
+++ b/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.http.jetty.module;
+package org.apache.tuscany.sca.http.jetty;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -28,7 +28,6 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.ModuleActivator;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.http.jetty.JettyServer;
 import org.apache.tuscany.sca.work.WorkScheduler;
 
 /**
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f61708de90..e826f5a496 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations

 # under the License.

 # Implementation class for the ModuleActivator

-org.apache.tuscany.sca.http.jetty.module.JettyRuntimeModuleActivator

+org.apache.tuscany.sca.http.jetty.JettyRuntimeModuleActivator

diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index 7cbcdab693..f47a088c52 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
@@ -272,7 +272,7 @@ public class EquinoxHost {
                     if ((bundle.getState() & Bundle.ACTIVE) == 0) {
                         logger.info("Starting bundle: " + string(bundle, false));
                         try {
-                            bundle.start();
+                            //bundle.start();
                         } catch (Exception e) {
                             logger.log(Level.SEVERE, e.getMessage(), e);
                             throw e;
diff --git a/branches/sca-equinox/modules/policy-transaction/pom.xml b/branches/sca-equinox/modules/policy-transaction/pom.xml
index 638674660b..1376ead3c3 100644
--- a/branches/sca-equinox/modules/policy-transaction/pom.xml
+++ b/branches/sca-equinox/modules/policy-transaction/pom.xml
@@ -73,7 +73,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.policy.transaction</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.transaction*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.policy.transaction</Export-Package>
                         <Import-Package>javax.transaction;version="1.0.1",*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml
index 9b24679b5b..2ee9c9c9c2 100644
--- a/branches/sca-equinox/modules/pom.xml
+++ b/branches/sca-equinox/modules/pom.xml
@@ -102,11 +102,15 @@
                 <module>host-corba-jee</module>
                 <module>host-corba-jse</module>
                 <module>host-corba-jse-tns</module>
+                <!--
                 <module>host-ejb</module>
+                -->
                 <module>host-embedded</module>
                 <module>host-http</module>
                 <module>host-jetty</module>
+                <!--
                 <module>host-openejb</module>
+                -->
                 <module>host-rmi</module>
                 <!--
                 <module>host-tomcat</module>