Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

WHIRR-377. Fix broken CLI logging config. Contributed by asavu.

git-svn-id: http://svn.apache.org/repos/asf/whirr/trunk@1162884 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit f8abe0cd71924a46a0473106f1c08f1f240b2e50 1 parent 287cbe5
tomwhite authored

Showing 3 changed files with 19 additions and 15 deletions. Show diff stats Hide diff stats

  1. +6 0 CHANGES.txt
  2. +7 8 bin/examples
  3. +6 7 bin/whirr
6 CHANGES.txt
@@ -6,6 +6,12 @@ Trunk (unreleased changes)
6 6
7 7 WHIRR-258. Add Ganglia as a service (Karel Vervaeke via asavu)
8 8
  9 + IMPROVEMENTS
  10 +
  11 + BUG FIXES
  12 +
  13 + WHIRR-377. Fix broken CLI logging config. (asavu via tomwhite)
  14 +
9 15 Release 0.6.0 - 2011-08-17
10 16
11 17 NEW FEATURES
15 bin/examples
@@ -15,15 +15,14 @@
15 15 # See the License for the specific language governing permissions and
16 16 # limitations under the License.
17 17
18   -bin=`dirname "$0"`
19   -bin=`cd "$bin"; pwd`
20   -opts="-Dlog4j.configuration=log4j-example.xml"
  18 +BIN=$(cd $(dirname "$0"); pwd)
  19 +LOGGING_OPTS="-Dlog4j.configuration=log4j-example.xml"
21 20
22   -if [ -d "$bin/../examples/target/lib" ]; then
23   - classpath="$bin/../conf/:$bin/..:$bin/../examples/target/lib/*:$bin/../examples/target/*"
  21 +if [ -d "$BIN/../examples/target/lib" ]; then
  22 + CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../examples/target/lib/*:$BIN/../examples/target/*"
24 23 else
25   - classpath="$bin/../conf/:$bin/..:$bin/../lib/*"
  24 + CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../lib/*"
26 25 fi
27 26
28   -java -cp "$classpath" org.apache.whirr.examples.Main "$@"
29   -
  27 +java $LOGGING_OPTS -cp "$CLASSPATH" org.apache.whirr.examples.Main "$@"
  28 +
13 bin/whirr
@@ -15,15 +15,14 @@
15 15 # See the License for the specific language governing permissions and
16 16 # limitations under the License.
17 17
18   -bin=`dirname "$0"`
19   -bin=`cd "$bin"; pwd`
20   -opts="-Dlog4j.configuration=log4j-cli.xml"
  18 +BIN=$(cd $(dirname "$0"); pwd)
  19 +LOGGING_OPTS="-Dlog4j.configuration=log4j-cli.xml"
21 20
22   -if [ -d "$bin/../cli/target/lib" ]; then
23   - classpath="$bin/../conf/:$bin/..:$bin/../cli/target/lib/*:$bin/../cli/target/*"
  21 +if [ -d "$BIN/../cli/target/lib" ]; then
  22 + CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../cli/target/lib/*:$BIN/../cli/target/*"
24 23 else
25   - classpath="$bin/../conf/:$bin/..:$bin/../lib/*"
  24 + CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../lib/*"
26 25 fi
27 26
28   -java $WHIRR_CLI_OPTS -cp "$classpath" org.apache.whirr.cli.Main "$@"
  27 +java $LOGGING_OPTS $WHIRR_CLI_OPTS -cp "$CLASSPATH" org.apache.whirr.cli.Main "$@"
29 28

0 comments on commit f8abe0c

Please sign in to comment.
Something went wrong with that request. Please try again.