geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1306450 - in /geronimo/samples/branches/3.0-beta: ./ samples/all-samples/all-samples-tomcat/ samples/javaee5/chat/ samples/javaee5/chat/chat-tomcat/ samples/javaee5/chat/chat-war/ samples/javaee6/converter-javaee6/converter-javaee6-war/ sa...
Date Wed, 28 Mar 2012 16:10:41 GMT
Author: xiaming
Date: Wed Mar 28 16:10:40 2012
New Revision: 1306450

URL: http://svn.apache.org/viewvc?rev=1306450&view=rev
Log:
Make 3.0-beta sample compilable

Modified:
    geronimo/samples/branches/3.0-beta/pom.xml
    geronimo/samples/branches/3.0-beta/samples/all-samples/all-samples-tomcat/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee5/chat/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
    geronimo/samples/branches/3.0-beta/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/pom.xml

Modified: geronimo/samples/branches/3.0-beta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/pom.xml (original)
+++ geronimo/samples/branches/3.0-beta/pom.xml Wed Mar 28 16:10:40 2012
@@ -46,7 +46,7 @@
     </scm>
 
     <properties>
-        <geronimoVersion>3.0-beta-1</geronimoVersion>
+        <geronimoVersion>3.0-beta-2-SNAPSHOT</geronimoVersion>
         <siteId>geronimo-samples</siteId>
         <projectName>Apache Geronimo Samples</projectName>
         <jetty>jetty8</jetty>

Modified: geronimo/samples/branches/3.0-beta/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/all-samples/all-samples-tomcat/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-beta/samples/all-samples/all-samples-tomcat/pom.xml Wed
Mar 28 16:10:40 2012
@@ -158,7 +158,7 @@
         </dependency>-->
         
         <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
+            <groupId>org.apache.geronimo.samples.javaee5</groupId>
             <artifactId>chat-tomcat</artifactId>
             <version>${project.version}</version>
             <type>car</type>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/pom.xml Wed Mar 28
16:10:40 2012
@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.samples</groupId>
+        <groupId>org.apache.geronimo.samples.javaee5</groupId>
         <artifactId>chat</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-beta-2-SNAPSHOT</version>
     </parent>
 
     <artifactId>chat-tomcat</artifactId>
@@ -38,7 +38,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
+            <groupId>org.apache.geronimo.samples.javaee5</groupId>
             <artifactId>chat-war</artifactId>
             <version>${version}</version>
             <type>war</type>
@@ -97,7 +97,7 @@
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                       
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.apache.geronimo.samples</groupId>
+                        <groupId>org.apache.geronimo.samples.javaee5</groupId>
                         <artifactId>chat-war</artifactId>
                         <version>${version}</version>
                         <type>war</type>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/pom.xml (original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/pom.xml Wed Mar 28 16:10:40
2012
@@ -21,9 +21,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo.samples</groupId>
+        <groupId>org.apache.geronimo.samples.javaee5</groupId>
         <artifactId>chat</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-beta-2-SNAPSHOT</version>
     </parent>
     <artifactId>chat-war</artifactId>
     <name>Geronimo Samples :: Asynchronous HTTP :: Chat</name>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>catalina</artifactId>
-            <version>7.0.19.2</version>
+            <version>7.0.23.1</version>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/samples/branches/3.0-beta/samples/javaee5/chat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee5/chat/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee5/chat/pom.xml (original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee5/chat/pom.xml Wed Mar 28 16:10:40 2012
@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.samples</groupId>
+        <groupId>org.apache.geronimo.samples.javaee5</groupId>
         <artifactId>javaee5</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-beta-2-SNAPSHOT</version>
     </parent>
 
     <artifactId>chat</artifactId>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -63,7 +63,7 @@
                         <configuration>
                             <tasks>
                                 <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -51,7 +51,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -50,7 +50,7 @@
                         <configuration>
                             <tasks>
                                 <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -54,7 +54,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -59,7 +59,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -63,7 +63,7 @@
                         <configuration>
                             <tasks>
                                 <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -82,7 +82,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -67,7 +67,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>

Modified: geronimo/samples/branches/3.0-beta/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/pom.xml?rev=1306450&r1=1306449&r2=1306450&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/pom.xml
(original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/pom.xml
Wed Mar 28 16:10:40 2012
@@ -70,7 +70,7 @@
                         <configuration>
                             <tasks>
                               <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-3.0-SNAPSHOT"
failonerror="false" overwrite="true">
+                                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}"
failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs" />
                                 </copy>
                             </tasks>



Mime
View raw message