Author: antelder
Date: Sun May 10 08:12:29 2009
New Revision: 773311

URL: http://svn.apache.org/viewvc?rev=773311&view=rev
Log:
Redo the contribution modules merge started in r772861 but this time including 
svn history. As everyone seems happy with this approach now instead of doing it 
in a new module its just done directly in the existing contribution module. 
This is the start of what was described on the ML as'contribution (or 
core-contribution or contribution-runtime) for all the spi/infrastructure type 
of stuff', right now it has everything so its all in one place to make things 
obvious and the other  contribution-* modules can be be created by moving bits 
out of here.

Added:
    
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/
      - copied from r773308, 
tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/
    
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/
      - copied from r773308, 
tuscany/java/sca/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/
    
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/
      - copied from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/
    
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/
      - copied from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/
    
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
      - copied unchanged from r773308, 
tuscany/java/sca/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
    
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
      - copied unchanged from r773308, 
tuscany/java/sca/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
    
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
      - copied, changed from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
      - copied unchanged from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
    
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
      - copied unchanged from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
    
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
      - copied, changed from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
    
tuscany/java/sca/modules/contribution/src/main/resources/contribution-java-validation-messages.properties
      - copied unchanged from r773308, 
tuscany/java/sca/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
    
tuscany/java/sca/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties
      - copied unchanged from r773308, 
tuscany/java/sca/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
    
tuscany/java/sca/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties
      - copied unchanged from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
    
tuscany/java/sca/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/
      - copied from r773308, 
tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/
    
tuscany/java/sca/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/
      - copied from r773308, 
tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/
    
tuscany/java/sca/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/
      - copied from r773308, 
tuscany/java/sca/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/
Removed:
    tuscany/java/sca/modules/contribution-java/
    tuscany/java/sca/modules/contribution-namespace/
    tuscany/java/sca/modules/contribution-xml/
Modified:
    tuscany/java/sca/features/core/pom.xml
    tuscany/java/sca/modules/assembly-xml-osoa/pom.xml
    tuscany/java/sca/modules/assembly-xml/pom.xml
    tuscany/java/sca/modules/contribution-osgi/pom.xml
    tuscany/java/sca/modules/contribution/META-INF/MANIFEST.MF
    tuscany/java/sca/modules/contribution/pom.xml
    tuscany/java/sca/modules/core/pom.xml
    tuscany/java/sca/modules/implementation-osgi-runtime/pom.xml
    tuscany/java/sca/modules/interface-wsdl/pom.xml
    tuscany/java/sca/modules/node-impl-osgi/pom.xml
    tuscany/java/sca/modules/node-impl2/pom.xml
    tuscany/java/sca/modules/policy-security/pom.xml
    tuscany/java/sca/modules/pom.xml
    tuscany/java/sca/modules/workspace-impl/pom.xml
    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=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/features/core/pom.xml (original)
+++ tuscany/java/sca/features/core/pom.xml Sun May 10 08:12:29 2009
@@ -83,16 +83,6 @@
             <artifactId>tuscany-contribution</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</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>
 
         <!-- Core runtime -->
         <dependency>

Modified: tuscany/java/sca/modules/assembly-xml-osoa/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml-osoa/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml-osoa/pom.xml (original)
+++ tuscany/java/sca/modules/assembly-xml-osoa/pom.xml Sun May 10 08:12:29 2009
@@ -60,25 +60,6 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
         <!-- 
         <dependency>
             <groupId>javax.xml.stream</groupId>

Modified: tuscany/java/sca/modules/assembly-xml/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ tuscany/java/sca/modules/assembly-xml/pom.xml Sun May 10 08:12:29 2009
@@ -53,25 +53,6 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
         <!-- 
         <dependency>
             <groupId>javax.xml.stream</groupId>

Modified: tuscany/java/sca/modules/contribution-osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-osgi/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-osgi/pom.xml Sun May 10 08:12:29 2009
@@ -37,12 +37,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>

Modified: tuscany/java/sca/modules/contribution/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/META-INF/MANIFEST.MF?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/contribution/META-INF/MANIFEST.MF Sun May 10 
08:12:29 2009
@@ -12,7 +12,10 @@
  ontribution.resolver,javax.xml.transform.stream,javax.xml.validation,
  org.xml.sax.helpers";version="2.0.0",org.apache.tuscany.sca.contributio
  n;uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contr
- ibution.resolver";version="2.0.0"
+ ibution.resolver";version="2.0.0",org.apache.tuscany.sca.contribution
+ .namespace;uses:="org.apache.tuscany.sca.contribution";version="2.0.0
+ ",org.apache.tuscany.sca.contribution.java;uses:="org.apache.tuscany.
+ sca.contribution";version="2.0.0"
 Private-Package: org.apache.tuscany.sca.contribution.impl;version="1.4
  "
 Tool: Bnd-0.0.255
@@ -25,7 +28,9 @@
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Contribution Model
 Import-Package: javax.xml.namespace,
