Author: slaws
Date: Fri Nov 21 08:36:29 2008
New Revision: 719631
URL: http://svn.apache.org/viewvc?rev=719631&view=rev
Log:
More changes to get to a stage where I have a working build in mvn and in
Eclipse (with JDK 6)
Modified:
tuscany/java/sca/distribution/pdetarget/pom.xml
tuscany/java/sca/itest/pom.xml
tuscany/java/sca/modules/assembly-xml/pom.xml
tuscany/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
tuscany/java/sca/modules/contribution/pom.xml
tuscany/java/sca/modules/databinding-axiom/pom.xml
tuscany/java/sca/modules/databinding-jaxb/pom.xml
tuscany/java/sca/modules/databinding/pom.xml
tuscany/java/sca/modules/pom.xml
tuscany/java/sca/pom.xml
tuscany/java/sca/tools/pom.xml
Modified: tuscany/java/sca/distribution/pdetarget/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/pdetarget/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/distribution/pdetarget/pom.xml (original)
+++ tuscany/java/sca/distribution/pdetarget/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/itest/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/itest/pom.xml (original)
+++ tuscany/java/sca/itest/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/modules/assembly-xml/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ tuscany/java/sca/modules/assembly-xml/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/contribution-xml/META-INF/MANIFEST.MF Fri Nov 21
08:36:29 2008
@@ -27,8 +27,7 @@
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/
Modified: tuscany/java/sca/modules/contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/pom.xml (original)
+++ tuscany/java/sca/modules/contribution/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/modules/databinding-axiom/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-axiom/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-axiom/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-axiom/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/modules/databinding-jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-jaxb/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/modules/databinding/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/pom.xml (original)
+++ tuscany/java/sca/modules/databinding/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/pom.xml (original)
+++ tuscany/java/sca/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
Modified: tuscany/java/sca/tools/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/tools/pom.xml?rev=719631&r1=719630&r2=719631&view=diff
==============================================================================
--- tuscany/java/sca/tools/pom.xml (original)
+++ tuscany/java/sca/tools/pom.xml Fri Nov 21 08:36:29 2008
@@ -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>
