Author: bvahdat
Date: Mon Oct 1 14:23:27 2012
New Revision: 1392348
URL: http://svn.apache.org/viewvc?rev=1392348&view=rev
Log:
Fixed a bunch of CS errors.
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/transform/QuickfixjMessageJsonPrinter.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/SeparateRouteBuilderIntegrationTest.java
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/TestRouteBuilder.java
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/transform/QuickfixjMessageJsonPrinter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/transform/QuickfixjMessageJsonPrinter.java?rev=1392348&r1=1392347&r2=1392348&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/transform/QuickfixjMessageJsonPrinter.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/transform/QuickfixjMessageJsonPrinter.java
Mon Oct 1 14:23:27 2012
@@ -16,9 +16,10 @@
*/
package org.apache.camel.component.quickfixj.examples.transform;
+import org.apache.camel.Exchange;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.camel.Exchange;
import quickfix.ConfigError;
Modified:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java?rev=1392348&r1=1392347&r2=1392348&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java
(original)
+++
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java
Mon Oct 1 14:23:27 2012
@@ -32,15 +32,11 @@ import org.slf4j.LoggerFactory;
*/
public final class Main {
- private static final Logger LOG = LoggerFactory.getLogger(Main.class);
-
public static int mainPort = 9998;
-
public static final String WEBAPP_DIR = "src/main/webapp";
-
public static final String WEBAPP_CTX = "/";
-
- protected static Server server = new Server();
+ protected static final Server SERVER = new Server();
+ private static final Logger LOG = LoggerFactory.getLogger(Main.class);
private Main() {
}
@@ -62,16 +58,16 @@ public final class Main {
SelectChannelConnector connector = new SelectChannelConnector();
connector.setPort(mainPort);
- connector.setServer(server);
+ connector.setServer(SERVER);
WebAppContext context = new WebAppContext();
context.setResourceBase(WEBAPP_DIR);
context.setContextPath(WEBAPP_CTX);
- context.setServer(server);
+ context.setServer(SERVER);
- server.setHandler(context);
- server.setConnectors(new Connector[]{connector});
- server.start();
+ SERVER.setHandler(context);
+ SERVER.setConnectors(new Connector[]{connector});
+ SERVER.start();
LOG.info("");
LOG.info("==============================================================================");
@@ -81,7 +77,7 @@ public final class Main {
}
public static void stop() throws Exception {
- server.stop();
+ SERVER.stop();
}
/**
Modified:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java?rev=1392348&r1=1392347&r2=1392348&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java
(original)
+++
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/one/IntegrationTest.java
Mon Oct 1 14:23:27 2012
@@ -45,6 +45,7 @@ import static org.junit.Assert.assertTru
*/
@RunWith(Arquillian.class)
public class IntegrationTest {
+ static boolean routeConfigured;
private static final transient Logger LOG =
LoggerFactory.getLogger(IntegrationTest.class);
@Inject
@@ -54,8 +55,6 @@ public class IntegrationTest {
@Mock
MockEndpoint result;
- static boolean routeConfigured;
-
@Produces
@ApplicationScoped
@ContextName
Modified:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/SeparateRouteBuilderIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/SeparateRouteBuilderIntegrationTest.java?rev=1392348&r1=1392347&r2=1392348&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/SeparateRouteBuilderIntegrationTest.java
(original)
+++
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/SeparateRouteBuilderIntegrationTest.java
Mon Oct 1 14:23:27 2012
@@ -16,6 +16,8 @@
*/
package org.apache.camel.example.cdi.two;
+import javax.inject.Inject;
+
import org.apache.camel.cdi.CdiCamelContext;
import org.apache.camel.cdi.internal.CamelExtension;
import org.apache.camel.example.cdi.MyRoutes;
@@ -27,8 +29,6 @@ import org.jboss.shrinkwrap.api.spec.Jav
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.inject.Inject;
-
import static org.junit.Assert.assertNotNull;
/**
Modified:
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/TestRouteBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/TestRouteBuilder.java?rev=1392348&r1=1392347&r2=1392348&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/TestRouteBuilder.java
(original)
+++
camel/trunk/examples/camel-example-cdi/src/test/java/org/apache/camel/example/cdi/two/TestRouteBuilder.java
Mon Oct 1 14:23:27 2012
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,7 +6,7 @@
* (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
+ * 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,
@@ -17,18 +16,19 @@
*/
package org.apache.camel.example.cdi.two;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.ContextName;
import org.apache.camel.cdi.Mock;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.example.cdi.MyRoutes;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
