Author: ningjiang
Date: Fri May 16 08:03:16 2008
New Revision: 657094
URL: http://svn.apache.org/viewvc?rev=657094&view=rev
Log:
Fixed some CS errors
Modified:
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
Modified:
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java?rev=657094&r1=657093&r2=657094&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java
(original)
+++
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java
Fri May 16 08:03:16 2008
@@ -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.component.atom;
import org.apache.camel.Exchange;
Modified:
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java?rev=657094&r1=657093&r2=657094&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
(original)
+++
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
Fri May 16 08:03:16 2008
@@ -32,16 +32,6 @@
*/
public class AtomGoodBlogsTest extends TestSupport {
- protected void setUp() throws Exception {
- super.setUp();
- setupCamel();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- context.stop();
- }
-
// START SNIPPET: e1
// This is the CamelContext that is the heart of Camel
@@ -131,4 +121,14 @@
// END SNIPPET: e1
+ protected void setUp() throws Exception {
+ super.setUp();
+ setupCamel();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ context.stop();
+ }
+
}
Modified:
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java?rev=657094&r1=657093&r2=657094&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
(original)
+++
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
Fri May 16 08:03:16 2008
@@ -17,8 +17,8 @@
package org.apache.camel.component.atom;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
/**
* Unit test for fast polling using a low delay
Modified:
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java?rev=657094&r1=657093&r2=657094&view=diff
==============================================================================
---
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
(original)
+++
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
Fri May 16 08:03:16 2008
@@ -22,10 +22,7 @@
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -36,8 +33,8 @@
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ReportingTypeConverterLoader;
-import org.apache.camel.util.ReportingTypeConverterRegistry;
import org.apache.camel.util.ReportingTypeConverterLoader.TypeMapping;
+import org.apache.camel.util.ReportingTypeConverterRegistry;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -63,48 +60,23 @@
/**
* Generate report of available type conversions.
- *
+ *
* @goal converters-report
* @requiresDependencyResolution runtime
* @phase verify
*/
public class ConvertersMojo extends AbstractMavenReport {
- static private final String WIKI_TYPECONVERER_URL =
"http://activemq.apache.org/camel/type-converter.html";;
- static private final String CONVERTER_TYPE_STATIC =
"org.apache.camel.impl.converter.StaticMethodTypeConverter";
- static private final String CONVERTER_TYPE_INSTANCE =
"org.apache.camel.impl.converter.InstanceMethodTypeConverter";
- static private final String REPORT_METHOD_STATIC = "STATIC";
- static private final String REPORT_METHOD_INSTANCE = "INSTANCE";
- static private final String REPORT_METHOD_UNKNOWN = "UNKNOWN";
-
- /**
- * Base output directory for reports.
- *
- * @parameter default-value="${project.build.directory}/site"
- * @readonly
- * @required
- */
- private File outputDirectory;
-
- /**
- * Reference to Maven 2 Project.
- *
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
-
- /**
- * Doxia SiteRenderer.
- *
- * @component
- */
- private Renderer renderer;
+ private static final String WIKI_TYPECONVERER_URL =
"http://activemq.apache.org/camel/type-converter.html";;
+ private static final String CONVERTER_TYPE_STATIC =
"org.apache.camel.impl.converter.StaticMethodTypeConverter";
+ private static final String CONVERTER_TYPE_INSTANCE =
"org.apache.camel.impl.converter.InstanceMethodTypeConverter";
+ private static final String REPORT_METHOD_STATIC = "STATIC";
+ private static final String REPORT_METHOD_INSTANCE = "INSTANCE";
+ private static final String REPORT_METHOD_UNKNOWN = "UNKNOWN";
/**
* Remote repositories which will be searched for source attachments.
- *
+ *
* @parameter expression="${project.remoteArtifactRepositories}"
* @required
* @readonly
@@ -113,7 +85,7 @@
/**
* Local maven repository.
- *
+ *
* @parameter expression="${localRepository}"
* @required
* @readonly
@@ -122,21 +94,47 @@
/**
* The component that is used to resolve additional artifacts required.
- *
+ *
* @component
*/
protected ArtifactResolver artifactResolver;
/**
* The component used for creating artifact instances.
- *
+ *
* @component
*/
protected ArtifactFactory artifactFactory;
+ /**
+ * Base output directory for reports.
+ *
+ * @parameter default-value="${project.build.directory}/site"
+ * @readonly
+ * @required
+ */
+ private File outputDirectory;
+
+ /**
+ * Reference to Maven 2 Project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * Doxia SiteRenderer.
+ *
+ * @component
+ */
+ private Renderer renderer;
+
+
/**
* Gets resource bundle for given locale.
- *
+ *
* @param locale
* locale
* @return resource bundle
