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/31 10:59:49 UTC
[2/2] Update artifacts for release - use specific license and notice
for binary release - no transitive dependencies in gradle platform projects -
fix a few invalid imports
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/subprojects/s4-core/src/test/java/org/apache/s4/wordcount/WordClassifierPE.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-core/src/test/java/org/apache/s4/wordcount/WordClassifierPE.java b/subprojects/s4-core/src/test/java/org/apache/s4/wordcount/WordClassifierPE.java
index b69c6fe..1c3ba84 100644
--- a/subprojects/s4-core/src/test/java/org/apache/s4/wordcount/WordClassifierPE.java
+++ b/subprojects/s4-core/src/test/java/org/apache/s4/wordcount/WordClassifierPE.java
@@ -25,7 +25,6 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.CountDownLatch;
-import org.apache.log4j.Logger;
import org.apache.s4.core.App;
import org.apache.s4.core.ProcessingElement;
import org.apache.s4.fixtures.CommTestUtils;
@@ -35,6 +34,8 @@ import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.ZooKeeper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WordClassifierPE extends ProcessingElement implements Watcher {
@@ -42,6 +43,8 @@ public class WordClassifierPE extends ProcessingElement implements Watcher {
private int counter;
transient private ZooKeeper zk;
+ private static Logger logger = LoggerFactory.getLogger(WordClassifierPE.class);
+
private WordClassifierPE() {
}
@@ -96,7 +99,7 @@ public class WordClassifierPE extends ProcessingElement implements Watcher {
// zookeeper
zk.create("/classifierIteration_" + counter, new byte[counter], Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
- Logger.getLogger("s4-ft").debug("wrote classifier iteration [" + counter + "]");
+ logger.debug("wrote classifier iteration [" + counter + "]");
System.out.println("wrote classifier iteration [" + counter + "]");
// check if we are allowed to continue
if (null == zk.exists("/continue_" + counter, null)) {
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/subprojects/s4-edsl/s4-edsl.gradle
----------------------------------------------------------------------
diff --git a/subprojects/s4-edsl/s4-edsl.gradle b/subprojects/s4-edsl/s4-edsl.gradle
index cb96e79..93114f2 100644
--- a/subprojects/s4-edsl/s4-edsl.gradle
+++ b/subprojects/s4-edsl/s4-edsl.gradle
@@ -21,8 +21,13 @@ def generatedSourceDir = "${buildDir}/generated-src/java"
def diezelSrcDir = "${projectDir}/src/main/diezel";
dependencies {
+ compile project(":s4-base")
+ compile project(":s4-comm")
compile project(":s4-core")
- //testCompile project(path: ':s4-core', configuration: 'tests')
+ testCompile project(path: ':s4-comm', configuration: 'tests')
+ testRuntime libraries.zkclient
+ testRuntime libraries.netty
+ testRuntime libraries.asm
}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/subprojects/s4-example/s4-example.gradle
----------------------------------------------------------------------
diff --git a/subprojects/s4-example/s4-example.gradle b/subprojects/s4-example/s4-example.gradle
index f1c663c..59341fe 100644
--- a/subprojects/s4-example/s4-example.gradle
+++ b/subprojects/s4-example/s4-example.gradle
@@ -25,14 +25,11 @@ description = 'Examples of S4 applications.'
dependencies {
compile project( ":s4-base" )
-
compile project( ":s4-core" )
-
compile project( ":s4-comm" )
-
compile project( ":s4-edsl" )
-
compile libraries.junit
+ compile libraries.jcip
}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/subprojects/s4-example/src/main/java/org/apache/s4/example/counter/PrintPE.java
----------------------------------------------------------------------
diff --git a/subprojects/s4-example/src/main/java/org/apache/s4/example/counter/PrintPE.java b/subprojects/s4-example/src/main/java/org/apache/s4/example/counter/PrintPE.java
index e6e9d2b..380a10d 100644
--- a/subprojects/s4-example/src/main/java/org/apache/s4/example/counter/PrintPE.java
+++ b/subprojects/s4-example/src/main/java/org/apache/s4/example/counter/PrintPE.java
@@ -18,7 +18,7 @@
package org.apache.s4.example.counter;
-import javax.annotation.concurrent.ThreadSafe;
+import net.jcip.annotations.ThreadSafe;
import org.apache.s4.base.Event;
import org.apache.s4.core.App;
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/subprojects/s4-tools/s4-tools.gradle
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/s4-tools.gradle b/subprojects/s4-tools/s4-tools.gradle
index 8f47441..f8822df 100644
--- a/subprojects/s4-tools/s4-tools.gradle
+++ b/subprojects/s4-tools/s4-tools.gradle
@@ -19,7 +19,8 @@
description = 'The S4 tools platform.'
-apply plugin: 'java'
+apply plugin: 'java'
+
task "create-dirs" << {
sourceSets.all*.java.srcDirs*.each { it.mkdirs() }
@@ -35,7 +36,8 @@ dependencies {
compile libraries.gradle_base_services
compile libraries.gradle_core
compile libraries.gradle_tooling_api
- compile libraries.gradle_wrapper
+ compile libraries.gradle_wrapper
+ compile libraries.log4j
}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/subprojects/s4-tools/src/main/resources/templates/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/s4-tools/src/main/resources/templates/build.gradle b/subprojects/s4-tools/src/main/resources/templates/build.gradle
index d0704c8..d2fd1b6 100644
--- a/subprojects/s4-tools/src/main/resources/templates/build.gradle
+++ b/subprojects/s4-tools/src/main/resources/templates/build.gradle
@@ -32,6 +32,7 @@ group = 'org.apache.s4'
apply plugin: 'java'
apply plugin: 'eclipse'
+apply plugin: 'idea'
apply plugin:'application'
/* The app classname is set automatically from the source files. */
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/test-apps/consumer-app/build.gradle
----------------------------------------------------------------------
diff --git a/test-apps/consumer-app/build.gradle b/test-apps/consumer-app/build.gradle
index d8d56c4..bc53b3a 100644
--- a/test-apps/consumer-app/build.gradle
+++ b/test-apps/consumer-app/build.gradle
@@ -52,6 +52,7 @@ group = 'org.apache.s4'
apply plugin: 'java'
apply plugin: 'eclipse'
+apply plugin: 'idea'
/* The app classname is set automatically from the source files. */
def appClassname = ''
@@ -83,21 +84,15 @@ 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',
- 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'
+ gradle_base_services: 'org.gradle:gradle-base-services:1.0',
+ gradle_core: 'org.gradle:gradle-core:1.0',
+ gradle_tooling_api: 'org.gradle:gradle-tooling-api:1.0',
+ gradle_wrapper: 'org.gradle:gradle-wrapper:1.0'
]
dependencies {
- /* S4 Platform. We only need the API, not the transitive dependencies. */
-// s4Libs.each { module ->
-// compile( module ) //{ transitive = false }
-// s4API( module )
-// }
-
compile project(":s4-base")
compile project(":s4-comm")
compile project(":s4-core")
@@ -113,6 +108,7 @@ dependencies {
/* Misc. */
compile( libraries.jcip )
+ compile ( libraries.zkclient)
/* Testing. */
testCompile( libraries.junit )
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/test-apps/producer-app/build.gradle
----------------------------------------------------------------------
diff --git a/test-apps/producer-app/build.gradle b/test-apps/producer-app/build.gradle
index 8f79377..bc53b3a 100644
--- a/test-apps/producer-app/build.gradle
+++ b/test-apps/producer-app/build.gradle
@@ -52,6 +52,7 @@ group = 'org.apache.s4'
apply plugin: 'java'
apply plugin: 'eclipse'
+apply plugin: 'idea'
/* The app classname is set automatically from the source files. */
def appClassname = ''
@@ -82,18 +83,16 @@ project.ext["libraries"] = [
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'
+ jcommander: 'com.beust:jcommander:1.25',
+ gradle_base_services: 'org.gradle:gradle-base-services:1.0',
+ gradle_core: 'org.gradle:gradle-core:1.0',
+ gradle_tooling_api: 'org.gradle:gradle-tooling-api:1.0',
+ gradle_wrapper: 'org.gradle:gradle-wrapper:1.0'
]
dependencies {
- /* S4 Platform. We only need the API, not the transitive dependencies. */
-// s4Libs.each { module ->
-// compile( module ) //{ transitive = false }
-// s4API( module )
-// }
-
compile project(":s4-base")
compile project(":s4-comm")
compile project(":s4-core")
@@ -109,6 +108,7 @@ dependencies {
/* Misc. */
compile( libraries.jcip )
+ compile ( libraries.zkclient)
/* Testing. */
testCompile( libraries.junit )
@@ -196,9 +196,7 @@ task installS4R (type: Copy) {
into s4AppInstallDir
}
-/* Generates the gradlew scripts.
-http://www.gradle.org/1.0-milestone-3/docs/userguide/gradle_wrapper.html */
-task wrapper(type: Wrapper) { gradleVersion = '1.0-milestone-3' }
+
/* Parse source file to get the app classname so we can use it in the manifest.
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/test-apps/simple-deployable-app-1/build.gradle
----------------------------------------------------------------------
diff --git a/test-apps/simple-deployable-app-1/build.gradle b/test-apps/simple-deployable-app-1/build.gradle
index a2b216f..bc53b3a 100644
--- a/test-apps/simple-deployable-app-1/build.gradle
+++ b/test-apps/simple-deployable-app-1/build.gradle
@@ -42,8 +42,8 @@ project.ext["s4AppInstallDir"] = hasProperty('appsDir') ? "$appsDir" : "/tmp/app
project.ext["s4Version"] = '0.5.0-SNAPSHOT'
description = 'Apache S4 App'
//defaultTasks 'installS4R'
-project.ext["archivesBaseName"] = "$project.name"
-project.ext["distRootFolder"] = "$archivesBaseName-${-> version}"
+archivesBaseName = "$project.name"
+distRootFolder = "$archivesBaseName-${-> version}"
// Append the suffix 'SNAPSHOT' when the build is not for release.
@@ -52,6 +52,7 @@ group = 'org.apache.s4'
apply plugin: 'java'
apply plugin: 'eclipse'
+apply plugin: 'idea'
/* The app classname is set automatically from the source files. */
def appClassname = ''
@@ -64,7 +65,7 @@ targetCompatibility = 1.6
/* All project libraries must be defined here. */
project.ext["libraries"] = [
- guava: 'com.google.guava:guava:12.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',
@@ -81,18 +82,17 @@ project.ext["libraries"] = [
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'
+ diezel: 'net.ericaro:diezel-maven-plugin:1.0.0-beta-4',
+ jcommander: 'com.beust:jcommander:1.25',
+ gradle_base_services: 'org.gradle:gradle-base-services:1.0',
+ gradle_core: 'org.gradle:gradle-core:1.0',
+ gradle_tooling_api: 'org.gradle:gradle-tooling-api:1.0',
+ gradle_wrapper: 'org.gradle:gradle-wrapper:1.0'
]
dependencies {
- /* S4 Platform. We only need the API, not the transitive dependencies. */
-// s4Libs.each { module ->
-// compile( module ) //{ transitive = false }
-// s4API( module )
-// }
-
compile project(":s4-base")
compile project(":s4-comm")
compile project(":s4-core")
@@ -108,6 +108,7 @@ dependencies {
/* Misc. */
compile( libraries.jcip )
+ compile ( libraries.zkclient)
/* Testing. */
testCompile( libraries.junit )
@@ -128,7 +129,6 @@ manifest.mainAttributes(
project.ext["appDependencies"] = ( configurations.compile )
-
// external dependencies will be available in the /lib directory of the s4r
task copyDependenciesToLib(type: Copy) {
into project.libsDir.path+"/lib"
@@ -196,9 +196,7 @@ task installS4R (type: Copy) {
into s4AppInstallDir
}
-/* Generates the gradlew scripts.
-http://www.gradle.org/1.0-milestone-3/docs/userguide/gradle_wrapper.html */
-task wrapper(type: Wrapper) { gradleVersion = '1.0-milestone-3' }
+
/* Parse source file to get the app classname so we can use it in the manifest.
@@ -207,7 +205,7 @@ task wrapper(type: Wrapper) { gradleVersion = '1.0-milestone-3' }
def getAppClassname(file) {
def classname = "UNKNOWN"
def lines= file.readLines()
- def packageName = ""
+ def packageName=""
for(line in lines) {
def pn = line =~ /.*package\s+([\w\.]+)\s*;.*/
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/test-apps/twitter-adapter/build.gradle
----------------------------------------------------------------------
diff --git a/test-apps/twitter-adapter/build.gradle b/test-apps/twitter-adapter/build.gradle
index ab71961..9b6a2d4 100644
--- a/test-apps/twitter-adapter/build.gradle
+++ b/test-apps/twitter-adapter/build.gradle
@@ -39,7 +39,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"
@@ -52,6 +52,7 @@ group = 'org.apache.s4'
apply plugin: 'java'
apply plugin: 'eclipse'
+apply plugin: 'idea'
apply plugin:'application'
mainClassName = "org.apache.s4.core.Main"
@@ -77,9 +78,9 @@ repositories {
project.ext["libraries"] = [
twitter4j_core: 'org.twitter4j:twitter4j-core:2.2.5',
twitter4j_stream: 'org.twitter4j:twitter4j-stream:2.2.5',
- s4_base: 'org.apache.s4:s4-base:0.5.0-SNAPSHOT',
- s4_comm: 'org.apache.s4:s4-comm:0.5.0-SNAPSHOT',
- s4_core: 'org.apache.s4:s4-core:0.5.0-SNAPSHOT'
+ s4_base: 'org.apache.s4:s4-base:0.5.0-incubating',
+ s4_comm: 'org.apache.s4:s4-comm:0.5.0-incubating',
+ s4_core: 'org.apache.s4:s4-core:0.5.0-incubating'
]
@@ -184,7 +185,7 @@ task installS4R (type: Copy) {
/* Generates the gradlew scripts.
http://www.gradle.org/1.0-milestone-3/docs/userguide/gradle_wrapper.html */
-task wrapper(type: Wrapper) { gradleVersion = '1.0-milestone-3' }
+task wrapper(type: Wrapper) { gradleVersion = '1.0' }
task cp << {
description='dumps the classpath for running a class from this project, into a \'classpath.txt\' file in the current directory'
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/ade0e115/test-apps/twitter-counter/build.gradle
----------------------------------------------------------------------
diff --git a/test-apps/twitter-counter/build.gradle b/test-apps/twitter-counter/build.gradle
index 981b508..fa765fc 100644
--- a/test-apps/twitter-counter/build.gradle
+++ b/test-apps/twitter-counter/build.gradle
@@ -39,7 +39,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"
@@ -52,6 +52,7 @@ group = 'org.apache.s4'
apply plugin: 'java'
apply plugin: 'eclipse'
+apply plugin: 'idea'
apply plugin:'application'
/* The app classname is set automatically from the source files. */
@@ -74,9 +75,9 @@ repositories {
/* All project libraries must be defined here. */
project.ext["libraries"] = [
- s4_base: 'org.apache.s4:s4-base:0.5.0-SNAPSHOT',
- s4_comm: 'org.apache.s4:s4-comm:0.5.0-SNAPSHOT',
- s4_core: 'org.apache.s4:s4-core:0.5.0-SNAPSHOT'
+ s4_base: 'org.apache.s4:s4-base:0.5.0-incubating',
+ s4_comm: 'org.apache.s4:s4-comm:0.5.0-incubating',
+ s4_core: 'org.apache.s4:s4-core:0.5.0-incubating'
]
@@ -181,7 +182,7 @@ task installS4R (type: Copy) {
/* Generates the gradlew scripts.
http://www.gradle.org/1.0-milestone-3/docs/userguide/gradle_wrapper.html */
-task wrapper(type: Wrapper) { gradleVersion = '1.0-milestone-3' }
+task wrapper(type: Wrapper) { gradleVersion = '1.0' }
/* Parse source file to get the app classname so we can use it in the manifest.