Author: antelder
Date: Fri May 15 07:48:45 2009
New Revision: 775053
URL: http://svn.apache.org/viewvc?rev=775053&view=rev
Log:
Merge implementation-java-xml into implementation-java module
Added:
tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/
- copied from r774638,
tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/
tuscany/java/sca/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
- copied unchanged from r774638,
tuscany/java/sca/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
- copied unchanged from r774638,
tuscany/java/sca/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
tuscany/java/sca/modules/implementation-java/src/test/java/calculator/
- copied from r774638,
tuscany/java/sca/modules/implementation-java-xml/src/test/java/calculator/
tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/
- copied from r774638,
tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/
tuscany/java/sca/modules/implementation-java/src/test/resources/
- copied from r774638,
tuscany/java/sca/modules/implementation-java-xml/src/test/resources/
Removed:
tuscany/java/sca/modules/implementation-java-xml/
Modified:
tuscany/java/sca/modules/endpoint/pom.xml
tuscany/java/sca/modules/implementation-java-runtime/pom.xml
tuscany/java/sca/modules/implementation-java/META-INF/MANIFEST.MF
tuscany/java/sca/modules/implementation-java/pom.xml
tuscany/java/sca/modules/pom.xml
Modified: tuscany/java/sca/modules/endpoint/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/endpoint/pom.xml?rev=775053&r1=775052&r2=775053&view=diff
==============================================================================
--- tuscany/java/sca/modules/endpoint/pom.xml (original)
+++ tuscany/java/sca/modules/endpoint/pom.xml Fri May 15 07:48:45 2009
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-xml</artifactId>
+ <artifactId>tuscany-implementation-java</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/java/sca/modules/implementation-java-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/pom.xml?rev=775053&r1=775052&r2=775053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/pom.xml Fri May 15
07:48:45 2009
@@ -43,12 +43,6 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-xml</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/java/sca/modules/implementation-java/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java/META-INF/MANIFEST.MF?rev=775053&r1=775052&r2=775053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/implementation-java/META-INF/MANIFEST.MF Fri May
15 07:48:45 2009
@@ -21,15 +21,22 @@
Bundle-Description: Apache Tuscany SCA Java Implementation Model
Import-Package: javax.jws,
javax.xml.namespace,
+ javax.xml.stream,
org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,
org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,
org.apache.tuscany.sca.implementation.java;version="2.0.0",
org.apache.tuscany.sca.implementation.java.introspect;version="2.0.0",
org.apache.tuscany.sca.interfacedef;version="2.0.0",
org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0";resolution:=optional,
org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0",
org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.policy.util;version="2.0.0",
org.oasisopen.sca;version="2.0.0",
Modified: tuscany/java/sca/modules/implementation-java/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java/pom.xml?rev=775053&r1=775052&r2=775053&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-java/pom.xml Fri May 15 07:48:45
2009
@@ -52,6 +52,46 @@
<artifactId>jsr181-api</artifactId>
<version>1.0-MR1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xml</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-extensibility</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-xml</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-definitions-xml</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<repositories>
Modified: tuscany/java/sca/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=775053&r1=775052&r2=775053&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Fri May 15 07:48:45 2009
@@ -67,7 +67,6 @@
<module>implementation-bpel-ode</module>
<module>implementation-java</module>
<module>implementation-java-runtime</module>
- <module>implementation-java-xml</module>
<module>implementation-node</module>
<module>implementation-node-runtime</module>
<module>implementation-spring</module>
