You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/01/19 16:41:48 UTC

svn commit: r1233437 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/HelloWorldImplTest.java

Author: ningjiang
Date: Thu Jan 19 15:41:48 2012
New Revision: 1233437

URL: http://svn.apache.org/viewvc?rev=1233437&view=rev
Log:
Merged revisions 1233435 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1233435 | ningjiang | 2012-01-19 23:33:09 +0800 (Thu, 19 Jan 2012) | 9 lines
  
  Merged revisions 1233401 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1233401 | ningjiang | 2012-01-19 22:31:04 +0800 (Thu, 19 Jan 2012) | 1 line
    
    Fixed the CS errors of samples
  ........
................

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/HelloWorldImplTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 15:41:48 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1233076,1233113,1233296,1233311,1233359,1233425
-/cxf/trunk:1233075,1233112,1233289-1233294,1233308,1233355
+/cxf/branches/2.5.x-fixes:1233076,1233113,1233296,1233311,1233359,1233425,1233435
+/cxf/trunk:1233075,1233112,1233289-1233294,1233308,1233355,1233401

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/src/test/java/demo/hw/server/HelloWorldImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/HelloWorldImplTest.java?rev=1233437&r1=1233436&r2=1233437&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/HelloWorldImplTest.java (original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/test/java/demo/hw/server/HelloWorldImplTest.java Thu Jan 19 15:41:48 2012
@@ -18,9 +18,9 @@
  */
 package demo.hw.server;
 
+import java.util.Map;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
-import java.util.Map;
 
 public class HelloWorldImplTest {