cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1204942 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/samples/groovy_spring_support/ distribution/src/main/release/samples/groovy_spring_support/src/demo/ distribution/src/main/release/samples/groovy_spring_support/src/m...
Date Tue, 22 Nov 2011 12:07:14 GMT
Author: gmazza
Date: Tue Nov 22 12:07:13 2011
New Revision: 1204942

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

........
  r1204014 | gmazza | 2011-11-19 11:21:43 -0500 (Sat, 19 Nov 2011) | 1 line
  
  Better Mavenized the groovy sample; switched to the sample's parent-level web.xml
........

Added:
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/
      - copied from r1204014, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/HelloWorld.groovy
      - copied unchanged from r1204014, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/HelloWorld.groovy
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/HelloWorldImpl.groovy
      - copied unchanged from r1204014, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/HelloWorldImpl.groovy
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/client-beans.xml
      - copied unchanged from r1204014, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/resources/client-beans.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/
      - copied from r1204014, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/
      - copied from r1204014, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
      - copied unchanged from r1204014, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
Removed:
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.groovy
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorldImpl.groovy
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/client-beans.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/webapp/
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
    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/
            ('svn:mergeinfo' removed)

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/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml?rev=1204942&r1=1204941&r2=1204942&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml
Tue Nov 22 12:07:13 2011
@@ -55,26 +55,8 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>prepare-transform</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${basedir}/src/main/java/demo/spring/HelloWorldImpl.groovy"
todir="${basedir}/target/classes/demo/spring" />
-                                <copy file="${basedir}/src/main/java/demo/spring/HelloWorld.groovy"
todir="${basedir}/target/classes/demo/spring" />
-                                <copy file="${basedir}/src/main/java/demo/spring/client/client-beans.xml"
todir="${basedir}/target/classes/demo/spring/client" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
+        <finalName>GroovySpringSupport</finalName>
     </build>
     <profiles>
         <profile>

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.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/client/Client.java?rev=1204942&r1=1204941&r2=1204942&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
Tue Nov 22 12:07:13 2011
@@ -32,7 +32,7 @@ public final class Client {
     public static void main(String args[]) throws Exception {
         // START SNIPPET: client
         ClassPathXmlApplicationContext context 
-            = new ClassPathXmlApplicationContext(new String[] {"demo/spring/client/client-beans.xml"});
+            = new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
 
         HelloWorld client = (HelloWorld)context.getBean("client");
 

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=1204942&r1=1204941&r2=1204942&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:07:13 2011
@@ -46,7 +46,8 @@ public class Server {
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/");
 
-        webappcontext.setWar("webapp");
+//        webappcontext.setWar("src/main/webapp");
+        webappcontext.setWar("target/GroovySpringSupport.war");
 
         HandlerCollection handlers = new HandlerCollection();
         handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()});



Mime
View raw message