Author: jsdelfino
Date: Thu Mar 20 00:55:30 2008
New Revision: 639192
URL: http://svn.apache.org/viewvc?rev=639192&view=rev
Log:
Merged changes in SVN revision r639187 into trunk. Added missing JARs to
distribution build. Removed obsolete feed binding JARs. Fixed class names in
calculator-distributed/build.xml.
Modified:
incubator/tuscany/java/sca/distribution/bundle/pom.xml
incubator/tuscany/java/sca/distribution/manifest/pom.xml
incubator/tuscany/java/sca/samples/calculator-distributed/build.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=639192&r1=639191&r2=639192&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Thu Mar 20 00:55:30
2008
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-binding-feed</artifactId>
+ <artifactId>tuscany-binding-atom</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
@@ -94,6 +94,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-rss</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-rss-rome</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -380,11 +385,26 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-node-impl</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-launcher</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-policy</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -507,12 +527,6 @@
</transformer>
<transformer
implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory</resource>
- </transformer>
- <transformer
implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-
<resource>META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory</resource>
- </transformer>
- <transformer
implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-
<resource>META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory</resource>
</transformer>
<transformer
implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory</resource>
Modified: incubator/tuscany/java/sca/distribution/manifest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/manifest/pom.xml?rev=639192&r1=639191&r2=639192&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/manifest/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/manifest/pom.xml Thu Mar 20
00:55:30 2008
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-binding-feed</artifactId>
+ <artifactId>tuscany-binding-atom</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
@@ -67,6 +67,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-rss</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-rss-rome</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -343,7 +348,22 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-node-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-launcher</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/build.xml?rev=639192&r1=639191&r2=639192&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
(original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/build.xml Thu Mar
20 00:55:30 2008
@@ -58,7 +58,7 @@
</target>
<target name="runNodeA">
- <java classname="node.LaunchNodeA"
+ <java classname="node.LaunchCalculatorNodeA"
fork="true">
<classpath>
<pathelement path="src/main/resources"/>
@@ -70,7 +70,7 @@
</target>
<target name="runNodeB">
- <java classname="node.LaunchNodeB"
+ <java classname="node.LaunchCalculatorNodeB"
fork="true">
<classpath>
<pathelement path="src/main/resources"/>
@@ -82,7 +82,7 @@
</target>
<target name="runNodeC">
- <java classname="node.LaunchNodeC"
+ <java classname="node.LaunchCalculatorNodeC"
fork="true">
<classpath>
<pathelement path="src/main/resources"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
