On Thu, Jun 12, 2008 at 2:46 AM, <[EMAIL PROTECTED]> wrote: > Author: jsdelfino > Date: Wed Jun 11 18:46:06 2008 > New Revision: 666943 > > URL: http://svn.apache.org/viewvc?rev=666943&view=rev > Log: > Merged implementation-node-xml with implementation-node as it only depends > on assembly-xml and no other modules depend on it. > > Added: > > > incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java > - copied, changed from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java > > > incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java > - copied, changed from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java > > > incubator/tuscany/java/sca/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor > - copied, changed from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java > - copied, changed from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java > - copied, changed from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/ > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite > - copied, changed from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite > > > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite > - copied, changed from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite > Removed: > incubator/tuscany/java/sca/modules/implementation-node-xml/DISCLAIMER > incubator/tuscany/java/sca/modules/implementation-node-xml/LICENSE > incubator/tuscany/java/sca/modules/implementation-node-xml/NOTICE > incubator/tuscany/java/sca/modules/implementation-node-xml/pom.xml > > > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java > > > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java > > > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor > > > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java > > > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java > > > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite > > > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite > Modified: > incubator/tuscany/java/sca/distribution/bundle/pom.xml > incubator/tuscany/java/sca/distribution/manifest/pom.xml > incubator/tuscany/java/sca/distribution/webapp/pom.xml > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml > > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml > incubator/tuscany/java/sca/modules/domain-manager/pom.xml > incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml > incubator/tuscany/java/sca/modules/implementation-node/pom.xml > incubator/tuscany/java/sca/modules/node2-impl/pom.xml > incubator/tuscany/java/sca/modules/pom.xml > incubator/tuscany/java/sca/modules/runtime/pom.xml > incubator/tuscany/java/sca/samples/domain-management/pom.xml > > Modified: incubator/tuscany/java/sca/distribution/bundle/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/bundle/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original) > +++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Wed Jun 11 > 18:46:06 2008 > @@ -350,11 +350,6 @@ > </dependency> > <dependency> > <groupId>${pom.groupId}</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>${pom.version}</version> > - </dependency> > - <dependency> > - <groupId>${pom.groupId}</groupId> > <artifactId>tuscany-implementation-node-runtime</artifactId> > <version>${pom.version}</version> > <exclusions> > > Modified: incubator/tuscany/java/sca/distribution/manifest/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/manifest/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/distribution/manifest/pom.xml (original) > +++ incubator/tuscany/java/sca/distribution/manifest/pom.xml Wed Jun 11 > 18:46:06 2008 > @@ -428,11 +428,6 @@ > </dependency> > <dependency> > <groupId>${pom.groupId}</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>${pom.version}</version> > - </dependency> > - <dependency> > - <groupId>${pom.groupId}</groupId> > <artifactId>tuscany-implementation-node-runtime</artifactId> > <version>${pom.version}</version> > <exclusions> > > Modified: incubator/tuscany/java/sca/distribution/webapp/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/distribution/webapp/pom.xml (original) > +++ incubator/tuscany/java/sca/distribution/webapp/pom.xml Wed Jun 11 > 18:46:06 2008 > @@ -253,11 +253,6 @@ > </dependency> > <dependency> > <groupId>${pom.groupId}</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>${pom.version}</version> > - </dependency> > - <dependency> > - <groupId>${pom.groupId}</groupId> > <artifactId>tuscany-implementation-notification</artifactId> > <version>${pom.version}</version> > </dependency> > > Modified: > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml > (original) > +++ > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml Wed > Jun 11 18:46:06 2008 > @@ -229,11 +229,6 @@ > </dependency> > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>2.0-incubating-SNAPSHOT</version> > - </dependency> > - <dependency> > - <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-implementation-notification</artifactId> > <version>2.0-incubating-SNAPSHOT</version> > </dependency> > > Modified: > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml > (original) > +++ > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml > Wed Jun 11 18:46:06 2008 > @@ -450,11 +450,6 @@ > </dependency> > <dependency> > <groupId>${pom.groupId}</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>${pom.version}</version> > - </dependency> > - <dependency> > - <groupId>${pom.groupId}</groupId> > <artifactId>tuscany-implementation-node-runtime</artifactId> > <version>${pom.version}</version> > <exclusions> > > Modified: incubator/tuscany/java/sca/modules/domain-manager/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/modules/domain-manager/pom.xml (original) > +++ incubator/tuscany/java/sca/modules/domain-manager/pom.xml Wed Jun 11 > 18:46:06 2008 > @@ -49,12 +49,6 @@ > > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>2.0-incubating-SNAPSHOT</version> > - </dependency> > - > - <dependency> > - <groupId>org.apache.tuscany.sca</groupId> > <artifactId>tuscany-implementation-node-runtime</artifactId> > <version>2.0-incubating-SNAPSHOT</version> > </dependency> > > Modified: > incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml > (original) > +++ incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml > Wed Jun 11 18:46:06 2008 > @@ -32,7 +32,7 @@ > <dependencies> > <dependency> > <groupId>org.apache.tuscany.sca</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > + <artifactId>tuscany-implementation-node</artifactId> > <version>2.0-incubating-SNAPSHOT</version> > </dependency> > > > Modified: incubator/tuscany/java/sca/modules/implementation-node/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/modules/implementation-node/pom.xml > (original) > +++ incubator/tuscany/java/sca/modules/implementation-node/pom.xml Wed Jun > 11 18:46:06 2008 > @@ -43,6 +43,19 @@ > </dependency> > > <dependency> > + <groupId>org.apache.tuscany.sca</groupId> > + <artifactId>tuscany-assembly-xml</artifactId> > + <version>2.0-incubating-SNAPSHOT</version> > + </dependency> > + > + <dependency> > + <groupId>org.apache.tuscany.sca</groupId> > + <artifactId>tuscany-host-embedded</artifactId> > + <version>2.0-incubating-SNAPSHOT</version> > + <scope>test</scope> > + </dependency> > + > + <dependency> > <groupId>junit</groupId> > <artifactId>junit</artifactId> > <version>4.2</version> > > Copied: > incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java > (from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java) > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java?p2=incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java&p1=incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java&r1=666925&r2=666943&rev=666943&view=diff > > ============================================================================== > (empty) > > Copied: > incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java > (from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java) > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java?p2=incubator/tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java&p1=incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java&r1=666925&r2=666943&rev=666943&view=diff > > ============================================================================== > (empty) > > Copied: > incubator/tuscany/java/sca/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor > (from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor) > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?p2=incubator/tuscany/java/sca/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor&p1=incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor&r1=666925&r2=666943&rev=666943&view=diff > > ============================================================================== > (empty) > > Copied: > incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java > (from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java) > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java?p2=incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java&p1=incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java&r1=666925&r2=666943&rev=666943&view=diff > > ============================================================================== > (empty) > > Copied: > incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java > (from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java) > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java?p2=incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java&p1=incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java&r1=666925&r2=666943&rev=666943&view=diff > > ============================================================================== > (empty) > > Copied: > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite > (from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite) > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite?p2=incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite&p1=incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite&r1=666925&r2=666943&rev=666943&view=diff > > ============================================================================== > (empty) > > Copied: > incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite > (from r666925, > incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite) > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite?p2=incubator/tuscany/java/sca/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite&p1=incubator/tuscany/java/sca/modules/implementation-node-xml/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite&r1=666925&r2=666943&rev=666943&view=diff > > ============================================================================== > (empty) > > Modified: incubator/tuscany/java/sca/modules/node2-impl/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-impl/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/modules/node2-impl/pom.xml (original) > +++ incubator/tuscany/java/sca/modules/node2-impl/pom.xml Wed Jun 11 > 18:46:06 2008 > @@ -69,13 +69,6 @@ > <scope>runtime</scope> > </dependency> > > - <dependency> > - <groupId>org.apache.tuscany.sca</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>2.0-incubating-SNAPSHOT</version> > - <scope>runtime</scope> > - </dependency> > - > </dependencies> > > > > Modified: incubator/tuscany/java/sca/modules/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/modules/pom.xml (original) > +++ incubator/tuscany/java/sca/modules/pom.xml Wed Jun 11 18:46:06 2008 > @@ -131,7 +131,6 @@ > <module>implementation-java-xml</module> > <module>implementation-java-runtime</module> > <module>implementation-node</module> > - <module>implementation-node-xml</module> > <module>implementation-node-runtime</module> > <module>implementation-notification</module> > <module>implementation-osgi</module> > > Modified: incubator/tuscany/java/sca/modules/runtime/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/modules/runtime/pom.xml (original) > +++ incubator/tuscany/java/sca/modules/runtime/pom.xml Wed Jun 11 18:46:06 > 2008 > @@ -267,11 +267,6 @@ > </dependency> > <dependency> > <groupId>${pom.groupId}</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>${pom.version}</version> > - </dependency> > - <dependency> > - <groupId>${pom.groupId}</groupId> > <artifactId>tuscany-implementation-notification</artifactId> > <version>${pom.version}</version> > </dependency> > > Modified: incubator/tuscany/java/sca/samples/domain-management/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/pom.xml?rev=666943&r1=666942&r2=666943&view=diff > > ============================================================================== > --- incubator/tuscany/java/sca/samples/domain-management/pom.xml (original) > +++ incubator/tuscany/java/sca/samples/domain-management/pom.xml Wed Jun 11 > 18:46:06 2008 > @@ -116,13 +116,6 @@ > </dependency> > > <dependency> > - <groupId>org.apache.tuscany.sca</groupId> > - <artifactId>tuscany-implementation-node-xml</artifactId> > - <version>2.0-incubating-SNAPSHOT</version> > - <scope>runtime</scope> > - </dependency> > - > - <dependency> > <groupId>xerces</groupId> > <artifactId>xercesImpl</artifactId> > <version>2.8.1</version> > > > I still see the implementation-node-xml directory structure. No files in it though. Was the intention to remove this completely?
Simon
