aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r1058799 - in /aries/trunk: application/ samples/ samples/ariestrader/assemblies/equinox-test-harness/ samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/ samples/ariestrader/modules/ariestrader-we...
Date Thu, 13 Jan 2011 23:46:31 GMT
Author: not
Date: Thu Jan 13 23:46:30 2011
New Revision: 1058799

URL: http://svn.apache.org/viewvc?rev=1058799&view=rev
Log:
ARIES-539 Update pax exam and file install and make good WABs.

Modified:
    aries/trunk/application/pom.xml
    aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
    aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
    aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml
    aries/trunk/samples/blog/blog-assembly/pom.xml
    aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
    aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
    aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
    aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
    aries/trunk/samples/blog/blog-web/pom.xml
    aries/trunk/samples/pom.xml

Modified: aries/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/pom.xml?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/application/pom.xml (original)
+++ aries/trunk/application/pom.xml Thu Jan 13 23:46:30 2011
@@ -95,7 +95,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.fileinstall</artifactId>
-                <version>2.0.8</version>
+                <version>3.1.4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>

Modified: aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Thu Jan 13 23:46:30
2011
@@ -58,17 +58,14 @@
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-extender-war</artifactId>
-            <version>0.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-jetty-bundle</artifactId>
-            <version>0.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-jsp</artifactId>
-            <version>0.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
@@ -91,6 +88,10 @@
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
         </dependency>

Modified: aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
(original)
+++ aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
Thu Jan 13 23:46:30 2011
@@ -31,10 +31,11 @@ geronimo-j2ee-connector_1.5_spec-2.0.0.j
 geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
 geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
 geronimo-transaction-${geronimoTransactionVersion}.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.felix.fileinstall-2.0.8.jar@start,\
+geronimo-servlet_2.5_spec-${geronimoServletVersion}.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,\
+org.apache.felix.fileinstall-3.1.4.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,\

Modified: aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml (original)
+++ aries/trunk/samples/ariestrader/modules/ariestrader-web/pom.xml Thu Jan 13 23:46:30 2011
@@ -70,7 +70,6 @@
                 <instructions>
                   <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                   <Bundle-Version>${pom.version}</Bundle-Version>
-                  <Bundle-ClassPath>.</Bundle-ClassPath>
                   <Web-ContextPath>/ariestrader</Web-ContextPath>
                   <Web-JSPExtractLocation>/</Web-JSPExtractLocation>
                   <Private-Package>org.apache.aries.samples.ariestrader.web.*</Private-Package>

Modified: aries/trunk/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-assembly/pom.xml (original)
+++ aries/trunk/samples/blog/blog-assembly/pom.xml Thu Jan 13 23:46:30 2011
@@ -102,6 +102,11 @@
 			<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
 		</dependency>
 
+                <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                </dependency>
+
 		<dependency>
 			<groupId>org.apache.geronimo.components</groupId>
 			<artifactId>geronimo-transaction</artifactId>

Modified: aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
(original)
+++ aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
Thu Jan 13 23:46:30 2011
@@ -22,9 +22,9 @@ asm-all-3.2.jar@start,\
 pax-logging-api-1.4.jar@start,\
 pax-logging-service-1.4.jar@start,\
 derby-10.5.3.0_1.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,\
+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,\
 org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
 org.apache.aries.util-${ariesUtilVersion}.jar@start,\
 org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
@@ -39,7 +39,7 @@ org.apache.aries.application.resolver.ob
 org.apache.aries.application.noop.platform.repo-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.noop.postresolve.process-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.default.local.platform-${ariesApplicationVersion}.jar@start,\
-org.apache.felix.fileinstall-2.0.8.jar@start,\
+org.apache.felix.fileinstall-3.1.4.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,\
@@ -49,6 +49,7 @@ geronimo-j2ee-connector_1.5_spec-2.0.0.j
 geronimo-jpa_2.0_spec-${geronimoJpaSpecVersion}.jar@start,\
 geronimo-jta_1.1_spec-${geronimoJtaSpecVersion}.jar@start,\
 geronimo-transaction-${geronimoTransactionVersion}.jar@start,\
