cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1213820 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/samples/java_first_jaxws/ distribution/src/main/release/samples/java_first_jaxws/src/test/ distribution/src/main/release/samples/java_first_jaxws/src/test/java/ distr...
Date Tue, 13 Dec 2011 18:19:56 GMT
Author: gmazza
Date: Tue Dec 13 18:19:55 2011
New Revision: 1213820

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

........
  r1213812 | gmazza | 2011-12-13 13:01:55 -0500 (Tue, 13 Dec 2011) | 1 line
  
  JUnit test for HelloWorldImpl added.
........

Added:
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/
      - copied from r1213812, cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/test/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/
      - copied from r1213812, cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/test/java/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/
      - copied from r1213812, cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/
      - copied from r1213812, cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/
      - copied from r1213812, cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/HelloWorldImplTest.java
      - copied unchanged from r1213812, cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/HelloWorldImplTest.java
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml

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/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=1213820&r1=1213819&r2=1213820&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
Tue Dec 13 18:19:55 2011
@@ -44,26 +44,26 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-                <plugin>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <webXml>${cxf.release.base}/etc/web.xml</webXml>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>tomcat-maven-plugin</artifactId>
-                    <version>1.1</version>
-                    <configuration>
-                        <server>myTomcat</server>
-                        <!-- if using Tomcat 6 (see README) -->
-                        <!--url>http://localhost:8080/manager</url-->
-                        <!-- if using Tomcat 7 (see README) -->
-                        <url>http://localhost:8080/manager/text</url>
-                        <path>/${project.build.finalName}</path>
-                    </configuration>
-                </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <webXml>${cxf.release.base}/etc/web.xml</webXml>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>tomcat-maven-plugin</artifactId>
+                <version>1.1</version>
+                <configuration>
+                    <server>myTomcat</server>
+                    <!-- if using Tomcat 6 (see README) -->
+                    <!--url>http://localhost:8080/manager</url -->
+                    <!-- if using Tomcat 7 (see README) -->
+                    <url>http://localhost:8080/manager/text</url>
+                    <path>/${project.build.finalName}</path>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -132,5 +132,10 @@
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>2.4.5-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>



Mime
View raw message