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 2011/03/03 13:46:46 UTC
svn commit: r1076605 - in /aries/trunk/samples-sandbox:
bank/bank-assembly/pom.xml
bank/bank-assembly/src/main/filtered-resources/clientConfig/config.ini
bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini
pom.xml
Author: zoe
Date: Thu Mar 3 12:46:46 2011
New Revision: 1076605
URL: http://svn.apache.org/viewvc?rev=1076605&view=rev
Log:
ARIES-595
Modified:
aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml
aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/clientConfig/config.ini
aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini
aries/trunk/samples-sandbox/pom.xml
Modified: aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml?rev=1076605&r1=1076604&r2=1076605&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml (original)
+++ aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml Thu Mar 3 12:46:46 2011
@@ -100,6 +100,16 @@
</dependency>
<dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>org.apache.aries.quiesce</groupId>
+ <artifactId>org.apache.aries.quiesce.api</artifactId>
+ </dependency>
+-->
+ <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
</dependency>
@@ -165,7 +175,10 @@
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<version>2.1_3_4</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/clientConfig/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/clientConfig/config.ini?rev=1076605&r1=1076604&r2=1076605&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/clientConfig/config.ini (original)
+++ aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/clientConfig/config.ini Thu Mar 3 12:46:46 2011
@@ -21,11 +21,13 @@ event-1.0.100-v20070516.jar@start, \
org.eclipse.osgi.services-3.2.100.v20100503.jar@start, \
pax-logging-api-1.4.jar@start,\
pax-logging-service-1.4.jar@start,\
+geronimo-servlet_2.5_spec-1.2.jar@start,\
pax-web-jetty-bundle-0.7.2.jar@start,\
pax-web-extender-war-0.7.2.jar@start,\
pax-web-jsp-0.7.2.jar@start,\
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
org.apache.aries.util-${ariesUtilVersion}.jar@start,\
+org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
org.apache.aries.application.install-0.3-SNAPSHOT.jar@start,\
org.apache.aries.application.management-0.3-SNAPSHOT.jar@start,\
@@ -40,7 +42,10 @@ 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,\
+asm-all-3.2.jar@start,\
tuscany-sca-${tuscany-version}/modules/asm-3.1@:start, \
+tuscany-sca-${tuscany-version}/modules/jetty-6.1.19.jar, \
+tuscany-sca-${tuscany-version}/modules/jetty-util-6.1.19.jar, \
tuscany-sca-${tuscany-version}/modules/cglib-2.2@: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, \
Modified: aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini?rev=1076605&r1=1076604&r2=1076605&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini (original)
+++ aries/trunk/samples-sandbox/bank/bank-assembly/src/main/filtered-resources/serverConfig/config.ini Thu Mar 3 12:46:46 2011
@@ -25,6 +25,7 @@ pax-web-jetty-bundle-0.7.2.jar@start,\
pax-web-extender-war-0.7.2.jar@start,\
pax-web-jsp-0.7.2.jar@start,\
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
+org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
org.apache.aries.util-${ariesUtilVersion}.jar@start,\
org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
org.apache.aries.application.install-0.3-SNAPSHOT.jar@start,\
@@ -40,8 +41,11 @@ 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,\
+geronimo-servlet_2.5_spec-${geronimoServletVersion}.jar@start,\
asm-all-3.2.jar@start,\
org.apache.servicemix.bundles.cglib-2.1_3_4.jar@start, \
+tuscany-sca-${tuscany-version}/modules/jetty-6.1.19.jar, \
+tuscany-sca-${tuscany-version}/modules/jetty-util-6.1.19.jar, \
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, \
Modified: aries/trunk/samples-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples-sandbox/pom.xml?rev=1076605&r1=1076604&r2=1076605&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/pom.xml (original)
+++ aries/trunk/samples-sandbox/pom.xml Thu Mar 3 12:46:46 2011
@@ -38,15 +38,18 @@
</scm>
<properties>
- <ariesApplicationVersion>0.1-SNAPSHOT</ariesApplicationVersion>
- <ariesBlueprintVersion>0.1-SNAPSHOT</ariesBlueprintVersion>
- <ariesJmxVersion>0.1-SNAPSHOT</ariesJmxVersion>
- <ariesJndiVersion>0.1-SNAPSHOT</ariesJndiVersion>
- <ariesJpaVersion>0.1-SNAPSHOT</ariesJpaVersion>
- <ariesTransactionVersion>0.1-SNAPSHOT</ariesTransactionVersion>
- <ariesUtilVersion>0.1-SNAPSHOT</ariesUtilVersion>
- <ariesWebVersion>0.1-SNAPSHOT</ariesWebVersion>
- <openjpaVersion>2.0.0-beta3</openjpaVersion>
+ <ariesApplicationVersion>0.4-SNAPSHOT</ariesApplicationVersion>
+ <ariesBlueprintVersion>0.4-SNAPSHOT</ariesBlueprintVersion>
+ <ariesProxyVersion>0.4-SNAPSHOT</ariesProxyVersion>
+ <ariesQuiesceVersion>0.4-SNAPSHOT</ariesQuiesceVersion>
+ <ariesJmxVersion>0.4-SNAPSHOT</ariesJmxVersion>
+ <ariesJndiVersion>0.4-SNAPSHOT</ariesJndiVersion>
+ <ariesJpaVersion>0.4-SNAPSHOT</ariesJpaVersion>
+ <ariesTransactionVersion>0.4-SNAPSHOT</ariesTransactionVersion>
+ <ariesUtilVersion>0.4-SNAPSHOT</ariesUtilVersion>
+ <ariesWebVersion>0.4-SNAPSHOT</ariesWebVersion>
+ <openjpaVersion>2.0.0</openjpaVersion>
+ <geronimoServletVersion>1.2</geronimoServletVersion>
</properties>
<dependencyManagement>