+geronimo-servlet_2.5_spec-${geronimoServletVersion}.jar@start,\
 openjpa-${openjpaVersion}.jar@start,\
 org.apache.aries.jpa.api-${ariesJpaVersion}.jar@start,\
 org.apache.aries.jpa.blueprint.aries-${ariesJpaVersion}.jar@start,\

Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
(original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
Thu Jan 13 23:46:30 2011
@@ -81,7 +81,7 @@ public class JdbcBlogSampleWithEbaTest e
 
     	System.out.println("In test and trying to get connection....");
 		*/
-        HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+        HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
         String response = getHTTPResponse(conn);
 		/* Uncomment for additional debug */
 		/*
@@ -128,6 +128,7 @@ public class JdbcBlogSampleWithEbaTest e
 
                 mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
                 mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
+                mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
                 mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
                 mavenBundle("org.apache.openjpa", "openjpa"),
                 mavenBundle("commons-lang", "commons-lang"),

Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
(original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
Thu Jan 13 23:46:30 2011
@@ -98,7 +98,7 @@ public class JpaBlogSampleWithEbaTest ex
 	System.out.println("In test and trying to get connection....");
 	*/
 
-	HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+	HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
     String response = getHTTPResponse(conn);
 
 	/* Uncomment for additional debug */
@@ -146,6 +146,7 @@ bootDelegationPackages("javax.transactio
 
             mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
             mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
+            mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
             mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
             mavenBundle("org.apache.openjpa", "openjpa"),
             mavenBundle("commons-lang", "commons-lang"),

Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
(original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
Thu Jan 13 23:46:30 2011
@@ -101,7 +101,7 @@ public class QuiesceBlogSampleWithEbaTes
 	System.out.println("In test and trying to get connection....");
 	*/
 
-	HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+	HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
     String response = getHTTPResponse(conn);
 
 	/* Uncomment for additional debug */
@@ -165,7 +165,7 @@ public class QuiesceBlogSampleWithEbaTes
 	assertTrue("No services reistered for " + bds.getSymbolicName(), isServiceRegistered(bds));
 	assertTrue("No services reistered for " + txs.getSymbolicName(), isServiceRegistered(txs));
     
-	conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+	conn = makeConnection("http://localhost:8080/blog/ViewBlog");
     response = getHTTPResponse(conn);
 
     assertEquals(HttpURLConnection.HTTP_OK,
@@ -206,6 +206,7 @@ bootDelegationPackages("javax.transactio
 
             mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
             mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
+            mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
             mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
             mavenBundle("org.apache.openjpa", "openjpa"),
             mavenBundle("commons-lang", "commons-lang"),

Modified: aries/trunk/samples/blog/blog-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-web/pom.xml?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-web/pom.xml (original)
+++ aries/trunk/samples/blog/blog-web/pom.xml Thu Jan 13 23:46:30 2011
@@ -50,7 +50,6 @@
                     <instructions>
                         <Web-ContextPath>/blog</Web-ContextPath>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Bundle-ClassPath>.</Bundle-ClassPath>
                         <Private-Package>org.apache.aries.samples.blog.web.*</Private-Package>
                         <Export-Package>!org.apache.aries.samples.blog.web.*</Export-Package>
                         <Import-Package>

Modified: aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/pom.xml?rev=1058799&r1=1058798&r2=1058799&view=diff
==============================================================================
--- aries/trunk/samples/pom.xml (original)
+++ aries/trunk/samples/pom.xml Thu Jan 13 23:46:30 2011
@@ -52,6 +52,8 @@
         <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>
         <geronimoJtaSpecVersion>1.1.1</geronimoJtaSpecVersion>
         <geronimoTransactionVersion>2.1.3</geronimoTransactionVersion>
+        <geronimoServletVersion>1.2</geronimoServletVersion>
+        <aries.javadoc.exclude.packages>*</aries.javadoc.exclude.packages>
     </properties>
     
     <dependencyManagement>
@@ -82,17 +84,17 @@
             <dependency>
                 <groupId>org.ops4j.pax.web</groupId>
                 <artifactId>pax-web-extender-war</artifactId>
-                <version>0.7.2</version>
+                <version>0.8.1</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.web</groupId>
                 <artifactId>pax-web-jetty-bundle</artifactId>
-                <version>0.7.2</version>
+                <version>0.8.1</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.web</groupId>
                 <artifactId>pax-web-jsp</artifactId>
-                <version>0.7.2</version>
+                <version>0.8.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -178,7 +180,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.fileinstall</artifactId>
-                <version>2.0.8</version>
+                <version>3.1.4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>



Mime
View raw message