geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
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 GMT
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 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>sample-datasource</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>bank-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>calculator-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>customer-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>dbtester-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>inventory-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jaxws-calculator-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jms-mdb-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jsp-examples-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ldap-sample-app-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>myphonebook-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>mytime-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>sendmail-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>servlet-examples-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>timereport-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 	    <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>DataCDInfo-JTA-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
 
@@ -153,55 +153,55 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>cviewer-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>converter-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jarresource-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>fileupload-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>webfragment-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jpa20demo-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ejbtimer-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>singletonejb-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>restfulorder-javaee6-jetty</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->        
 
@@ -209,30 +209,37 @@
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-derby-datasource</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-web-jdbc-jetty</artifactId>            
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-web-jpa-jetty</artifactId>            
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-jetty</artifactId>            
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
+        <!-- OSGi -->
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>aries-datasource</artifactId>            
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -245,7 +252,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
+                    <category>All Samples</category>
                 </configuration>
             </plugin>
         </plugins>

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 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>sample-datasource</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>app-per-port-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
-        </dependency>
+        </dependency>-->
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>bank-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>calculator-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>customer-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>dbtester-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>inventory-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jaxws-calculator-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jms-mdb-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jsp-examples-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ldap-sample-app-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>myphonebook-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>mytime-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>sendmail-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>servlet-examples-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>timereport-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 	    <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>DataCDInfo-JTA-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
         <!--Java EE 6 Samples Plugins-->
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>cviewer-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>converter-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jarresource-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>fileupload-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>webfragment-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jpa20demo-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ejbtimer-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>singletonejb-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>restfulorder-javaee6-tomcat</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->      
 
@@ -216,30 +216,37 @@
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-derby-datasource</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-web-jdbc-tomcat</artifactId>            
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-web-jpa-tomcat</artifactId>            
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-tomcat</artifactId>            
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>-->
+        <!-- OSGi -->
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>aries-datasource</artifactId>            
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -252,7 +259,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
+                    <category>All Samples</category>
                 </configuration>
             </plugin>
         </plugins>

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.
                 <td class="Body">
                     <center>
                         <div>
-                            <a href="../dbtester/dbtester.jsp" target="sampleDocumentFrame"><strong>Test
Another Pool</strong></a>
+                            <a href="<%= request.getContextPath() %>/dbtester.jsp"
target="sampleDocumentFrame"><strong>Test Another Pool</strong></a>
                         </div>
                     </center>
                 </td>
@@ -102,4 +102,4 @@ under the License.
     </div>
 </center>
 </body>
-</html>
\ No newline at end of file
+</html>

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.
                 <td class="Body">
                     <center>
                         <div>
-                            <a href="../dbtester/dbtester.jsp" target="sampleDocumentFrame"><strong>Test
Another Pool</strong></a>
+                            <a href="<%= request.getContextPath() %>/dbtester.jsp"
target="sampleDocumentFrame"><strong>Test Another Pool</strong></a>
                         </div>
                     </center>
                 </td>
@@ -107,4 +107,4 @@ under the License.
     </div>
 </center>
 </body>
-</html>
\ No newline at end of file
+</html>

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 @@
                 <module>ldap-sample-app</module>
                 <!--<module>myphonebook</module>-->
                 <!--<module>mytime</module>-->
-                <module>sendmail</module>
+                <!--<module>sendmail</module>-->
                 <module>timereport</module>
                 <module>jsp-examples</module>
                 <module>servlet-examples</module>
-                <module>app-per-port</module>
+                <!--<module>app-per-port</module>-->
 	            <!--<module>csa-activemq</module>-->
                 <!--<module>DataCDInfo</module>-->
             </modules>

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 @@
     </parent>
 
     <artifactId>aries-datasource</artifactId>
-    <name>Geronimo Plugins, Aries Sample Datasource :: Shared Aries Sample Datasource</name>
+    <name>Geronimo Plugins :: Shared Aries Sample Datasource</name>
     <packaging>car</packaging>
 
     <description>

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 @@
     </parent>
 
     <artifactId>sample-datasource</artifactId>
-    <name>Geronimo Plugins, Sample Datasource :: Shared Sample Datasource</name>
+    <name>Geronimo Plugins :: Shared Sample Datasource</name>
     <packaging>car</packaging>
 
     <description>



Mime
View raw message