You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2011/08/29 17:58:31 UTC
svn commit: r1162884 - in /whirr/trunk: CHANGES.txt bin/examples bin/whirr
Author: tomwhite
Date: Mon Aug 29 15:58:31 2011
New Revision: 1162884
URL: http://svn.apache.org/viewvc?rev=1162884&view=rev
Log:
WHIRR-377. Fix broken CLI logging config. Contributed by asavu.
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/bin/examples
whirr/trunk/bin/whirr
Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1162884&r1=1162883&r2=1162884&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Mon Aug 29 15:58:31 2011
@@ -6,6 +6,12 @@ Trunk (unreleased changes)
WHIRR-258. Add Ganglia as a service (Karel Vervaeke via asavu)
+ IMPROVEMENTS
+
+ BUG FIXES
+
+ WHIRR-377. Fix broken CLI logging config. (asavu via tomwhite)
+
Release 0.6.0 - 2011-08-17
NEW FEATURES
Modified: whirr/trunk/bin/examples
URL: http://svn.apache.org/viewvc/whirr/trunk/bin/examples?rev=1162884&r1=1162883&r2=1162884&view=diff
==============================================================================
--- whirr/trunk/bin/examples (original)
+++ whirr/trunk/bin/examples Mon Aug 29 15:58:31 2011
@@ -15,15 +15,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
-opts="-Dlog4j.configuration=log4j-example.xml"
+BIN=$(cd $(dirname "$0"); pwd)
+LOGGING_OPTS="-Dlog4j.configuration=log4j-example.xml"
-if [ -d "$bin/../examples/target/lib" ]; then
- classpath="$bin/../conf/:$bin/..:$bin/../examples/target/lib/*:$bin/../examples/target/*"
+if [ -d "$BIN/../examples/target/lib" ]; then
+ CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../examples/target/lib/*:$BIN/../examples/target/*"
else
- classpath="$bin/../conf/:$bin/..:$bin/../lib/*"
+ CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../lib/*"
fi
-java -cp "$classpath" org.apache.whirr.examples.Main "$@"
-
+java $LOGGING_OPTS -cp "$CLASSPATH" org.apache.whirr.examples.Main "$@"
+
Modified: whirr/trunk/bin/whirr
URL: http://svn.apache.org/viewvc/whirr/trunk/bin/whirr?rev=1162884&r1=1162883&r2=1162884&view=diff
==============================================================================
--- whirr/trunk/bin/whirr (original)
+++ whirr/trunk/bin/whirr Mon Aug 29 15:58:31 2011
@@ -15,15 +15,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
-opts="-Dlog4j.configuration=log4j-cli.xml"
+BIN=$(cd $(dirname "$0"); pwd)
+LOGGING_OPTS="-Dlog4j.configuration=log4j-cli.xml"
-if [ -d "$bin/../cli/target/lib" ]; then
- classpath="$bin/../conf/:$bin/..:$bin/../cli/target/lib/*:$bin/../cli/target/*"
+if [ -d "$BIN/../cli/target/lib" ]; then
+ CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../cli/target/lib/*:$BIN/../cli/target/*"
else
- classpath="$bin/../conf/:$bin/..:$bin/../lib/*"
+ CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../lib/*"
fi
-java $WHIRR_CLI_OPTS -cp "$classpath" org.apache.whirr.cli.Main "$@"
+java $LOGGING_OPTS $WHIRR_CLI_OPTS -cp "$CLASSPATH" org.apache.whirr.cli.Main "$@"