svn commit: r1204943 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java

[gmazza]

Author: gmazza
Date: Tue Nov 22 12:08:13 2011
New Revision: 1204943

URL: http://svn.apache.org/viewvc?rev=1204943&view=rev
Log:
Merged revisions 1204015 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1204015 | gmazza | 2011-11-19 11:31:38 -0500 (Sat, 19 Nov 2011) | 1 line
  
  stray commented-out line removed
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java?rev=1204943&r1=1204942&r2=1204943&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
 Tue Nov 22 12:08:13 2011
@@ -46,7 +46,6 @@ public class Server {
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/");
 
-//        webappcontext.setWar("src/main/webapp");
         webappcontext.setWar("target/GroovySpringSupport.war");
 
         HandlerCollection handlers = new HandlerCollection();