Started to fix module dependencies, OSGi manifest generation and a few references to obsolete classes to get a clean build.

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

11 files changed, 42 insertions, 16 deletions

diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
index 2679071ea8..3ee3b64e4d 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
+++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
@@ -18,12 +18,12 @@
  */
 package org.apache.tuscany.sca.binding.gdata.collection;
 
+import org.apache.tuscany.sca.data.collection.NotFoundException;
+import org.osoa.sca.annotations.Remotable;
+
 import com.google.gdata.data.BaseEntry;
 import com.google.gdata.data.BaseFeed;
 
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
-import org.osoa.sca.annotations.Remotable;
-
 /**
  * Provides access to a collection of resources using Atom.
  * 
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
index b9252d097a..cd17f48249 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
+++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
 
 import org.osoa.sca.annotations.Remotable;
 
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
 
 /**
  * Provides access to a collection of resources using Atom.
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java
index 8da6977c2c..d52215b7ea 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java
+++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java
@@ -37,15 +37,15 @@ public class CalendarConsumerImpl {
         return resourceCollection.post(entry);
     }
 
-    public BaseEntry get(String id) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException {
+    public BaseEntry get(String id) throws org.apache.tuscany.sca.data.collection.NotFoundException {
         return resourceCollection.get(id);
     }
 
-    public BaseEntry put(String id, BaseEntry entry) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException {
+    public BaseEntry put(String id, BaseEntry entry) throws org.apache.tuscany.sca.data.collection.NotFoundException {
         return resourceCollection.put(id, entry);
     }
 
-    public void delete(String id) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException {
+    public void delete(String id) throws org.apache.tuscany.sca.data.collection.NotFoundException {
         resourceCollection.delete(id);
     }
 
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java
index 361b9b122d..211ae51ba2 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java
+++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java
@@ -28,7 +28,7 @@ import com.google.gdata.data.extensions.When;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
 
 import org.junit.Test;
 import org.junit.BeforeClass;
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java
index 8233d01dd9..b58bdb408f 100644
--- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java
+++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java
@@ -31,7 +31,7 @@ import java.util.Map;
 import java.util.TimeZone;
 import java.util.UUID;
 import org.apache.tuscany.sca.binding.gdata.collection.Collection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
 import org.osoa.sca.annotations.Scope;
 
 @Scope("COMPOSITE")
diff --git a/branches/sca-equinox/modules/host-corba-jse/pom.xml b/branches/sca-equinox/modules/host-corba-jse/pom.xml
index d0c4c53900..cde59fa5fe 100644
--- a/branches/sca-equinox/modules/host-corba-jse/pom.xml
+++ b/branches/sca-equinox/modules/host-corba-jse/pom.xml
@@ -47,7 +47,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.host.corba.jse</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.corba.jse*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.host.corba*</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 1a4c19b69a..9d4570b9ec 100644
--- a/branches/sca-equinox/modules/host-jetty/pom.xml
+++ b/branches/sca-equinox/modules/host-jetty/pom.xml
@@ -67,6 +67,16 @@
                         <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>
+                        <Import-Package>
+                            org.mortbay.jetty;version="6.1.7",
+                            org.mortbay.jetty.handler;version="6.1.7",
+                            org.mortbay.jetty.nio;version="6.1.7",
+                            org.mortbay.jetty.security;version="6.1.7",
+                            org.mortbay.jetty.servlet;version="6.1.7",
+                            org.mortbay.log;version="6.1.7",
+                            org.mortbay.resource;version="6.1.7",
+                            org.mortbay.thread;version="6.1.7"
+                         </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/pom.xml b/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
index c0c911e63a..c8c9fe971e 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
+++ b/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
@@ -44,6 +44,22 @@
     <build>
         <plugins>
             <plugin>
+               <artifactId>maven-eclipse-plugin</artifactId>
+               <version>2.5.1</version>
+               <configuration>
+                   <buildcommands>
+                       <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+                   </buildcommands>
+                   <projectnatures>
+                       <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+                   </projectnatures>
+                   <classpathContainers>
+                       <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+                   </classpathContainers>
+               </configuration>
+           </plugin>
+
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
 
@@ -57,6 +73,7 @@
                 </configuration>
             </plugin>
         </plugins>
+
     </build>
 
 </project>
diff --git a/branches/sca-equinox/modules/policy-security/pom.xml b/branches/sca-equinox/modules/policy-security/pom.xml
index 640d131642..dc8ab87bef 100644
--- a/branches/sca-equinox/modules/policy-security/pom.xml
+++ b/branches/sca-equinox/modules/policy-security/pom.xml
@@ -60,7 +60,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>

                         <Bundle-SymbolicName>org.apache.tuscany.sca.policy.security</Bundle-SymbolicName>

                         <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.policy.security*</Export-Package>

+                        <Export-Package>org.apache.tuscany.sca.policy*</Export-Package>

                     </instructions>

                 </configuration>

             </plugin>

diff --git a/branches/sca-equinox/modules/policy-transaction/pom.xml b/branches/sca-equinox/modules/policy-transaction/pom.xml
index 42f4005306..c51ac0d180 100644
--- a/branches/sca-equinox/modules/policy-transaction/pom.xml
+++ b/branches/sca-equinox/modules/policy-transaction/pom.xml
@@ -118,6 +118,7 @@
                         <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>
+                        <Import-Package>javax.transaction;version="1.0",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml
index a5029efaa7..113055a5e6 100644
--- a/branches/sca-equinox/modules/pom.xml
+++ b/branches/sca-equinox/modules/pom.xml
@@ -111,7 +111,9 @@
                 <module>host-webapp</module>
                 <module>host-webapp-junit</module>
                 <module>host-jetty</module>
-                <module>host-tomcat</module>
+                <!--
+                <module>host-jetty</module>
+                -->
                 <module>interface</module>
                 <module>interface-java</module>
                 <module>interface-java-jaxws</module>
@@ -122,7 +124,6 @@
                 <module>implementation-bpel-ode</module>
                 <module>implementation-bpel-jbpm</module>
                 <module>implementation-das</module>
-                <module>implementation-data-xml</module>
                 <module>implementation-ejb</module>
                 <module>implementation-java</module>
                 <module>implementation-java-xml</module>
@@ -198,9 +199,6 @@
                    </projectnatures>
                    <classpathContainers>
                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-                       <!--
-                       <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
-                        -->
                    </classpathContainers>
                </configuration>
            </plugin>