+ javax.xml.parsers,
  javax.xml.stream,
+ javax.xml.stream.events,
  javax.xml.stream.util,
  javax.xml.transform,
  javax.xml.transform.stream,
@@ -33,6 +38,8 @@
  org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.assembly.impl;version="2.0.0",
  org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.java;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.contribution.scanner;version="2.0.0",
@@ -40,6 +47,7 @@
  org.apache.tuscany.sca.extensibility;version="2.0.0",
  org.apache.tuscany.sca.monitor;version="2.0.0",
  org.apache.tuscany.sca.policy;version="2.0.0",
+ org.w3c.dom,
  org.xml.sax,
  org.xml.sax.helpers
 Bundle-SymbolicName: org.apache.tuscany.sca.contribution

Modified: tuscany/java/sca/modules/contribution/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/pom.xml (original)
+++ tuscany/java/sca/modules/contribution/pom.xml Sun May 10 08:12:29 2009
@@ -41,19 +41,25 @@
             <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>
+            <version>3.2.4</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 
 </project>

Copied: 
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
 (from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?p2=tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor&p1=tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor&r1=773308&r2=773311&rev=773311&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
 (original)
+++ 
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
 Sun May 10 08:12:29 2009
@@ -18,3 +18,7 @@
 # Implementation class for the artifact processor extension
 
org.apache.tuscany.sca.contribution.xml.ContributionMetadataProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
 
org.apache.tuscany.sca.contribution.processor.xml.AnyElementProcessor;qname=http://www.w3.org/2001/XMLSchema#anyElement,model=java.lang.Object
+org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
+org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#export,model=org.apache.tuscany.sca.contribution.namespace.NamespaceExport
+org.apache.tuscany.sca.contribution.java.impl.JavaImportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
+org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport

Copied: 
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
 (from r773308, 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver)
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver?p2=tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver&p1=tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver&r1=773308&r2=773311&rev=773311&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
 (original)
+++ 
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
 Sun May 10 08:12:29 2009
@@ -16,3 +16,4 @@
 # under the License. 
 
 
org.apache.tuscany.sca.contribution.xml.ContributionModelResolver;model=org.apache.tuscany.sca.contribution.Contribution
+org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver;model=org.apache.tuscany.sca.contribution.resolver.ClassReference

Modified: tuscany/java/sca/modules/core/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/pom.xml (original)
+++ tuscany/java/sca/modules/core/pom.xml Sun May 10 08:12:29 2009
@@ -49,12 +49,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>

Modified: tuscany/java/sca/modules/implementation-osgi-runtime/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-osgi-runtime/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-osgi-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-osgi-runtime/pom.xml Sun May 10 
08:12:29 2009
@@ -48,13 +48,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
             <version>3.4.0-v20080605-1900</version>

Modified: tuscany/java/sca/modules/interface-wsdl/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl/pom.xml (original)
+++ tuscany/java/sca/modules/interface-wsdl/pom.xml Sun May 10 08:12:29 2009
@@ -49,12 +49,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>        

Modified: tuscany/java/sca/modules/node-impl-osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/node-impl-osgi/pom.xml Sun May 10 08:12:29 2009
@@ -82,13 +82,6 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>

Modified: tuscany/java/sca/modules/node-impl2/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl2/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl2/pom.xml (original)
+++ tuscany/java/sca/modules/node-impl2/pom.xml Sun May 10 08:12:29 2009
@@ -46,12 +46,6 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>          

Modified: tuscany/java/sca/modules/policy-security/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security/pom.xml (original)
+++ tuscany/java/sca/modules/policy-security/pom.xml Sun May 10 08:12:29 2009
@@ -40,6 +40,13 @@
             <artifactId>tuscany-assembly-xml</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
 </project>

Modified: tuscany/java/sca/modules/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Sun May 10 08:12:29 2009
@@ -47,9 +47,6 @@
         <module>binding-ws-wsdlgen</module>
         <module>binding-ws-xml</module>
         <module>contribution</module>
-        <module>contribution-java</module>
-        <module>contribution-namespace</module>
-        <module>contribution-xml</module>
         <module>core</module>
         <module>core-databinding</module>
         <module>core-spi</module>

Modified: tuscany/java/sca/modules/workspace-impl/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/workspace-impl/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/workspace-impl/pom.xml (original)
+++ tuscany/java/sca/modules/workspace-impl/pom.xml Sun May 10 08:12:29 2009
@@ -41,19 +41,6 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
 
 </project>

Modified: tuscany/java/sca/modules/xsd/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd/pom.xml?rev=773311&r1=773310&r2=773311&view=diff
==============================================================================
--- tuscany/java/sca/modules/xsd/pom.xml (original)
+++ tuscany/java/sca/modules/xsd/pom.xml Sun May 10 08:12:29 2009
@@ -45,11 +45,6 @@
             <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>


Reply via email to