SAMOA-29: Excluding the samoa-storm.properties at compile time and including at test
Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/d454deb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/d454deb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/d454deb6 Branch: refs/heads/master Commit: d454deb6ce0e6d3e7f2d73334342f33f27beede3 Parents: edde7c1 Author: jayadeepj <[email protected]> Authored: Mon Aug 10 23:28:09 2015 -0700 Committer: jayadeepj <[email protected]> Committed: Mon Aug 10 23:28:09 2015 -0700 ---------------------------------------------------------------------- bin/samoa | 2 +- bin/samoa-storm.properties | 2 +- samoa-storm/pom.xml | 8 ++++---- .../src/main/java/org/apache/samoa/LocalStormDoTask.java | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/d454deb6/bin/samoa ---------------------------------------------------------------------- diff --git a/bin/samoa b/bin/samoa index 1a0ff15..1a26caa 100755 --- a/bin/samoa +++ b/bin/samoa @@ -201,7 +201,7 @@ elif [ $PLATFORM = 'STORM' ]; then if [ "$MODE_ARG" = "cluster" ]; then $STORM_EXEC jar $DEPLOYABLE org.apache.samoa.topology.impl.StormDoTask $COMPLETE_ARG $NUM_WORKER $MODE_ARG elif [ "$MODE_ARG" = "local" ]; then - CLASSPATH="$CLASSPATH:$STORM_HOME/lib/*:$DEPLOYABLE" + CLASSPATH="$CLASSPATH:$STORM_HOME/lib/*:$BASE_DIR/:$DEPLOYABLE" java -cp $CLASSPATH org.apache.samoa.LocalStormDoTask $COMPLETE_ARG $NUM_WORKER fi http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/d454deb6/bin/samoa-storm.properties ---------------------------------------------------------------------- diff --git a/bin/samoa-storm.properties b/bin/samoa-storm.properties index 423b8b2..58a395d 100644 --- a/bin/samoa-storm.properties +++ b/bin/samoa-storm.properties @@ -34,4 +34,4 @@ samoa.storm.mode=local samoa.storm.numworker=4 # samoa.storm.local.mode.execution.duration corresponds to the execution duration of the local topology in seconds. -samoa.storm.local.mode.execution.duration=100 +samoa.storm.local.mode.execution.duration=200 http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/d454deb6/samoa-storm/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-storm/pom.xml b/samoa-storm/pom.xml index fd4029c..4539261 100644 --- a/samoa-storm/pom.xml +++ b/samoa-storm/pom.xml @@ -121,13 +121,13 @@ </configuration> </plugin> </plugins> - <resources> - <resource> + <testResources> + <testResource> <directory>${project.basedir}/../bin</directory> <includes> <include>*storm.properties</include> </includes> - </resource> - </resources> + </testResource> + </testResources> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/d454deb6/samoa-storm/src/main/java/org/apache/samoa/LocalStormDoTask.java ---------------------------------------------------------------------- diff --git a/samoa-storm/src/main/java/org/apache/samoa/LocalStormDoTask.java b/samoa-storm/src/main/java/org/apache/samoa/LocalStormDoTask.java index a31fa58..f77dbac 100644 --- a/samoa-storm/src/main/java/org/apache/samoa/LocalStormDoTask.java +++ b/samoa-storm/src/main/java/org/apache/samoa/LocalStormDoTask.java @@ -43,7 +43,6 @@ public class LocalStormDoTask { private static final Logger logger = LoggerFactory.getLogger(LocalStormDoTask.class); private static final String EXECUTION_DURATION_KEY ="samoa.storm.local.mode.execution.duration"; private static final String SAMOA_STORM_PROPERTY_FILE_LOC ="samoa-storm.properties"; - /** * The main method. *
