Author: antelder
Date: Thu Apr 23 07:18:40 2009
New Revision: 767828
URL: http://svn.apache.org/viewvc?rev=767828&view=rev
Log:
Merge xsd-xml module into xsd module to tentatively test out the emerging ML
consensus on module make up
Added:
tuscany/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/
- copied from r767813,
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/
tuscany/java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
- copied unchanged from r767813,
tuscany/java/sca/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
tuscany/java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
- copied unchanged from r767813,
tuscany/java/sca/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
tuscany/java/sca/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties
- copied unchanged from r767813,
tuscany/java/sca/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
tuscany/java/sca/modules/xsd/src/test/
tuscany/java/sca/modules/xsd/src/test/java/
tuscany/java/sca/modules/xsd/src/test/java/org/
tuscany/java/sca/modules/xsd/src/test/java/org/apache/
tuscany/java/sca/modules/xsd/src/test/java/org/apache/tuscany/
tuscany/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/
tuscany/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/
tuscany/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/
- copied from r767813,
tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/
tuscany/java/sca/modules/xsd/src/test/resources/
tuscany/java/sca/modules/xsd/src/test/resources/xsd/
- copied from r767813,
tuscany/java/sca/modules/xsd-xml/src/test/resources/xsd/
Removed:
tuscany/java/sca/modules/xsd-xml/
Modified:
tuscany/java/sca/features/core/pom.xml
tuscany/java/sca/modules/binding-ws-axis2/pom.xml
tuscany/java/sca/modules/binding-ws-jaxws/pom.xml
tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml
tuscany/java/sca/modules/interface-wsdl-xml/pom.xml
tuscany/java/sca/modules/pom.xml
tuscany/java/sca/modules/xsd/META-INF/MANIFEST.MF
tuscany/java/sca/modules/xsd/pom.xml
Modified: tuscany/java/sca/features/core/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/features/core/pom.xml?rev=767828&r1=767827&r2=767828&view=diff
==============================================================================
--- tuscany/java/sca/features/core/pom.xml (original)
+++ tuscany/java/sca/features/core/pom.xml Thu Apr 23 07:18:40 2009
@@ -260,11 +260,6 @@
<artifactId>tuscany-xsd</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-xsd-xml</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
Modified: tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=767828&r1=767827&r2=767828&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/pom.xml Thu Apr 23 07:18:40 2009
@@ -122,14 +122,11 @@
<version>2.0-SNAPSHOT</version>
</dependency>
- <!-- Added by Mike Edwards, 11th December 2008 -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-xsd-xml</artifactId>
+ <artifactId>tuscany-xsd</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <!-- end of addition -->
-
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: tuscany/java/sca/modules/binding-ws-jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-jaxws/pom.xml?rev=767828&r1=767827&r2=767828&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-jaxws/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-jaxws/pom.xml Thu Apr 23 07:18:40 2009
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-xsd-xml</artifactId>
+ <artifactId>tuscany-xsd</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml?rev=767828&r1=767827&r2=767828&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-wsdlgen/pom.xml Thu Apr 23 07:18:40 2009
@@ -62,11 +62,6 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-xsd-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/interface-wsdl-xml/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/pom.xml?rev=767828&r1=767827&r2=767828&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/pom.xml (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/pom.xml Thu Apr 23 07:18:40 2009
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-xsd-xml</artifactId>
+ <artifactId>tuscany-xsd</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/java/sca/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=767828&r1=767827&r2=767828&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Thu Apr 23 07:18:40 2009
@@ -99,7 +99,6 @@
<module>workspace-impl</module>
<module>workspace-xml</module>
<module>xsd</module>
- <module>xsd-xml</module>
<!-- OSGi RFC 119 -->
<module>contribution-osgi</module>
<module>implementation-osgi</module>
Modified: tuscany/java/sca/modules/xsd/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd/META-INF/MANIFEST.MF?rev=767828&r1=767827&r2=767828&view=diff
==============================================================================
--- tuscany/java/sca/modules/xsd/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/xsd/META-INF/MANIFEST.MF Thu Apr 23 07:18:40 2009
@@ -1,7 +1,21 @@
Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.xsd;uses:="org.apache.ws.common
- s.schema,org.apache.tuscany.sca.assembly,org.w3c.dom,javax.xml.namesp
- ace";version="2.0.0"
+Export-Package: org.apache.tuscany.sca.xsd;version="2.0.0";
+ uses:="org.apache.ws.commons.schema,
+ org.apache.tuscany.sca.assembly,
+ org.w3c.dom,javax.xml.namespace",
+ org.apache.tuscany.sca.xsd.xml;version="2.0.0";
+ uses:="org.apache.ws.commons.schema,
+ org.apache.ws.commons.schema.resolver,
+ org.apache.tuscany.sca.contribution,
+ org.apache.tuscany.sca.core,
+ org.apache.tuscany.sca.monitor,
+ org.w3c.dom,
+ org.apache.tuscany.sca.contribution.namespace,
+ javax.xml.namespace,
+ org.xml.sax,
+ javax.xml.stream,
+ org.apache.tuscany.sca.contribution.resolver,
+ org.apache.tuscany.sca.contribution.processor"
Private-Package: org.apache.tuscany.sca.xsd.impl;version="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA XSD Model
@@ -12,9 +26,21 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA XSD Model
-Import-Package: javax.xml.namespace,org.apache.tuscany.sca.assembly;ve
- rsion="2.0.0",org.apache.tuscany.sca.xsd;version="2.0.0",org.apache.ws.co
- mmons.schema,org.w3c.dom
+Import-Package: javax.xml.namespace,
+ javax.xml.stream,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.namespace;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.monitor;version="2.0.0",
+ org.apache.tuscany.sca.xsd;version="2.0.0",
+ org.apache.tuscany.sca.xsd.xml;version="2.0.0",
+ org.apache.ws.commons.schema,
+ org.apache.ws.commons.schema.resolver,
+ org.w3c.dom,
+ org.xml.sax
Bundle-SymbolicName: org.apache.tuscany.sca.xsd
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Modified: tuscany/java/sca/modules/xsd/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd/pom.xml?rev=767828&r1=767827&r2=767828&view=diff
==============================================================================
--- tuscany/java/sca/modules/xsd/pom.xml (original)
+++ tuscany/java/sca/modules/xsd/pom.xml Thu Apr 23 07:18:40 2009
@@ -40,6 +40,16 @@
<artifactId>XmlSchema</artifactId>
<version>1.4.2</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-contribution-namespace</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<repositories>
