Permalink
Browse files

Remove troublesome carriage return

  • Loading branch information...
1 parent 8eb4ad6 commit f4a2c594f1ab8140946a7f6e0087c7797b7dcc3c Bruce Robbins committed Nov 28, 2011
Showing with 2,084 additions and 2,084 deletions.
  1. +24 −24 s4-comm/src/main/java/org/apache/s4/comm/core/CommEventCallback.java
  2. +74 −74 s4-comm/src/main/java/org/apache/s4/comm/core/CommServiceFactory.java
  3. +21 −21 s4-comm/src/main/java/org/apache/s4/comm/core/Deserializer.java
  4. +96 −96 s4-comm/src/main/java/org/apache/s4/comm/core/GenericListener.java
  5. +189 −189 s4-comm/src/main/java/org/apache/s4/comm/core/GenericSender.java
  6. +30 −30 s4-comm/src/main/java/org/apache/s4/comm/core/GenericSerDeser.java
  7. +91 −91 s4-comm/src/main/java/org/apache/s4/comm/core/ListenerProcess.java
  8. +79 −79 s4-comm/src/main/java/org/apache/s4/comm/core/MulticastSender.java
  9. +33 −33 s4-comm/src/main/java/org/apache/s4/comm/core/ProcessMonitor.java
  10. +20 −20 s4-comm/src/main/java/org/apache/s4/comm/core/SendMode.java
  11. +135 −135 s4-comm/src/main/java/org/apache/s4/comm/core/SenderProcess.java
  12. +21 −21 s4-comm/src/main/java/org/apache/s4/comm/core/Serializer.java
  13. +24 −24 s4-comm/src/main/java/org/apache/s4/comm/core/TaskManager.java
  14. +78 −78 s4-comm/src/main/java/org/apache/s4/comm/file/StaticProcessMonitor.java
  15. +79 −79 s4-comm/src/main/java/org/apache/s4/comm/test/ProcessMonitorTest.java
  16. +82 −82 s4-comm/src/main/java/org/apache/s4/comm/test/TaskManagerTest.java
  17. +122 −122 s4-comm/src/main/java/org/apache/s4/comm/test/TestTaskSetupApp.java
  18. +86 −86 s4-comm/src/main/java/org/apache/s4/comm/tools/TaskSetupApp.java
  19. +38 −38 s4-comm/src/main/java/org/apache/s4/comm/util/CommUtil.java
  20. +39 −39 s4-comm/src/main/java/org/apache/s4/comm/util/SystemUtils.java
  21. +64 −64 s4-comm/src/main/java/org/apache/s4/comm/zk/ThreadTest.java
  22. +147 −147 s4-comm/src/main/java/org/apache/s4/comm/zk/ZkProcessMonitor.java
  23. +282 −282 s4-comm/src/main/java/org/apache/s4/comm/zk/ZkTaskSetup.java
  24. +144 −144 s4-comm/src/main/java/org/apache/s4/comm/zk/ZkUtil.java
  25. +33 −33 s4-comm/src/main/resources/log4j.xml
  26. +15 −15 s4-comm/src/main/resources/sample_static_task_manager_test.xml
  27. +23 −23 s4-comm/src/main/resources/sample_task_setup.xml
  28. +15 −15 s4-comm/src/main/resources/taskManagerTest.xml
