Return-Path: 
 <scm-return-9544-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 30287 invoked from network); 13 Dec 2005 22:10:12 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 13 Dec 2005 22:10:12 -0000
Received: (qmail 67449 invoked by uid 500); 13 Dec 2005 22:10:11 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 67440 invoked by uid 500); 13 Dec 2005 22:10:11 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 67428 invoked by uid 99); 13 Dec 2005 22:10:11 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2005 14:10:11 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 13 Dec 2005 14:10:09 -0800
Received: (qmail 29945 invoked by uid 65534); 13 Dec 2005 22:09:49 -0000
Message-ID: <20051213220949.29942.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r356632 - in /geronimo/trunk:
 applications/daytrader/derby/
 assemblies/j2ee-installer/src/var/log/
 assemblies/j2ee-jetty-server/src/var/log/
 assemblies/j2ee-tomcat-server/src/var/log/
Date: Tue, 13 Dec 2005 22:09:47 -0000
To: scm@geronimo.apache.org
From: ammulder@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: ammulder
Date: Tue Dec 13 14:09:44 2005
New Revision: 356632

URL: http://svn.apache.org/viewcvs?rev=356632&view=rev
Log:
Merge build and log changes from branch

Modified:
    geronimo/trunk/applications/daytrader/derby/maven.xml
    geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties

Modified: geronimo/trunk/applications/daytrader/derby/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/derby/maven.xml?rev=356632&r1=356631&r2=356632&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/derby/maven.xml (original)
+++ geronimo/trunk/applications/daytrader/derby/maven.xml Tue Dec 13 14:09:44 2005
@@ -48,15 +48,11 @@
 
         <!-- setup the lame system properties that derby needs -->
         <j:invokeStatic className="java.lang.System" method="setProperty">
-            <j:arg type="java.lang.String" value="derby.system.home"/>
-            <j:arg type="java.lang.String" value="${derby.system.home}"/>
-        </j:invokeStatic>
-        <j:invokeStatic className="java.lang.System" method="setProperty">
             <j:arg type="java.lang.String" value="derby.storage.fileSyncTransactionLog"/>
             <j:arg type="java.lang.String" value="true"/>
         </j:invokeStatic>
         <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
-            url="jdbc:derby:DaytraderDatabase;create=true"
+            url="jdbc:derby:${derby.system.home}/DaytraderDatabase;create=true"
             userid="" password=""
             autocommit="true"
             onerror="abort"

Modified: geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties?rev=356632&r1=356631&r2=356632&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/var/log/server-log4j.properties Tue Dec 13 14:09:44 2005
@@ -49,6 +49,8 @@
 #
 #log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
 
+#### Show key debug messages in the log ####
+log4j.category.org.apache.geronimo.gbean.runtime.GBeanSingleReference=DEBUG
 
 #### Eliminate any INFO level output during normal operation -- except the really relevant stuff ####
 #    We can change the Geronimo code to avoid this, but we have to just adjust the log levels for

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties?rev=356632&r1=356631&r2=356632&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties Tue Dec 13 14:09:44 2005
@@ -49,6 +49,8 @@
 #
 #log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
 
+#### Show key debug messages in the log ####
+log4j.category.org.apache.geronimo.gbean.runtime.GBeanSingleReference=DEBUG
 
 #### Eliminate any INFO level output during normal operation -- except the really relevant stuff ####
 #    We can change the Geronimo code to avoid this, but we have to just adjust the log levels for

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties?rev=356632&r1=356631&r2=356632&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties Tue Dec 13 14:09:44 2005
@@ -49,6 +49,8 @@
 #
 #log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
 
+#### Show key debug messages in the log ####
+log4j.category.org.apache.geronimo.gbean.runtime.GBeanSingleReference=DEBUG
 
 #### Eliminate any INFO level output during normal operation -- except the really relevant stuff ####
 #    We can change the Geronimo code to avoid this, but we have to just adjust the log levels for