You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2011/12/23 08:45:06 UTC
svn commit: r1222598 - in /geronimo/samples/branches/3.0-beta: ./
samples/all-samples/all-samples-tomcat/ samples/javaee5/
samples/javaee5/chat/ samples/javaee5/chat/chat-tomcat/
samples/javaee5/chat/chat-tomcat/src/ samples/javaee5/chat/chat-tomcat/sr...
Author: xiaming
Date: Fri Dec 23 07:45:05 2011
New Revision: 1222598
URL: http://svn.apache.org/viewvc?rev=1222598&view=rev
Log:
GERONIMO-6242 Fork tomcat async servlet sample Chat to samples 3.0-beta branch
Added:
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-tomcat/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/pom.xml
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-tomcat/pom.xml
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/src/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-tomcat/src/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/src/main/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-tomcat/src/main/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/src/main/history/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-tomcat/src/main/history/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/src/main/history/dependencies.xml
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-tomcat/src/main/history/dependencies.xml
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/src/main/plan/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-tomcat/src/main/plan/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-tomcat/src/main/plan/plan.xml
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/README.txt
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/README.txt
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/pom.xml
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/pom.xml
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/java/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/java/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/java/chat/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/java/chat/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/java/chat/ChatServlet.java
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/java/chat/ChatServlet.java
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/WEB-INF/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/WEB-INF/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/WEB-INF/geronimo-web.xml
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/WEB-INF/web.xml
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/index.html
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/index.html
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/jsp/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/jsp/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/jsp/chat/
- copied from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/jsp/chat/
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/jsp/chat/index.jsp
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/jsp/chat/index.jsp
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/jsp/chat/login.jsp
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/jsp/chat/login.jsp
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/chat-war/src/main/webapp/jsp/chat/post.jsp
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/chat-war/src/main/webapp/jsp/chat/post.jsp
geronimo/samples/branches/3.0-beta/samples/javaee5/chat/pom.xml
- copied unchanged from r1222597, geronimo/samples/trunk/samples/javaee5/chat/pom.xml
Modified:
geronimo/samples/branches/3.0-beta/ (props changed)
geronimo/samples/branches/3.0-beta/samples/all-samples/all-samples-tomcat/pom.xml
geronimo/samples/branches/3.0-beta/samples/javaee5/pom.xml
Propchange: geronimo/samples/branches/3.0-beta/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 23 07:45:05 2011
@@ -1 +1,2 @@
/geronimo/samples/branches/3.0-M1:957816,958169,958321,958804,958815,959688,959691,959707,959709,959713
+/geronimo/samples/trunk:1222597
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=1222598&r1=1222597&r2=1222598&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 Fri Dec 23 07:45:05 2011
@@ -156,6 +156,14 @@
<version>${project.version}</version>
<type>car</type>
</dependency>-->
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>chat-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
<!--Java EE 6 Samples Plugins-->
<dependency>
<groupId>org.apache.geronimo.samples.javaee6</groupId>
Modified: geronimo/samples/branches/3.0-beta/samples/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-beta/samples/javaee5/pom.xml?rev=1222598&r1=1222597&r2=1222598&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-beta/samples/javaee5/pom.xml (original)
+++ geronimo/samples/branches/3.0-beta/samples/javaee5/pom.xml Fri Dec 23 07:45:05 2011
@@ -113,6 +113,7 @@
<!--<module>app-per-port</module>-->
<!--<module>csa-activemq</module>-->
<module>DataCDInfo</module>
+ <module>chat</module>
</modules>
</profile>
<profile>
@@ -142,6 +143,7 @@
<module>servlet-examples</module>
<module>app-per-port</module>
<module>DataCDInfo</module>
+ <module>chat</module>
</modules>
</profile>