@@ -1,24 +1,24 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- *
- * Licensed 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. See accompanying LICENSE file.
- */
-package org.apache.s4.comm.core;
-
-import java.util.Map;
-
-public interface CommEventCallback {
-
- public void handleCallback(Map<String, Object> eventData);
-
-}
+/*
+ * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+ *
+ * Licensed 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. See accompanying LICENSE file.
+ */
+package org.apache.s4.comm.core;
+
+import java.util.Map;
+
+public interface CommEventCallback {
+
+ public void handleCallback(Map<String, Object> eventData);
+
+}
@@ -1,74 +1,74 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- *
- * Licensed 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. See accompanying LICENSE file.
- */
-package org.apache.s4.comm.core;
-
-import org.apache.s4.comm.file.StaticProcessMonitor;
-import org.apache.s4.comm.file.StaticTaskManager;
-import org.apache.s4.comm.util.ConfigParser.Cluster.ClusterType;
-import org.apache.s4.comm.zk.ZkProcessMonitor;
-import org.apache.s4.comm.zk.ZkTaskManager;
-
-import org.apache.log4j.Logger;
-
-/**
- * Common Factory class to provide appropriate implementations
- *
- * @author kishoreg
- *
- */
-public class CommServiceFactory {
- private static Logger logger = Logger.getLogger(CommServiceFactory.class);
-
- public static TaskManager getTaskManager(String zkaddress,
- String clusterName, ClusterType clusterType,
- CommEventCallback callbackHandler) {
- String mode = System.getProperty("commlayer.mode");
- TaskManager taskManager = null;
- if (mode != null && mode.equalsIgnoreCase("static")) {
- logger.info("Comm layer mode is set to static");
- taskManager = new StaticTaskManager(zkaddress,
- clusterName,
- clusterType,
- callbackHandler);
- } else {
- taskManager = new ZkTaskManager(zkaddress,
- clusterName,
- clusterType,
- callbackHandler);
- }
-
- return taskManager;
- }
-
- public static ProcessMonitor getProcessMonitor(String zkaddress,
- String clusterName, CommEventCallback callbackHandler) {
- ProcessMonitor processMonitor = null;
- String mode = System.getProperty("commlayer.mode");
- if (mode != null && mode.equalsIgnoreCase("static")) {
- logger.info("Comm layer mode is set to static");
- processMonitor = new StaticProcessMonitor(zkaddress,
- clusterName,
- ClusterType.S4);
- } else {
- processMonitor = new ZkProcessMonitor(zkaddress,
- clusterName,
- ClusterType.S4,
- callbackHandler);
- }
- return processMonitor;
- }
-
-}
+/*
+ * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+ *
+ * Licensed 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. See accompanying LICENSE file.
+ */
+package org.apache.s4.comm.core;
+
+import org.apache.s4.comm.file.StaticProcessMonitor;
+import org.apache.s4.comm.file.StaticTaskManager;
+import org.apache.s4.comm.util.ConfigParser.Cluster.ClusterType;
+import org.apache.s4.comm.zk.ZkProcessMonitor;
+import org.apache.s4.comm.zk.ZkTaskManager;
+
+import org.apache.log4j.Logger;
+
+/**
+ * Common Factory class to provide appropriate implementations
+ *
+ * @author kishoreg
+ *
+ */
+public class CommServiceFactory {
+ private static Logger logger = Logger.getLogger(CommServiceFactory.class);
+
+ public static TaskManager getTaskManager(String zkaddress,
+ String clusterName, ClusterType clusterType,
+ CommEventCallback callbackHandler) {
+ String mode = System.getProperty("commlayer.mode");
+ TaskManager taskManager = null;
+ if (mode != null && mode.equalsIgnoreCase("static")) {
+ logger.info("Comm layer mode is set to static");
+ taskManager = new StaticTaskManager(zkaddress,
+ clusterName,
+ clusterType,
+ callbackHandler);
+ } else {
+ taskManager = new ZkTaskManager(zkaddress,
+ clusterName,
+ clusterType,
+ callbackHandler);
+ }
+
+ return taskManager;
+ }
+
+ public static ProcessMonitor getProcessMonitor(String zkaddress,
+ String clusterName, CommEventCallback callbackHandler) {
+ ProcessMonitor processMonitor = null;
+ String mode = System.getProperty("commlayer.mode");
+ if (mode != null && mode.equalsIgnoreCase("static")) {
+ logger.info("Comm layer mode is set to static");
+ processMonitor = new StaticProcessMonitor(zkaddress,
+ clusterName,
+ ClusterType.S4);
+ } else {
+ processMonitor = new ZkProcessMonitor(zkaddress,
+ clusterName,
+ ClusterType.S4,
+ callbackHandler);
+ }
+ return processMonitor;
+ }
+
+}
@@ -1,21 +1,21 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- *
- * Licensed 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. See accompanying LICENSE file.
- */
-package org.apache.s4.comm.core;
-
-public interface Deserializer {
-
- public Object deserialize(byte[] buffer);
-}
+/*
+ * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+ *
+ * Licensed 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. See accompanying LICENSE file.
+ */
+package org.apache.s4.comm.core;
+
+public interface Deserializer {
+
+ public Object deserialize(byte[] buffer);
+}
Oops, something went wrong.

0 comments on commit f4a2c59

Please sign in to comment.