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

25 files changed, 28 insertions, 28 deletions

diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml b/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
index 3a61b820d1..946486b2e7 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
+++ b/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml b/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
index eb11a6ad7e..40646822a6 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
+++ b/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
@@ -77,7 +77,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
diff --git a/branches/sca-equinox/itest/callablereferences-ws/pom.xml b/branches/sca-equinox/itest/callablereferences-ws/pom.xml
index bd373b2ae6..8eecd714bf 100644
--- a/branches/sca-equinox/itest/callablereferences-ws/pom.xml
+++ b/branches/sca-equinox/itest/callablereferences-ws/pom.xml
@@ -51,7 +51,7 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

diff --git a/branches/sca-equinox/itest/callablereferences/pom.xml b/branches/sca-equinox/itest/callablereferences/pom.xml
index 323ee9c076..31883ba146 100644
--- a/branches/sca-equinox/itest/callablereferences/pom.xml
+++ b/branches/sca-equinox/itest/callablereferences/pom.xml
@@ -58,7 +58,7 @@
 -->        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml b/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
index 4aea1320f3..60d1b3af0c 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
@@ -51,7 +51,7 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

diff --git a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml b/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
index 24346c6d1c..4a855334b8 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
@@ -51,7 +51,7 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
index 6decf86182..5f4e1bfd5e 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
@@ -57,7 +57,7 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
index ee11269c71..ca5edde5d0 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
@@ -57,7 +57,7 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

diff --git a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
index d3ea4f42dd..428e3279ba 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
@@ -86,7 +86,7 @@
 				
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
index 38e69bd152..22e3913dd8 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
@@ -57,7 +57,7 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>

diff --git a/branches/sca-equinox/itest/conversations-ws/pom.xml b/branches/sca-equinox/itest/conversations-ws/pom.xml
index 87827c86dd..88a247df0c 100644
--- a/branches/sca-equinox/itest/conversations-ws/pom.xml
+++ b/branches/sca-equinox/itest/conversations-ws/pom.xml
@@ -45,7 +45,7 @@
         

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>         

diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml b/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml
index bd6646344d..b74a54aeb5 100644
--- a/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml
+++ b/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/branches/sca-equinox/itest/interop-soap-service/pom.xml b/branches/sca-equinox/itest/interop-soap-service/pom.xml
index 76285e3926..4aa2593665 100644
--- a/branches/sca-equinox/itest/interop-soap-service/pom.xml
+++ b/branches/sca-equinox/itest/interop-soap-service/pom.xml
@@ -53,7 +53,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/branches/sca-equinox/itest/large-sdo-ws/pom.xml b/branches/sca-equinox/itest/large-sdo-ws/pom.xml
index 64aba086cb..7d43c544a9 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/pom.xml
+++ b/branches/sca-equinox/itest/large-sdo-ws/pom.xml
@@ -73,7 +73,7 @@
 
     </dependencies>
 
-    <!-- Declare tuscany-host-tomcat dependency in the default profile so that it can be replaced -->
+    <!-- Declare tuscany-host-jetty dependency in the default profile so that it can be replaced -->
     <profiles>
         <profile>
             <id>default</id>
@@ -83,7 +83,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.apache.tuscany.sca</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                     <version>1.4-SNAPSHOT</version>
                     <scope>runtime</scope>
                 </dependency>
diff --git a/branches/sca-equinox/itest/late-reference-resolution/pom.xml b/branches/sca-equinox/itest/late-reference-resolution/pom.xml
index f30931f309..3b3a41db41 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/pom.xml
+++ b/branches/sca-equinox/itest/late-reference-resolution/pom.xml
@@ -106,7 +106,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>   
diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index ea1c78fa2a..8d0105fbcb 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
@@ -445,7 +445,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -537,7 +537,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml b/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml
index 88c5fae221..340bb3e158 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ b/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml
@@ -446,7 +446,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -538,7 +538,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>${pom.groupId}</groupId>
-                    <artifactId>tuscany-host-tomcat</artifactId>
+                    <artifactId>tuscany-host-jetty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml b/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
index ca9257b827..6550e2f1dc 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
+++ b/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
@@ -65,7 +65,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
diff --git a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml b/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
index 2bb8001486..da0e3a0fce 100644
--- a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
+++ b/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
@@ -59,7 +59,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
diff --git a/branches/sca-equinox/itest/policy-security/pom.xml b/branches/sca-equinox/itest/policy-security/pom.xml
index e8100e9fa0..ba079444e1 100644
--- a/branches/sca-equinox/itest/policy-security/pom.xml
+++ b/branches/sca-equinox/itest/policy-security/pom.xml
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
diff --git a/branches/sca-equinox/itest/policy/pom.xml b/branches/sca-equinox/itest/policy/pom.xml
index 68d03d72b6..d889b904a3 100644
--- a/branches/sca-equinox/itest/policy/pom.xml
+++ b/branches/sca-equinox/itest/policy/pom.xml
@@ -52,7 +52,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
diff --git a/branches/sca-equinox/itest/pom.xml b/branches/sca-equinox/itest/pom.xml
index 0f106ffd6e..d20ca025d1 100644
--- a/branches/sca-equinox/itest/pom.xml
+++ b/branches/sca-equinox/itest/pom.xml
@@ -251,7 +251,7 @@
                         <configuration>
                             <primaryArtifact>false</primaryArtifact>
                             <!-- Exclude a few jars to avoid conflicts -->
-                            <warSourceExcludes>WEB-INF/lib/tuscany-host-tomcat-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar, WEB-INF/lib/catalina*.jar,WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
+                            <warSourceExcludes>WEB-INF/lib/tuscany-host-jetty-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar, WEB-INF/lib/catalina*.jar,WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
                             <webResources>
                                 <!-- Add the tests jar into the WAR -->
                                 <!--
diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml b/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml
index 0b3c3cf0c7..13d50c91fd 100644
--- a/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml
+++ b/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
diff --git a/branches/sca-equinox/itest/serialization/pom.xml b/branches/sca-equinox/itest/serialization/pom.xml
index 9a6c3ea1e3..7fbf29ced4 100644
--- a/branches/sca-equinox/itest/serialization/pom.xml
+++ b/branches/sca-equinox/itest/serialization/pom.xml
@@ -44,7 +44,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
diff --git a/branches/sca-equinox/itest/ws-void-args-return/pom.xml b/branches/sca-equinox/itest/ws-void-args-return/pom.xml
index 673a887758..db8d96b9e5 100644
--- a/branches/sca-equinox/itest/ws-void-args-return/pom.xml
+++ b/branches/sca-equinox/itest/ws-void-args-return/pom.xml
@@ -51,7 +51,7 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-tomcat</artifactId>

+            <artifactId>tuscany-host-jetty</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

         </dependency>