svn commit: r1351899 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java

[ha...@apache.org]

Author: hadrian
Date: Tue Jun 19 23:07:26 2012
New Revision: 1351899

URL: http://svn.apache.org/viewvc?rev=1351899&view=rev
Log:
CS fixes in preparation of release

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java?rev=1351899&r1=1351898&r2=1351899&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/RedeliveryErrorHandlerAsyncDelayedTwoCamelContextIssueTest.java Tue Jun 19 23:07:26 2012
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.issues;
 
 import org.apache.camel.ConsumerTemplate;
@@ -58,8 +74,8 @@ public class RedeliveryErrorHandlerAsync
         return context;
     }
 
-    public static class ProblematicBean {
-        int counter = 0;
+    public static final class ProblematicBean {
+        int counter;
 
         public void doSomething() {
             if (counter++ < 2) {

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java?rev=1351899&r1=1351898&r2=1351899&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java Tue Jun 19 23:07:26 2012
@@ -16,6 +16,12 @@
  */
 package org.apache.camel.component.cxf;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.Endpoint;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -23,13 +29,6 @@ import org.apache.cxf.frontend.ClientPro
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.Endpoint;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.Assert.assertEquals;
-
 
 public class CxfPayLoadBareSoapTest extends CamelTestSupport {
 
@@ -77,18 +76,14 @@ public class CxfPayLoadBareSoapTest exte
     @WebService
     @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
     public static interface BareSoapService {
-
-        public void doSomething();
-
+        void doSomething();
     }
 
     public static class BareSoapServiceImpl implements BareSoapService {
-
         private AtomicInteger invocations = new AtomicInteger(0);
 
         public void doSomething() {
             invocations.incrementAndGet();
         }
     }
-
 }