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 16:21:33 UTC
svn commit: r1076650 - in /aries/trunk/samples-sandbox/bank/bank-assembly:
pom.xml src/main/filtered-resources/clientConfig/config.ini
src/main/filtered-resources/serverConfig/config.ini
Author: zoe
Date: Thu Mar 3 15:21:33 2011
New Revision: 1076650
URL: http://svn.apache.org/viewvc?rev=1076650&view=rev
Log:
ARIES-595 Adding lipstick to web bundles
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
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=1076650&r1=1076649&r2=1076650&view=diff
==============================================================================
--- aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml (original)
+++ aries/trunk/samples-sandbox/bank/bank-assembly/pom.xml Thu Mar 3 15:21:33 2011
@@ -80,6 +80,18 @@
</dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.19</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.19</version>
+ </dependency>
+
+ <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jsp</artifactId>
</dependency>
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=1076650&r1=1076649&r2=1076650&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 15:21:33 2011
@@ -22,9 +22,11 @@ org.eclipse.osgi.services-3.2.100.v20100
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.8.1.jar@start,\
pax-web-extender-war-0.8.1.jar@start,\
pax-web-jsp-0.8.1.jar@start,\
+pax-web-jetty-bundle-0.8.1.jar@start,\
+jetty-6.1.19.jar@start, \
+jetty-util-6.1.19.jar@start, \
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
org.apache.aries.util-${ariesUtilVersion}.jar@start,\
org.apache.aries.proxy-${ariesProxyVersion}.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=1076650&r1=1076649&r2=1076650&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 15:21:33 2011
@@ -21,9 +21,8 @@ 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,\
-pax-web-jetty-bundle-0.8.1.jar@start,\
-pax-web-extender-war-0.8.1.jar@start,\
-pax-web-jsp-0.8.1.jar@start,\
+jetty-6.1.19.jar@start, \
+jetty-util-6.1.19.jar@start, \
org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
org.apache.aries.util-${ariesUtilVersion}.jar@start,\
@@ -44,8 +43,6 @@ org.apache.aries.application.runtime-${a
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, \