Fix build version and dependencies in subproject files,
- also fixed misnamed parameter in Main class
- fixed path leading to error message in ZkServer
diff --git a/LICENSE b/LICENSE
index fbb4f12..66486af 100644
--- a/LICENSE
+++ b/LICENSE
@@ -458,6 +458,8 @@
----------------------------------------------------------------------------
+This product uses slf4j, which uses the following license (MIT):
+
Copyright (c) 2004-2011 QOS.ch
All rights reserved.
diff --git a/settings.gradle b/settings.gradle
index 48e63cf..c2b9b67 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,7 +25,6 @@
//include 's4-example'
//include ':test-apps:simple-adapter-1'
include ':test-apps:simple-deployable-app-1'
-include ':test-apps:simple-deployable-app-2'
include ':test-apps:producer-app'
include ':test-apps:consumer-app'
diff --git a/subprojects/s4-core/src/main/java/org/apache/s4/core/Main.java b/subprojects/s4-core/src/main/java/org/apache/s4/core/Main.java
index 1aae58d..74116a1 100644
--- a/subprojects/s4-core/src/main/java/org/apache/s4/core/Main.java
+++ b/subprojects/s4-core/src/main/java/org/apache/s4/core/Main.java
@@ -121,7 +121,7 @@
}
if (mainArgs.zkConnectionString != null) {
- mainArgs.extraNamedParameters.add("cluster.zk_address=" + mainArgs.zkConnectionString);
+ mainArgs.extraNamedParameters.add("s4.cluster.zk_address=" + mainArgs.zkConnectionString);
}
if (!mainArgs.extraNamedParameters.isEmpty()) {
@@ -160,7 +160,7 @@
/**
* Defines command parameters.
- *
+ *
*/
@Parameters(separators = "=")
public static class MainArgs {
@@ -196,7 +196,7 @@
/**
* Parameters parsing utility.
- *
+ *
*/
public static class InlineConfigParameterConverter implements IStringConverter<String> {
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 1a134ba..de56788 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
@@ -108,9 +108,9 @@
}
}
}
- }
- if (!path.delete()) {
- logger.error("Could not delete directory {}", path.getAbsolutePath());
+ if (!path.delete()) {
+ logger.error("Could not delete directory {}", path.getAbsolutePath());
+ }
}
}
diff --git a/subprojects/s4-tools/src/main/resources/templates/build.gradle b/subprojects/s4-tools/src/main/resources/templates/build.gradle
index d1810a2..bedbdef 100644
--- a/subprojects/s4-tools/src/main/resources/templates/build.gradle
+++ b/subprojects/s4-tools/src/main/resources/templates/build.gradle
@@ -19,7 +19,7 @@
project.ext["s4AppInstallDir"] = hasProperty('appsDir') ? "$appsDir" : "/tmp/appsDir"
-project.ext["s4Version"] = '0.5.0-SNAPSHOT'
+project.ext["s4Version"] = '0.5.0-incubating'
description = 'Apache S4 App'
//defaultTasks 'installS4R'
project.ext["archivesBaseName"] = "$project.name"
diff --git a/subprojects/s4-tools/src/main/resources/templates/s4 b/subprojects/s4-tools/src/main/resources/templates/s4
index fd54444..45c5efd 100644
--- a/subprojects/s4-tools/src/main/resources/templates/s4
+++ b/subprojects/s4-tools/src/main/resources/templates/s4
@@ -5,7 +5,7 @@
# we need something different in order to pass the classpath of the current project
# you must specify: appClassName (extends AdapterApp class) , cluster name, output stream name
# current syntax is not yet straightforward:
- # example : ./s4 adapter -cluster=c1 -appClass=org.apache.s4.example.twitter.TwitterInputAdapter -namedStringParameters=adapter.output.stream:s1
+ # example : ./s4 adapter -cluster=c1 -appClass=org.apache.s4.example.twitter.TwitterInputAdapter -p=s4.adapter.output.stream:s1
shift 1
<s4_install_dir>/gradlew cp
java -cp `cat classpath.txt` org.apache.s4.core.Main $@
diff --git a/test-apps/consumer-app/build.gradle b/test-apps/consumer-app/build.gradle
index 9961774..d8d56c4 100644
--- a/test-apps/consumer-app/build.gradle
+++ b/test-apps/consumer-app/build.gradle
@@ -64,31 +64,29 @@
/* All project libraries must be defined here. */
project.ext["libraries"] = [
- json: 'org.json:json:20090211',
- guava: 'com.google.guava:guava:10.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',
- 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',
- commons_coll: 'net.sourceforge.collections:collections-generic:4.01', // Use this lib until the commons collection with Generics is released.
- slf4j: 'org.slf4j:slf4j-api:1.6.1',
- logback_core: 'ch.qos.logback:logback-core:0.9.29',
- logback_classic: 'ch.qos.logback:logback-classic:0.9.29',
- zk: 'org.apache.zookeeper:zookeeper:3.3.1',
- jcip: 'net.jcip:jcip-annotations:1.0',
- junit: 'junit:junit:4.10',
+ 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',
+ kryo: 'com.googlecode:kryo:1.04',
+ netty: 'org.jboss.netty:netty:3.2.5.Final',
+ mockito_core: 'org.mockito:mockito-core:1.9.0',
+ commons_config: 'commons-configuration:commons-configuration:1.6',
+ commons_codec: 'commons-codec:commons-codec:1.4',
+ commons_coll: 'net.sourceforge.collections:collections-generic:4.01', // Use this lib until the commons collection with Generics is released.
+ slf4j: 'org.slf4j:slf4j-api:1.6.1',
+ logback_core: 'ch.qos.logback:logback-core:0.9.29',
+ logback_classic: 'ch.qos.logback:logback-classic:0.9.29',
+ zk: 'org.apache.zookeeper:zookeeper:3.3.1',
+ jcip: 'net.jcip:jcip-annotations:1.0',
+ junit: 'junit:junit:4.10',
+ zkclient: 'com.github.sgroschupf:zkclient:0.1',
+ diezel: 'net.ericaro:diezel-maven-plugin:1.0.0-beta-4',
+ jcommander: 'com.beust:jcommander:1.25',
+ 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',
+ gradle_wrapper: 'gradle-wrapper:gradle-wrapper:1.0'
]
@@ -110,7 +108,6 @@
compile( libraries.logback_classic )
/* Commons. */
- compile( libraries.commons_io )
compile( libraries.commons_config )
compile( libraries.commons_coll )
diff --git a/test-apps/producer-app/build.gradle b/test-apps/producer-app/build.gradle
index 7b5c495..8f79377 100644
--- a/test-apps/producer-app/build.gradle
+++ b/test-apps/producer-app/build.gradle
@@ -64,31 +64,25 @@
/* All project libraries must be defined here. */
project.ext["libraries"] = [
- json: 'org.json:json:20090211',
- guava: 'com.google.guava:guava:10.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',
- 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',
- commons_coll: 'net.sourceforge.collections:collections-generic:4.01', // Use this lib until the commons collection with Generics is released.
- slf4j: 'org.slf4j:slf4j-api:1.6.1',
- logback_core: 'ch.qos.logback:logback-core:0.9.29',
- logback_classic: 'ch.qos.logback:logback-classic:0.9.29',
- zk: 'org.apache.zookeeper:zookeeper:3.3.1',
- jcip: 'net.jcip:jcip-annotations:1.0',
- junit: 'junit:junit:4.10',
+ 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',
+ kryo: 'com.googlecode:kryo:1.04',
+ netty: 'org.jboss.netty:netty:3.2.5.Final',
+ mockito_core: 'org.mockito:mockito-core:1.9.0',
+ commons_config: 'commons-configuration:commons-configuration:1.6',
+ commons_codec: 'commons-codec:commons-codec:1.4',
+ commons_coll: 'net.sourceforge.collections:collections-generic:4.01', // Use this lib until the commons collection with Generics is released.
+ slf4j: 'org.slf4j:slf4j-api:1.6.1',
+ logback_core: 'ch.qos.logback:logback-core:0.9.29',
+ logback_classic: 'ch.qos.logback:logback-classic:0.9.29',
+ zk: 'org.apache.zookeeper:zookeeper:3.3.1',
+ jcip: 'net.jcip:jcip-annotations:1.0',
+ junit: 'junit:junit:4.10',
+ zkclient: 'com.github.sgroschupf:zkclient:0.1',
+ diezel: 'net.ericaro:diezel-maven-plugin:1.0.0-beta-4',
+ jcommander: 'com.beust:jcommander:1.25'
]
@@ -110,7 +104,6 @@
compile( libraries.logback_classic )
/* Commons. */
- compile( libraries.commons_io )
compile( libraries.commons_config )
compile( libraries.commons_coll )
diff --git a/test-apps/simple-deployable-app-1/build.gradle b/test-apps/simple-deployable-app-1/build.gradle
index cde3b1e..a2b216f 100644
--- a/test-apps/simple-deployable-app-1/build.gradle
+++ b/test-apps/simple-deployable-app-1/build.gradle
@@ -64,31 +64,24 @@
/* All project libraries must be defined here. */
project.ext["libraries"] = [
- json: 'org.json:json:20090211',
- guava: 'com.google.guava:guava:10.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',
- 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',
- commons_coll: 'net.sourceforge.collections:collections-generic:4.01', // Use this lib until the commons collection with Generics is released.
- slf4j: 'org.slf4j:slf4j-api:1.6.1',
- logback_core: 'ch.qos.logback:logback-core:0.9.29',
- logback_classic: 'ch.qos.logback:logback-classic:0.9.29',
- zk: 'org.apache.zookeeper:zookeeper:3.3.1',
- jcip: 'net.jcip:jcip-annotations:1.0',
- junit: 'junit:junit:4.10',
+ 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',
+ kryo: 'com.googlecode:kryo:1.04',
+ netty: 'org.jboss.netty:netty:3.2.5.Final',
+ mockito_core: 'org.mockito:mockito-core:1.9.0',
+ commons_config: 'commons-configuration:commons-configuration:1.6',
+ commons_codec: 'commons-codec:commons-codec:1.4',
+ commons_coll: 'net.sourceforge.collections:collections-generic:4.01', // Use this lib until the commons collection with Generics is released.
+ slf4j: 'org.slf4j:slf4j-api:1.6.1',
+ logback_core: 'ch.qos.logback:logback-core:0.9.29',
+ logback_classic: 'ch.qos.logback:logback-classic:0.9.29',
+ zk: 'org.apache.zookeeper:zookeeper:3.3.1',
+ jcip: 'net.jcip:jcip-annotations:1.0',
+ junit: 'junit:junit:4.10',
+ zkclient: 'com.github.sgroschupf:zkclient:0.1',
+ diezel: 'net.ericaro:diezel-maven-plugin:1.0.0-beta-4'
]
@@ -110,7 +103,6 @@
compile( libraries.logback_classic )
/* Commons. */
- compile( libraries.commons_io )
compile( libraries.commons_config )
compile( libraries.commons_coll )
