You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/07/25 21:15:25 UTC
[4/13] git commit: Cleanup dependencies - updated guava to latest
release version 12.0.1 - removed dependency on commons-io
Cleanup dependencies
- updated guava to latest release version 12.0.1
- removed dependency on commons-io
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/e679cdbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/e679cdbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/e679cdbf
Branch: refs/heads/S4-88
Commit: e679cdbf10919749a96f3d2321b5b27d94c9e967
Parents: 81ef1e3
Author: Matthieu Morel <mm...@apache.org>
Authored: Wed Jul 25 11:01:22 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Wed Jul 25 11:01:22 2012 +0200
----------------------------------------------------------------------
build.gradle | 13 +--------
subprojects/s4-comm/s4-comm.gradle | 1 -
.../java/org/apache/s4/core/ProcessingElement.java | 4 +-
subprojects/s4-tools/s4-tools.gradle | 1 -
.../main/java/org/apache/s4/tools/ZKServer.java | 23 +++++++++++++--
5 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/e679cdbf/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 292da4f..db62a11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,22 +47,13 @@ allprojects {
/* All project libraries must be defined here. */
project.ext["libraries"] = [
- json: 'org.json:json:20090211',
- guava: 'com.google.guava:guava:10.0.1',
+ guava: 'com.google.guava:guava:12.0.1',
gson: 'com.google.code.gson:gson:1.6',
guice: 'com.google.inject:guice:3.0',
guice_assist: 'com.google.inject.extensions:guice-assistedinject:3.0',
- guice_grapher: 'com.google.inject:guice-grapher:3.0',
- flexjson: 'net.sf.flexjson:flexjson:2.1',
- bcel: 'org.apache.bcel:bcel:5.2',
- jakarta_regexp: 'jakarta-regexp:jakarta-regexp:1.4',
kryo: 'com.googlecode:kryo:1.04',
netty: 'org.jboss.netty:netty:3.2.5.Final',
- reflectasm: 'com.esotericsoftware:reflectasm:0.8',
- minlog: 'com.esotericsoftware:minlog:1.2',
mockito_core: 'org.mockito:mockito-core:1.9.0',
- asm: 'asm:asm:3.2',
- commons_io: 'commons-io:commons-io:2.0.1',
commons_config: 'commons-configuration:commons-configuration:1.6',
commons_codec: 'commons-codec:commons-codec:1.4',
commons_httpclient: 'commons-httpclient:commons-httpclient:3.1',
@@ -77,7 +68,6 @@ project.ext["libraries"] = [
zkclient: 'com.github.sgroschupf:zkclient:0.1',
diezel: 'net.ericaro:diezel-maven-plugin:1.0.0-beta-4',
jcommander: 'com.beust:jcommander:1.25',
- commons_io: 'commons-io:commons-io:2.1',
gradle_base_services: 'gradle-base-services:gradle-base-services:1.0',
gradle_core: 'gradle-core:gradle-core:1.0',
gradle_tooling_api: 'gradle-tooling-api:gradle-tooling-api:1.0',
@@ -115,7 +105,6 @@ subprojects {
compile( libraries.logback_classic )
/* Commons. */
- compile( libraries.commons_io )
compile( libraries.commons_config )
compile( libraries.commons_coll )
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/e679cdbf/subprojects/s4-comm/s4-comm.gradle
----------------------------------------------------------------------
diff --git a/subprojects/s4-comm/s4-comm.gradle b/subprojects/s4-comm/s4-comm.gradle
index 2828fcc..7679236 100644
--- a/subprojects/s4-comm/s4-comm.gradle
+++ b/subprojects/s4-comm/s4-comm.gradle
@@ -21,7 +21,6 @@ description = 'Implementation-specific components of the communication layer.'
dependencies {
compile project(":s4-base")
- compile libraries.json
compile libraries.gson
compile libraries.kryo
compile libraries.netty
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/e679cdbf/subprojects/s4-core/src/main/java/org/apache/s4/core/ProcessingElement.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/main/java/org/apache/s4/core/ProcessingElement.java b/subprojects/s4-core/src/main/java/org/apache/s4/core/ProcessingElement.java
index c96fb92..b899403 100644
--- a/subprojects/s4-core/src/main/java/org/apache/s4/core/ProcessingElement.java
+++ b/subprojects/s4-core/src/main/java/org/apache/s4/core/ProcessingElement.java
@@ -43,9 +43,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.MapMaker;
@@ -117,7 +117,7 @@ public abstract class ProcessingElement implements Cloneable {
* This maps holds all the instances. We make it package private to prevent concrete classes from updating the
* collection.
*/
- transient Cache<String, ProcessingElement> peInstances;
+ transient LoadingCache<String, ProcessingElement> peInstances;
/* This map is initialized in the prototype and cloned to instances. */
transient Map<Class<? extends Event>, Trigger> triggers;
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/e679cdbf/subprojects/s4-tools/s4-tools.gradle
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/s4-tools.gradle b/subprojects/s4-tools/s4-tools.gradle
index 62c0b32..ee1c721 100644
--- a/subprojects/s4-tools/s4-tools.gradle
+++ b/subprojects/s4-tools/s4-tools.gradle
@@ -32,7 +32,6 @@ dependencies {
compile project(":s4-core")
compile libraries.jcommander
compile libraries.zkclient
- compile libraries.commons_io
compile libraries.gradle_base_services
compile libraries.gradle_core
compile libraries.gradle_tooling_api
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/e679cdbf/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java
index ed71fb0..1a134ba 100644
--- a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java
+++ b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/ZKServer.java
@@ -28,7 +28,6 @@ import java.util.regex.Pattern;
import org.I0Itec.zkclient.IDefaultNameSpace;
import org.I0Itec.zkclient.ZkClient;
import org.I0Itec.zkclient.ZkServer;
-import org.apache.commons.io.FileUtils;
import org.apache.s4.comm.tools.TaskSetup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,8 +52,8 @@ public class ZKServer {
if (zkArgs.clean) {
logger.info("cleaning existing data in [{}] and [{}]", zkArgs.dataDir, zkArgs.logDir);
- FileUtils.deleteDirectory(new File(zkArgs.dataDir));
- FileUtils.deleteDirectory(new File(zkArgs.logDir));
+ deleteDirectory(new File(zkArgs.dataDir));
+ deleteDirectory(new File(zkArgs.logDir));
}
IDefaultNameSpace defaultNameSpace = new IDefaultNameSpace() {
@@ -97,6 +96,24 @@ public class ZKServer {
}
}
+ static private void deleteDirectory(File path) {
+ if (path.exists()) {
+ File[] files = path.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ if (files[i].isDirectory()) {
+ deleteDirectory(files[i]);
+ } else {
+ if (!(files[i].delete())) {
+ logger.error("Could not delete file {}", files[i].getAbsolutePath());
+ }
+ }
+ }
+ }
+ if (!path.delete()) {
+ logger.error("Could not delete directory {}", path.getAbsolutePath());
+ }
+ }
+
@Parameters(commandNames = "s4 zkServer", separators = "=", commandDescription = "Start Zookeeper server")
static class ZKServerArgs extends S4ArgsBase {