Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 791 invoked from network); 29 Jun 2010 04:01:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 29 Jun 2010 04:01:34 -0000 Received: (qmail 37855 invoked by uid 500); 29 Jun 2010 04:01:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 37732 invoked by uid 500); 29 Jun 2010 04:01:32 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 37725 invoked by uid 99); 29 Jun 2010 04:01:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jun 2010 04:01:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jun 2010 04:01:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 325BE2388978; Tue, 29 Jun 2010 04:00:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r958815 - in /geronimo/samples/branches/3.0-M1/samples: all-samples/all-samples-jetty/ all-samples/all-samples-tomcat/ javaee5/ javaee5/dbtester/dbtester-war/src/main/webapp/jsp/ osgi/aries-datasource/ sample-datasource/ Date: Tue, 29 Jun 2010 04:00:33 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100629040033.325BE2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Tue Jun 29 04:00:32 2010 New Revision: 958815 URL: http://svn.apache.org/viewvc?rev=958815&view=rev Log: GERONIMO-5399 Fix the absolute path in dbtester sample and update all-samples to include all workable samples' plugins Modified: geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml Modified: geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml?rev=958815&r1=958814&r2=958815&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml Tue Jun 29 04:00:32 2010 @@ -41,111 +41,111 @@ org.apache.geronimo.samples sample-datasource - ${version} + ${project.version} car org.apache.geronimo.samples dbtester-jetty - ${version} + ${project.version} car org.apache.geronimo.samples inventory-jetty - ${version} + ${project.version} car org.apache.geronimo.samples jsp-examples-jetty - ${version} + ${project.version} car org.apache.geronimo.samples ldap-sample-app-jetty - ${version} + ${project.version} car - + org.apache.geronimo.samples servlet-examples-jetty - ${version} + ${project.version} car org.apache.geronimo.samples timereport-jetty - ${version} + ${project.version} car @@ -153,55 +153,55 @@ org.apache.geronimo.samples cviewer-javaee6-jetty - ${version} + ${project.version} car org.apache.geronimo.samples converter-javaee6-jetty - ${version} + ${project.version} car org.apache.geronimo.samples jarresource-javaee6-jetty - ${version} + ${project.version} car org.apache.geronimo.samples fileupload-javaee6-jetty - ${version} + ${project.version} car @@ -209,30 +209,37 @@ org.apache.geronimo.samples.daytrader.plugins daytrader-derby-datasource - ${version} + ${project.version} car org.apache.geronimo.samples.daytrader.plugins daytrader-web-jdbc-jetty - ${version} + ${project.version} car org.apache.geronimo.samples.daytrader.plugins daytrader-web-jpa-jetty - ${version} + ${project.version} car + + + org.apache.geronimo.samples + aries-datasource + ${project.version} + car + @@ -245,7 +252,7 @@ true true - Sample + All Samples Modified: geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml?rev=958815&r1=958814&r2=958815&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml Tue Jun 29 04:00:32 2010 @@ -42,173 +42,173 @@ org.apache.geronimo.samples sample-datasource - ${version} + ${project.version} car - + org.apache.geronimo.samples dbtester-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples inventory-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples jsp-examples-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples ldap-sample-app-tomcat - ${version} + ${project.version} car - + org.apache.geronimo.samples servlet-examples-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples timereport-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples cviewer-javaee6-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples converter-javaee6-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples jarresource-javaee6-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples fileupload-javaee6-tomcat - ${version} + ${project.version} car @@ -216,30 +216,37 @@ org.apache.geronimo.samples.daytrader.plugins daytrader-derby-datasource - ${version} + ${project.version} car org.apache.geronimo.samples.daytrader.plugins daytrader-web-jdbc-tomcat - ${version} + ${project.version} car org.apache.geronimo.samples.daytrader.plugins daytrader-web-jpa-tomcat - ${version} + ${project.version} car + + + org.apache.geronimo.samples + aries-datasource + ${project.version} + car + @@ -252,7 +259,7 @@ true true - Sample + All Samples Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp?rev=958815&r1=958814&r2=958815&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp (original) +++ geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp Tue Jun 29 04:00:32 2010 @@ -93,7 +93,7 @@ under the License.
@@ -102,4 +102,4 @@ under the License. - \ No newline at end of file + Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp?rev=958815&r1=958814&r2=958815&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp (original) +++ geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp Tue Jun 29 04:00:32 2010 @@ -98,7 +98,7 @@ under the License.
@@ -107,4 +107,4 @@ under the License. - \ No newline at end of file + Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml?rev=958815&r1=958814&r2=958815&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml Tue Jun 29 04:00:32 2010 @@ -104,11 +104,11 @@ ldap-sample-app - sendmail + timereport jsp-examples servlet-examples - app-per-port + Modified: geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml?rev=958815&r1=958814&r2=958815&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml Tue Jun 29 04:00:32 2010 @@ -29,7 +29,7 @@ aries-datasource - Geronimo Plugins, Aries Sample Datasource :: Shared Aries Sample Datasource + Geronimo Plugins :: Shared Aries Sample Datasource car Modified: geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml?rev=958815&r1=958814&r2=958815&view=diff ============================================================================== --- geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml (original) +++ geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml Tue Jun 29 04:00:32 2010 @@ -29,7 +29,7 @@ sample-datasource - Geronimo Plugins, Sample Datasource :: Shared Sample Datasource + Geronimo Plugins :: Shared Sample Datasource car