More changes to get to a stage where I have a working build in mvn and in Eclipse (with JDK 6)

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

11 files changed, 70 insertions, 16 deletions

diff --git a/java/sca/distribution/pdetarget/pom.xml b/java/sca/distribution/pdetarget/pom.xml
index 4c074b58e7..29a7821814 100644
--- a/java/sca/distribution/pdetarget/pom.xml
+++ b/java/sca/distribution/pdetarget/pom.xml
@@ -39,13 +39,14 @@
         </dependency>

 

         <!-- Extra dependencies not in the core distro -->

-        <!--

+        

         <dependency>

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

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

             <type>jar</type>

             <version>2.0-SNAPSHOT</version>

         </dependency>

+         <!--

         <dependency>

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

             <artifactId>tuscany-policy-xml-ws</artifactId>

diff --git a/java/sca/itest/pom.xml b/java/sca/itest/pom.xml
index 0da7f71748..597c8810f0 100644
--- a/java/sca/itest/pom.xml
+++ b/java/sca/itest/pom.xml
@@ -58,6 +58,11 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
+            </modules>
+        </profile>
+        <profile>
+            <id>old</id>
+            <modules>
                 <module>bpel</module>
                 <module>builder</module>
                 <module>callablereferences</module>
diff --git a/java/sca/modules/assembly-xml/pom.xml b/java/sca/modules/assembly-xml/pom.xml
index d369f4abb2..7c92864b90 100644
--- a/java/sca/modules/assembly-xml/pom.xml
+++ b/java/sca/modules/assembly-xml/pom.xml
@@ -65,13 +65,22 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>        
 
+        <!-- 
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>
         </dependency>
+        -->
 
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
             <version>3.2.4</version>
diff --git a/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF b/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
index acf03cb54d..64c628412e 100644
--- a/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
+++ b/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
@@ -27,8 +27,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.core;version="1.4",

  org.apache.tuscany.sca.monitor;version="1.4",

  org.apache.tuscany.sca.policy;version="1.4.0",

- org.w3c.dom,

- org.w3c.dom.traversal

+ org.w3c.dom

 Bundle-SymbolicName: org.apache.tuscany.sca.contribution.xml

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/java/sca/modules/contribution/pom.xml b/java/sca/modules/contribution/pom.xml
index 51c3cb4f0c..751e06d910 100644
--- a/java/sca/modules/contribution/pom.xml
+++ b/java/sca/modules/contribution/pom.xml
@@ -40,12 +40,20 @@
             <artifactId>tuscany-extensibility</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-            	
+        
+        <!--     	
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>
         </dependency>
+        -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1</version>
+        </dependency>        
     </dependencies>
 
 </project>
diff --git a/java/sca/modules/databinding-axiom/pom.xml b/java/sca/modules/databinding-axiom/pom.xml
index 72bfb8deb9..027de3659c 100644
--- a/java/sca/modules/databinding-axiom/pom.xml
+++ b/java/sca/modules/databinding-axiom/pom.xml
@@ -40,12 +40,20 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>
         </dependency>
-
+        -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
diff --git a/java/sca/modules/databinding-jaxb/pom.xml b/java/sca/modules/databinding-jaxb/pom.xml
index 71b757de37..f60762ef87 100644
--- a/java/sca/modules/databinding-jaxb/pom.xml
+++ b/java/sca/modules/databinding-jaxb/pom.xml
@@ -50,9 +50,21 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.stream</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>             
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1</version>
+        </dependency>        
+
+        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
             <version>2.1.7</version>
diff --git a/java/sca/modules/databinding/pom.xml b/java/sca/modules/databinding/pom.xml
index 9412497a50..0a78a00405 100644
--- a/java/sca/modules/databinding/pom.xml
+++ b/java/sca/modules/databinding/pom.xml
@@ -59,12 +59,20 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>		
 
+        <!-- 
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>
         </dependency>
-
+        -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+                
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml
index 2d7eb3948f..bd0ecce927 100644
--- a/java/sca/modules/pom.xml
+++ b/java/sca/modules/pom.xml
@@ -53,8 +53,6 @@
         <module>endpoint</module>
         <module>extensibility</module>
         <module>extensibility-equinox</module>
-        <module>host-http</module>
-        <module>host-jetty</module>
         <module>implementation-java</module>
         <module>implementation-java-runtime</module>
         <module>implementation-java-xml</module>
@@ -74,7 +72,6 @@
         <module>policy</module>
         <module>policy-security</module>
         <module>policy-xml</module>
-        <module>policy-xml-ws</module>
         <module>sca-api</module>
         <module>workspace</module>
         <module>workspace-impl</module>
@@ -232,7 +229,7 @@
                    <artifactId>maven-eclipse-plugin</artifactId>
                    <version>2.5.1</version>
                    <configuration>
-                       <skip>true</skip>
+                       <skip>false</skip>
                    </configuration>
                </plugin>
     
diff --git a/java/sca/pom.xml b/java/sca/pom.xml
index dbbd3068ca..dbbb191974 100644
--- a/java/sca/pom.xml
+++ b/java/sca/pom.xml
@@ -245,9 +245,9 @@
                 <module>tools</module>
                 <module>samples</module>
                 <module>itest</module>
-                <module>vtest</module>
-                <module>tutorials</module>
-                <module>demos</module>
+                <!--module>vtest</module-->
+                <!--module>tutorials</module-->
+                <!--module>demos</module-->
                 <module>distribution</module>
             </modules>
            <build>
@@ -289,9 +289,9 @@
             <id>dependencies</id>
             <modules>
                 <module>modules</module>
-                <module>samples</module>
+                <!--module>samples</module>
                 <module>tutorials</module>
-                <module>demos</module>
+                <module>demos</module-->
             </modules>
             <build>
                 <plugins>
diff --git a/java/sca/tools/pom.xml b/java/sca/tools/pom.xml
index 3621f10fa8..aa7b68fb64 100644
--- a/java/sca/tools/pom.xml
+++ b/java/sca/tools/pom.xml
@@ -39,7 +39,14 @@
                 <module>eclipse</module>

                 <module>sdo</module>

                 <module>maven</module>

-                <module>runtime-inspector</module>

+                <!--module>runtime-inspector</module-->

+            </modules>

+        </profile>

+        <profile>

+            <id>eclipse</id>

+            <activation>

+            </activation>

+            <modules>

             </modules>

         </profile>

     </profiles>