You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/08/25 07:52:25 UTC
svn commit: r1161397 - in /camel/trunk/components/camel-zookeeper: ./
src/main/java/org/apache/camel/component/zookeeper/
src/main/java/org/apache/camel/component/zookeeper/policy/
src/test/java/org/apache/camel/component/zookeeper/ src/test/resources/
Author: davsclaus
Date: Thu Aug 25 05:52:24 2011
New Revision: 1161397
URL: http://svn.apache.org/viewvc?rev=1161397&view=rev
Log:
CAMEL-2472: Polished.
Modified:
camel/trunk/components/camel-zookeeper/ (props changed)
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConnectionManager.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperUtils.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZookeeperProducer.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
camel/trunk/components/camel-zookeeper/src/test/resources/log4j.properties
Propchange: camel/trunk/components/camel-zookeeper/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 25 05:52:24 2011
@@ -0,0 +1,9 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes
+*.i??
+classes
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java Thu Aug 25 05:52:24 2011
@@ -27,8 +27,6 @@ import org.apache.camel.RuntimeCamelExce
* uri but may also be configured programatically and applied to a
* {@link ZooKeeperComponent}. A copy of this component's configuration will be
* injected into any {@link ZooKeeperEndpoint}s the component creates.
- *
- * @version $
*/
public class ZooKeeperConfiguration implements Cloneable {
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConnectionManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConnectionManager.java?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConnectionManager.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConnectionManager.java Thu Aug 25 05:52:24 2011
@@ -23,8 +23,6 @@ import org.apache.zookeeper.ZooKeeper;
/**
* <code>ZookeeperConnectionManager</code> is a simple class to manage
* {@link ZooKeeper} connections.
- *
- * @author sgargan
*/
public class ZooKeeperConnectionManager {
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperMessage.java Thu Aug 25 05:52:24 2011
@@ -28,8 +28,6 @@ import org.apache.zookeeper.data.Stat;
* representing interactions with a ZooKeeper service. It contains a number of
* optional Header Constants that are used by the Producer and consumer
* mechanisms to finely control these interactions.
- *
- * @version $
*/
public class ZooKeeperMessage extends DefaultMessage {
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperUtils.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperUtils.java?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperUtils.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperUtils.java Thu Aug 25 05:52:24 2011
@@ -35,8 +35,8 @@ public final class ZooKeeperUtils {
/**
* Pulls a createMode flag from the header keyed by
- * {@link ZooKeeperMessage.ZOOKEEPER_CREATE_MODE} in the given message and
- * attemps to parse a {@link CreateMode} from it.
+ * {@link ZooKeeperMessage#ZOOKEEPER_CREATE_MODE} in the given message and
+ * attempts to parse a {@link CreateMode} from it.
*
* @param message the message that may contain a ZOOKEEPER_CREATE_MODE
* header.
@@ -72,7 +72,7 @@ public final class ZooKeeperUtils {
/**
* Pulls the target node from the header keyed by
- * {@link ZooKeeperMessage.ZOOKEEPER_NODE}. This node is then typically used
+ * {@link ZooKeeperMessage#ZOOKEEPER_NODE}. This node is then typically used
* in place of the configured node extracted from the endpoint uri.
*
* @param message the message that may contain a ZOOKEEPER_NODE header.
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZookeeperProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZookeeperProducer.java?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZookeeperProducer.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZookeeperProducer.java Thu Aug 25 05:52:24 2011
@@ -40,13 +40,10 @@ import static org.apache.camel.component
import static org.apache.camel.component.zookeeper.ZooKeeperUtils.getPayloadFromExchange;
import static org.apache.camel.component.zookeeper.ZooKeeperUtils.getVersionFromMessage;
-
/**
* <code>ZookeeperProducer</code> attempts to set the content of nodes in the
* {@link ZooKeeper} cluster with the payloads of the of the exchanges it
* receives.
- *
- * @version $
*/
@SuppressWarnings("rawtypes")
public class ZookeeperProducer extends DefaultProducer {
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java Thu Aug 25 05:52:24 2011
@@ -60,13 +60,11 @@ import org.apache.zookeeper.CreateMode;
* <p>
* All instances of the policy must also be configured with the same path on the
* ZooKeeper cluster where the election will be carried out. It is good practice
- * for this to indicate the application e.g. /someapplication/someroute/ note
+ * for this to indicate the application e.g. <tt>/someapplication/someroute/</tt> note
* that these nodes should exist before using the policy.
* <p>
- * See @link{ http://hadoop.apache
- * .org/zookeeper/docs/current/recipes.html#sc_leaderElection} for more on how
- * Leader election is achieved with ZooKeeper.
- *
+ * See <a href="http://hadoop.apache.org/zookeeper/docs/current/recipes.html#sc_leaderElection">
+ * for more on how Leader election</a> is archived with ZooKeeper.
*/
public class ZooKeeperRoutePolicy extends RoutePolicySupport {
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java Thu Aug 25 05:52:24 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.zookeeper;
-
-
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultMessage;
import org.apache.zookeeper.CreateMode;
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java Thu Aug 25 05:52:24 2011
@@ -34,7 +34,6 @@ import org.junit.Test;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_CREATE_MODE;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_NODE;
-
public class ZookeeperProducerTest extends ZooKeeperTestSupport {
private String zookeeperUri;
Modified: camel/trunk/components/camel-zookeeper/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/resources/log4j.properties?rev=1161397&r1=1161396&r2=1161397&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-zookeeper/src/test/resources/log4j.properties Thu Aug 25 05:52:24 2011
@@ -16,15 +16,14 @@
#
#
-# The logging properties used for eclipse testing, We want to see debug output on the console.
+# The logging properties used
#
-
-log4j.rootLogger=DEBUG, file
-#log4j.rootLogger=DEBUG, out
+log4j.rootLogger=INFO, file
log4j.logger.org.springframework=WARN
log4j.logger.org.apache.zookeeper=WARN
#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.component.zookeeper=DEBUG
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
@@ -35,5 +34,5 @@ log4j.appender.out.layout.ConversionPatt
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/camel-core-test.log
+log4j.appender.file.file=target/camel-zookeeper-test.log
log4j.appender.file.append=true
\ No newline at end of file