Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1027634 - in /activemq/activemq-apollo/trunk:
 apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/
 apollo-distro/ apollo-distro/src/main/descriptors/
 apollo-distro/src/main/release/bin/ apollo-distro/src/main/release/etc/
Date: Tue, 26 Oct 2010 16:33:22 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
Message-Id: <20101026163322.DC15723888EC@eris.apache.org>

Author: chirino
Date: Tue Oct 26 16:33:22 2010
New Revision: 1027634

URL: http://svn.apache.org/viewvc?rev=1027634&view=rev
Log:
cleaning up cli broker startup output.

Added:
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/etc/jul.properties
Modified:
    activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
    activemq/activemq-apollo/trunk/apollo-distro/pom.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala?rev=1027634&r1=1027633&r2=1027634&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Run.scala Tue Oct 26 16:33:22 2010
@@ -86,8 +86,7 @@ class Run extends Action {
 
       val lib = home / "lib"
       val webapp = lib / lib.list.find( _.matches("""apollo-web-.+-slim.war""")).getOrElse(throw new Failure("war file not found.") )
-//      val webapp = home / "webapp"
-//
+
       if( conf == null ) {
         val etc = base / "etc"
         etc.mkdirs
@@ -130,7 +129,7 @@ class Run extends Action {
 
 
       // Start up the admin interface...
-      println("Starting administration interface..."+webapp);
+      println("Starting administration interface...");
       var server = new Server
 
       var connector = new SelectChannelConnector

Modified: activemq/activemq-apollo/trunk/apollo-distro/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/pom.xml?rev=1027634&r1=1027633&r2=1027634&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/pom.xml Tue Oct 26 16:33:22 2010
@@ -103,9 +103,16 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>${slf4j-version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <version>${slf4j-version}</version>
     </dependency>
+    
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml?rev=1027634&r1=1027633&r2=1027634&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml Tue Oct 26 16:33:22 2010
@@ -44,6 +44,7 @@
         
         <!-- the logging apis used -->
         <include>org.slf4j:slf4j-api</include>
+        <include>org.slf4j:jul-to-slf4j</include>
         <include>commons-logging:commons-logging</include>
         <include>org.slf4j:slf4j-log4j12</include>
         <include>log4j:log4j</include>

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo?rev=1027634&r1=1027633&r2=1027634&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo Tue Oct 26 16:33:22 2010
@@ -125,6 +125,8 @@ fi
 for f in "${APOLLO_HOME}/lib"/*.jar; do
   CLASSPATH="$CLASSPATH:$f"
 done
+
+JUL_CONFIG_FILE="${APOLLO_BASE}/etc/jul.properties"
     
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
@@ -133,6 +135,7 @@ if $cygwin; then
   JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
   CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
   CYGHOME=`cygpath --windows "$HOME"`
+  JUL_CONFIG_FILE=`cygpath --windows "$JUL_CONFIG_FILE"`
 fi
 
 if [ -z "$APOLLO_OPTS" ] ; then
@@ -156,5 +159,5 @@ if [ -z "$JMX_OPTS" ] ; then
 fi
 JVM_FLAGS="${JVM_FLAGS} ${JMX_OPTS}"
 
-exec "$JAVACMD" ${JVM_FLAGS} -Dapollo.home="${APOLLO_HOME}" -Dapollo.base="${APOLLO_BASE}" -classpath "${CLASSPATH}" org.apache.activemq.apollo.cli.Apollo $@
+exec "$JAVACMD" ${JVM_FLAGS} -Djava.util.logging.config.file="${JUL_CONFIG_FILE}" -Dapollo.home="${APOLLO_HOME}" -Dapollo.base="${APOLLO_BASE}" -classpath "${CLASSPATH}" org.apache.activemq.apollo.cli.Apollo $@
 

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd?rev=1027634&r1=1027633&r2=1027634&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd Tue Oct 26 16:33:22 2010
@@ -69,7 +69,11 @@ if "%JMX_OPTS%" == "" set JMX_OPTS=-Dcom
 rem set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
 set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS%
 
-set JVM_FLAGS=%JVM_FLAGS% -Dapollo.home="%APOLLO_HOME%" -Dapollo.base="%APOLLO_BASE%"
+set JUL_CONFIG_FILE=%APOLLO_BASE%\etc\jul.properties
+
+set JVM_FLAGS=%JVM_FLAGS% -Dapollo.home="%APOLLO_HOME%" 
+set JVM_FLAGS=%JVM_FLAGS% -Dapollo.base="%APOLLO_BASE%"
+set JVM_FLAGS=%JVM_FLAGS% -Djava.util.logging.config.file="%JUL_CONFIG_FILE%"
 set JVM_FLAGS=%JVM_FLAGS% -classpath "%CLASSPATH%"
 
 rem echo "%_JAVACMD%" %JVM_FLAGS%  org.apache.activemq.apollo.cli.Apollo %*

Added: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/etc/jul.properties
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/etc/jul.properties?rev=1027634&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/etc/jul.properties (added)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/etc/jul.properties Tue Oct 26 16:33:22 2010
@@ -0,0 +1,25 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+## 
+## http://www.apache.org/licenses/LICENSE-2.0
+## 
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+# This file configures how Java Util Logging is handled.
+
+#
+# We just redirect all log events to slf4j so that all logging can be 
+# configured via log4j
+#
+handlers=org.slf4j.bridge.SLF4JBridgeHandler
+.level=INFO
\ No newline at end of file