Author: rfeng
Date: Fri Sep 19 10:37:23 2008
New Revision: 697159
URL: http://svn.apache.org/viewvc?rev=697159&view=rev
Log:
Adjust some dependency versions
Modified:
tuscany/sandbox/travelsample/calendar-contribution/pom.xml
tuscany/sandbox/travelsample/car-contribution/pom.xml
tuscany/sandbox/travelsample/common-contribution/pom.xml
tuscany/sandbox/travelsample/currency-contribution/pom.xml
tuscany/sandbox/travelsample/domain/pom.xml
tuscany/sandbox/travelsample/flight-contribution/pom.xml
tuscany/sandbox/travelsample/gettingstarted/pom.xml
tuscany/sandbox/travelsample/hotel-contribution/pom.xml
tuscany/sandbox/travelsample/node/build.xml
tuscany/sandbox/travelsample/node/pom.xml
tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java
tuscany/sandbox/travelsample/payment-contribution/pom.xml
tuscany/sandbox/travelsample/travel-contribution/pom.xml
tuscany/sandbox/travelsample/trip-contribution/pom.xml
tuscany/sandbox/travelsample/ui-contribution/build.xml
tuscany/sandbox/travelsample/ui-contribution/pom.xml
Modified: tuscany/sandbox/travelsample/calendar-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/calendar-contribution/pom.xml Fri Sep 19
10:37:23 2008
@@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/car-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/car-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/car-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/car-contribution/pom.xml Fri Sep 19 10:37:23
2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/common-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/common-contribution/pom.xml Fri Sep 19
10:37:23 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/currency-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/currency-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/currency-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/currency-contribution/pom.xml Fri Sep 19
10:37:23 2008
@@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/domain/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domain/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/domain/pom.xml (original)
+++ tuscany/sandbox/travelsample/domain/pom.xml Fri Sep 19 10:37:23 2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/flight-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/flight-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/flight-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/flight-contribution/pom.xml Fri Sep 19
10:37:23 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/gettingstarted/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/pom.xml (original)
+++ tuscany/sandbox/travelsample/gettingstarted/pom.xml Fri Sep 19 10:37:23 2008
@@ -60,7 +60,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/hotel-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/hotel-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/hotel-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/hotel-contribution/pom.xml Fri Sep 19 10:37:23
2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/node/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/build.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/node/build.xml (original)
+++ tuscany/sandbox/travelsample/node/build.xml Fri Sep 19 10:37:23 2008
@@ -73,6 +73,7 @@
<include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
<include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
<include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-axis2-policy-1.4-SNAPSHOT.jar"/>
<include name="tuscany-binding-ws-wsdlgen-1.4-SNAPSHOT.jar"/>
<include name="tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>
<include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
@@ -120,11 +121,8 @@
<include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
<include name="tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
<include name="tuscany-node-manager-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node2-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
<include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
<include name="tuscany-policy-security-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-security-ws-1.4-SNAPSHOT.jar"/>
<include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
<include name="tuscany-policy-xml-ws-1.4-SNAPSHOT.jar"/>
<include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
@@ -135,7 +133,7 @@
<include name="tuscany-xsd-xml-1.4-SNAPSHOT.jar"/>
</fileset>
<fileset id="3rdparty.jars" dir="../../lib">
- <include name="XmlSchema-1.3.2.jar"/>
+ <include name="XmlSchema-1.4.2.jar"/>
<include name="abdera-client-0.4.0-incubating.jar"/>
<include name="abdera-core-0.4.0-incubating.jar"/>
<include name="abdera-extensions-html-0.4.0-incubating.jar"/>
@@ -147,17 +145,17 @@
<include name="activation-1.1.jar"/>
<include name="annogen-0.1.0.jar"/>
<include name="asm-all-3.1.jar"/>
- <include name="axiom-api-1.2.5.jar"/>
- <include name="axiom-dom-1.2.5.jar"/>
- <include name="axiom-impl-1.2.5.jar"/>
- <include name="axis2-adb-1.3.jar"/>
- <include name="axis2-adb-codegen-1.3.jar"/>
- <include name="axis2-codegen-1.3.jar"/>
- <include name="axis2-java2wsdl-1.3.jar"/>
- <include name="axis2-kernel-1.3.jar"/>
- <include name="axis2-mtompolicy-1.3.jar"/>
- <include name="backport-util-concurrent-3.0.jar"/>
- <include name="bcprov-jdk15-132.jar"/>
+ <include name="axiom-api-1.2.7.jar"/>
+ <include name="axiom-dom-1.2.7.jar"/>
+ <include name="axiom-impl-1.2.7.jar"/>
+ <include name="axis-ant-1.4.jar"/>
+ <include name="axis2-adb-1.4.1.jar"/>
+ <include name="axis2-codegen-1.4.1.jar"/>
+ <include name="axis2-java2wsdl-1.4.1.jar"/>
+ <include name="axis2-kernel-1.4.1.jar"/>
+ <include name="axis2-mtompolicy-1.4.1.jar"/>
+ <include name="backport-util-concurrent-3.1.jar"/>
+ <include name="bcprov-jdk13-132.jar"/>
<include name="cglib-nodep-2.1_3.jar"/>
<include name="commons-codec-1.3.jar"/>
<include name="commons-collections-3.1.jar"/>
@@ -165,18 +163,17 @@
<include name="commons-fileupload-1.1.1.jar"/>
<include name="commons-httpclient-3.0.1.jar"/>
<include name="commons-io-1.1.jar"/>
- <include name="commons-logging-1.1.jar"/>
+ <include name="commons-logging-1.1.1.jar"/>
<include name="derby-10.3.1.4.jar"/>
- <include name="geronimo-activation_1.1_spec-1.0-M1.jar"/>
+ <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
<include name="geronimo-commonj_1.1_spec-1.0.jar"/>
<include name="geronimo-ejb_3.0_spec-1.0.jar"/>
- <include name="geronimo-javamail_1.4_spec-1.0-M1.jar"/>
+ <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
<include name="geronimo-jms_1.1_spec-1.1.jar"/>
<include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<include name="htmlparser-1.0.5.jar"/>
- <include name="httpcore-4.0-alpha5.jar"/>
- <include name="httpcore-nio-4.0-alpha5.jar"/>
- <include name="httpcore-niossl-4.0-alpha5.jar"/>
+ <include name="httpcore-4.0-beta1.jar"/>
+ <include name="httpcore-nio-4.0-beta1.jar"/>
<include name="jaxb-api-2.1.jar"/>
<include name="jaxb-impl-2.1.7.jar"/>
<include name="jaxen-1.1.1.jar"/>
@@ -188,25 +185,26 @@
<include name="jsr181-api-1.0-MR1.jar"/>
<include name="jsr250-api-1.0.jar"/>
<include name="junit-3.8.1.jar"/>
- <include name="log4j-1.2.12.jar"/>
- <include name="logkit-1.0.1.jar"/>
+ <include name="log4j-1.2.15.jar"/>
<include name="mail-1.4.jar"/>
- <include name="neethi-2.0.2.jar"/>
+ <include name="mex-1.41-impl.jar"/>
+ <include name="neethi-2.0.4.jar"/>
<include name="opensaml-1.1.jar"/>
- <include name="rampart-core-1.3.jar"/>
- <include name="rampart-policy-1.3.jar"/>
- <include name="rampart-trust-1.3.jar"/>
+ <include name="rampart-core-1.4.jar"/>
+ <include name="rampart-policy-1.4.jar"/>
+ <include name="rampart-trust-1.4.jar"/>
<include name="servlet-api-2.5.jar"/>
<include name="stax-api-1.0-2.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="woden-1.0-incubating-M7b.jar"/>
+ <include name="woden-api-1.0M8.jar"/>
+ <include name="woden-impl-dom-1.0M8.jar"/>
<include name="wsdl4j-1.6.2.jar"/>
- <include name="wss4j-1.5.3.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
+ <include name="wss4j-1.5.4.jar"/>
+ <include name="wstx-asl-3.2.4.jar"/>
<include name="xalan-2.7.0.jar"/>
<include name="xercesImpl-2.8.1.jar"/>
<include name="xml-apis-1.3.03.jar"/>
- <include name="xmlsec-1.4.0.jar"/>
+ <include name="xmlParserAPIs-2.6.0.jar"/>
+ <include name="xmlsec-1.4.2.jar"/>
</fileset>
</project>
Modified: tuscany/sandbox/travelsample/node/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/node/pom.xml (original)
+++ tuscany/sandbox/travelsample/node/pom.xml Fri Sep 19 10:37:23 2008
@@ -31,13 +31,13 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node2-api</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node2-launcher</artifactId>
+ <artifactId>tuscany-node-launcher</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
Modified: tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java (original)
+++ tuscany/sandbox/travelsample/node/src/scatours/LaunchNode.java Fri Sep 19
10:37:23 2008
@@ -22,8 +22,8 @@
import java.io.IOException;
import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.apache.tuscany.sca.node.launcher.NodeLauncher;
public class LaunchNode {
@@ -33,10 +33,10 @@
// OK for development but you must launch the node from this module
public static void launchFromFileSystemJar(){
- SCANode2 node = null;
+ SCANode node = null;
try {
- node =
SCANode2Factory.newInstance().createSCANode("scatours.composite",
+ node =
SCANodeFactory.newInstance().createSCANode("scatours.composite",
new
SCAContribution("common",
"../common-contribution/target/scatours-common-contribution.jar"),
new
SCAContribution("currency",
"../currency-contribution/target/scatours-currency-contribution.jar"),
new
SCAContribution("hotel",
"../hotel-contribution/target/scatours-hotel-contribution.jar"),
@@ -62,10 +62,10 @@
// OK for development but you must launch the node from this module
public static void launchFromFileSystemDir(){
- SCANode2 node = null;
+ SCANode node = null;
try {
- node =
SCANode2Factory.newInstance().createSCANode("scatours.composite",
+ node =
SCANodeFactory.newInstance().createSCANode("scatours.composite",
new
SCAContribution("common", "../common-contribution/target/classes"),
new
SCAContribution("currency", "../currency-contribution/target/classes"),
new
SCAContribution("hotel", "../hotel-contribution/target/classes"),
@@ -90,10 +90,10 @@
// OK for samples but you can only load one contribution
public static void launchFromClasspath(){
- SCANode2 node = null;
+ SCANode node = null;
try {
- node =
SCANode2Factory.newInstance().createSCANodeFromClassLoader("scatours.composite",
null);
+ node =
SCANodeFactory.newInstance().createSCANodeFromClassLoader("scatours.composite",
null);
node.start();
System.out.println("Node started - Press enter to shutdown.");
Modified: tuscany/sandbox/travelsample/payment-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/payment-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/payment-contribution/pom.xml Fri Sep 19
10:37:23 2008
@@ -66,7 +66,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/travel-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/travel-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/travel-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/travel-contribution/pom.xml Fri Sep 19
10:37:23 2008
@@ -62,7 +62,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/trip-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/trip-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/trip-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/trip-contribution/pom.xml Fri Sep 19 10:37:23
2008
@@ -56,7 +56,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/ui-contribution/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/ui-contribution/build.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/ui-contribution/build.xml (original)
+++ tuscany/sandbox/travelsample/ui-contribution/build.xml Fri Sep 19 10:37:23
2008
@@ -91,7 +91,7 @@
<include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
</fileset>
<fileset id="3rdparty.jars" dir="../../lib">
- <include name="XmlSchema-1.3.2.jar"/>
+ <include name="XmlSchema-1.4.2.jar"/>
<include name="activation-1.1.jar"/>
<include name="asm-all-3.1.jar"/>
<include name="cglib-nodep-2.1_3.jar"/>
@@ -102,7 +102,7 @@
<include name="jsr181-api-1.0-MR1.jar"/>
<include name="jsr250-api-1.0.jar"/>
<include name="stax-api-1.0-2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
+ <include name="wstx-asl-3.2.4.jar"/>
</fileset>
</project>
Modified: tuscany/sandbox/travelsample/ui-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/ui-contribution/pom.xml?rev=697159&r1=697158&r2=697159&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/ui-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/ui-contribution/pom.xml Fri Sep 19 10:37:23
2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
