incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r1003551 - in /incubator/aries/trunk/samples: ./ ariestrader/assemblies/equinox-test-harness/ ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/ blog/blog-assembly/ blog/blog-assembly/src/main/filtered-re...
Date Fri, 01 Oct 2010 14:56:14 GMT
Author: jbohn
Date: Fri Oct  1 14:56:14 2010
New Revision: 1003551

URL: http://svn.apache.org/viewvc?rev=1003551&view=rev
Log:
ARIES-425 - get blog and ariestrader sample assemblies working with obr resolver

Modified:
    incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
    incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
    incubator/aries/trunk/samples/blog/blog-assembly/pom.xml
    incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
    incubator/aries/trunk/samples/pom.xml

Modified: incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml?rev=1003551&r1=1003550&r2=1003551&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Fri
Oct  1 14:56:14 2010
@@ -110,12 +110,6 @@
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.serp</artifactId>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-        </dependency>
--->
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
@@ -125,6 +119,10 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.fileinstall</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.bundlerepository</artifactId>
+        </dependency>
 
 
         <!--
@@ -198,10 +196,13 @@
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.deployment.management</artifactId>
         </dependency>
-<dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.resolver.obr</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.resolver.obr</artifactId>
-           
         </dependency>
 
 

Modified: incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=1003551&r1=1003550&r2=1003551&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
(original)
+++ incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
Fri Oct  1 14:56:14 2010
@@ -35,6 +35,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.felix.fileinstall-2.0.8.jar@start,\
+org.apache.felix.bundlerepository-1.6.4.jar@start,\
 org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\

Modified: incubator/aries/trunk/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=1003551&r1=1003550&r2=1003551&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/blog/blog-assembly/pom.xml Fri Oct  1 14:56:14 2010
@@ -80,6 +80,11 @@
 			<artifactId>org.apache.felix.fileinstall</artifactId>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.bundlerepository</artifactId>
+        </dependency>
+
 		<!--  Additional (JPA persistence layer) platform dependencies -->
 
 		<dependency>
@@ -170,19 +175,18 @@
 			<groupId>org.apache.aries.application</groupId>
 			<artifactId>org.apache.aries.application.utils</artifactId>
 		</dependency>
-                <dependency>
-                        <groupId>org.apache.aries.application</groupId>
-                        <artifactId>org.apache.aries.application.modeller</artifactId>
-                </dependency>
-                <dependency>
-                        <groupId>org.apache.aries.application</groupId>
-                        <artifactId>org.apache.aries.application.deployment.management</artifactId>
-                </dependency>
-<dependency>
+        <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.modeller</artifactId>
+        </dependency>
+        <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.deployment.management</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.resolver.obr</artifactId>
-           
-        </dependency>
+         </dependency>
 
 		<!-- Additional (JPA persistence layer) Aries dependencies -->
 

Modified: incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=1003551&r1=1003550&r2=1003551&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
(original)
+++ incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
Fri Oct  1 14:56:14 2010
@@ -36,6 +36,7 @@ org.apache.aries.application.deployment.
 org.apache.aries.application.modeller-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.resolver.obr-${ariesApplicationVersion}.jar@start,\
 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,\
 commons-collections-3.2.1.jar@start,\
 commons-lang-2.5.jar@start,\

Modified: incubator/aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/pom.xml?rev=1003551&r1=1003550&r2=1003551&view=diff
==============================================================================
--- incubator/aries/trunk/samples/pom.xml (original)
+++ incubator/aries/trunk/samples/pom.xml Fri Oct  1 14:56:14 2010
@@ -178,6 +178,11 @@
                 <artifactId>org.apache.felix.fileinstall</artifactId>
                 <version>2.0.8</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.bundlerepository</artifactId>
+                <version>1.6.4</version>
+            </dependency>
 
             <!-- other aries subproject dependency management -->
             <dependency>



Mime
View raw message