You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2010/12/09 16:04:17 UTC
svn commit: r1043991 - in
/incubator/aries/trunk/samples-sandbox/bank/bank-assembly: pom.xml
src/main/filtered-resources/serverConfig/config.ini
Author: zoe
Date: Thu Dec 9 15:04:17 2010
New Revision: 1043991
URL: http://svn.apache.org/viewvc?rev=1043991&view=rev
Log:
ARIES-499 Pick up latest Tuscany release
Modified:
incubator/aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml
incubator/aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini
Modified: incubator/aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml?rev=1043991&r1=1043990&r2=1043991&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml Thu Dec 9 15:04:17 2010
@@ -29,10 +29,10 @@
<properties>
<!--
- This downloads a pre-released version. Needs fixing as soon as release is available.
+ Set the Tuscany version and site
-->
<tuscany-version>2.0-Beta1</tuscany-version>
- <tuscany-site>http://people.apache.org/~slaws/tuscany/2.0-beta1-RC3/</tuscany-site>
+ <tuscany-site>http://www.apache.org/dist/tuscany/java/sca/</tuscany-site>
</properties>
@@ -163,6 +163,19 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <version>2.1_3_4</version>
+ </dependency>
+
</dependencies>
<build>
@@ -185,16 +198,13 @@
<configuration>
<tasks>
<!-- Uncomment this to download the Tuscany distro. Altenatively - make a copy in the reources dir of the project -->
- <!--
- <get src="${tuscany-site}/apache-tuscany-sca-all-${tuscany-version}.zip" dest="${project.build.directory}/tuscany-${tuscany-version}.zip" />
+ <get src="${tuscany-site}${tuscany-version}/apache-tuscany-sca-all-${tuscany-version}.zip" dest="${project.build.directory}/tuscany-${tuscany-version}.zip" />
<unzip src="${project.build.directory}/tuscany-${tuscany-version}.zip" dest="${project.build.directory}/" overwrite="true"/>
- -->
- <get src="${tuscany-site}/apache-tuscany-sca-all-${tuscany-version}.zip" dest="${project.build.directory}/tuscany-${tuscany-version}.zip" />
<!-- Or you may find it easier just to put the Tuscany distro somewhere local and copy/unzip -->
<!--
<copy file="src/main/resources/apache-tuscany-sca-all-2.0-Beta1.zip" todir="${project.build.directory}/" />
- -->
<unzip src="${project.build.directory}/tuscany-2.0-Beta1.zip" dest="${project.build.directory}/" overwrite="true"/>
+ -->
</tasks>
</configuration>
</execution>
Modified: incubator/aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini?rev=1043991&r1=1043990&r2=1043991&view=diff
==============================================================================
--- incubator/aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini (original)
+++ incubator/aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini Thu Dec 9 15:04:17 2010
@@ -40,8 +40,8 @@ org.apache.aries.application.default.loc
org.apache.felix.fileinstall-2.0.8.jar@start,\
org.apache.felix.bundlerepository-1.6.4.jar@start,\
org.apache.aries.application.runtime-${ariesApplicationVersion}.jar@start,\
-tuscany-sca-${tuscany-version}/modules/asm-3.1@:start, \
-tuscany-sca-${tuscany-version}/modules/cglib-2.2@:start, \
+asm-all-3.2.jar@start,\
+org.apache.servicemix.bundles.cglib-2.1_3_4.jar@start, \
tuscany-sca-${tuscany-version}/modules/geronimo-el_1.0_spec-1.0.1.jar@start, \
tuscany-sca-${tuscany-version}/modules/geronimo-jsp_2.1_spec-1.0.1.jar@start, \
tuscany-sca-${tuscany-version}/modules/jsr311-api-1.1.jar@start, \