Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1428819 - in
 /cxf/branches/2.6.x-fixes/distribution/src/main/release/samples:
 jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
 wsdl_first_https/README.txt
Date: Fri, 04 Jan 2013 12:18:05 -0000
To: commits@cxf.apache.org
From: coheigea@apache.org
Message-Id: <20130104121805.63DB423888EA@eris.apache.org>

Author: coheigea
Date: Fri Jan  4 12:18:04 2013
New Revision: 1428819

URL: http://svn.apache.org/viewvc?rev=1428819&view=rev
Log:
Merged revisions 1428816 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1428816 | coheigea | 2013-01-04 12:07:49 +0000 (Fri, 04 Jan 2013) | 2 lines

  Minor sample cleanup

........

Modified:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java?rev=1428819&r1=1428818&r2=1428819&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java Fri Jan  4 12:18:04 2013
@@ -41,7 +41,7 @@ public class GreeterImpl implements Gree
     private static final Logger LOG = 
         Logger.getLogger(GreeterImpl.class.getPackage().getName());
  
-     /* (non-Javadoc)
+    /* (non-Javadoc)
      * @see org.apache.hello_world_soap_http.Greeter#greetMeSometime(java.lang.String)
      */
     @UseAsyncMethod
@@ -51,7 +51,7 @@ public class GreeterImpl implements Gree
         return "How are you " + me;
     }
     
-    public Future<?>  greetMeSometimeAsync(final String me, 
+    public Future<?> greetMeSometimeAsync(final String me, 
                                            final AsyncHandler<GreetMeSometimeResponse> asyncHandler) {
         LOG.info("Executing operation greetMeSometimeAsync asynchronously");
         System.out.println("Executing operation greetMeSometimeAsync asynchronously\n");

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt?rev=1428819&r1=1428818&r2=1428819&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt Fri Jan  4 12:18:04 2013
@@ -1,10 +1,8 @@
 Hello World Demo using HTTPS communications
 =============================================
-This demo provides a "hello world" example of making
-SOAP calls with HTTPS.
+This demo provides a "hello world" example of making SOAP calls with HTTPS.
 
-Please review the README in the samples directory before
-continuing.
+Please review the README in the samples directory before continuing.
 
 Building and running the demo using Maven
 -----------------------------------------
@@ -75,7 +73,6 @@ Here, configuration is done via Java API
 Spring XML files.  The client does NOT provide the appropriate credentials 
 programmatically and so the invocation on the server fails.
 
-  
 Scenario 4: (-Psecure.client.non.spring)
 
 Same Java class as in Scenario #3 is used, however the class is coded