You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/13 08:10:51 UTC

svn commit: r636649 - in /geronimo/plugins/directory/branches/1.0: directory/pom.xml directory/src/main/plan/plan.xml directory/src/main/resources/META-INF/log4j.properties pom.xml

Author: djencks
Date: Thu Mar 13 00:10:49 2008
New Revision: 636649

URL: http://svn.apache.org/viewvc?rev=636649&view=rev
Log:
GERONIMO-3898 Example of use of ApplicationLog4jConfigurationGBean to segregate apacheds logging. Also move to g 2.1.1-SNAPSHOT

Added:
    geronimo/plugins/directory/branches/1.0/directory/src/main/resources/META-INF/log4j.properties   (with props)
Modified:
    geronimo/plugins/directory/branches/1.0/directory/pom.xml
    geronimo/plugins/directory/branches/1.0/directory/src/main/plan/plan.xml
    geronimo/plugins/directory/branches/1.0/pom.xml

Modified: geronimo/plugins/directory/branches/1.0/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/directory/pom.xml?rev=636649&r1=636648&r2=636649&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/directory/pom.xml (original)
+++ geronimo/plugins/directory/branches/1.0/directory/pom.xml Thu Mar 13 00:10:49 2008
@@ -250,6 +250,7 @@
                     <instance>
                         <plugin-artifact>
                             <copy-file relative-to="server" dest-dir="var/directory">META-INF/server.xml</copy-file>
+                            <copy-file relative-to="server" dest-dir="var/directory">META-INF/log4j.properties</copy-file>
                             <config-xml-content>
                                <gbean name="DirectoryService">
                                     <attribute name="configFile">var/directory/server.xml</attribute>

Modified: geronimo/plugins/directory/branches/1.0/directory/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/directory/src/main/plan/plan.xml?rev=636649&r1=636648&r2=636649&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/directory/src/main/plan/plan.xml (original)
+++ geronimo/plugins/directory/branches/1.0/directory/src/main/plan/plan.xml Thu Mar 13 00:10:49 2008
@@ -27,4 +27,9 @@
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </gbean>
 
+    <gbean name="DirectoryLog4jConfiguration" class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+        <attribute name="log4jFile">var/directory/log4j.properties</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+
 </module>

Added: geronimo/plugins/directory/branches/1.0/directory/src/main/resources/META-INF/log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/directory/src/main/resources/META-INF/log4j.properties?rev=636649&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/1.0/directory/src/main/resources/META-INF/log4j.properties (added)
+++ geronimo/plugins/directory/branches/1.0/directory/src/main/resources/META-INF/log4j.properties Thu Mar 13 00:10:49 2008
@@ -0,0 +1,32 @@
+#############################################################################
+#    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.
+#############################################################################
+
+log4j.logger.org.apache.directory=INFO,apacheds
+#do not log apacheds to geronimo logs.
+log4j.additivity.org.apache.directory=false
+
+log4j.appender.apacheds=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.apacheds.File=${org.apache.geronimo.server.dir}/var/log/apacheds.log
+log4j.appender.apacheds.layout=org.apache.log4j.PatternLayout
+# geronimo style logging
+log4j.appender.apacheds.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
+# with these we'll not get innundated when switching to DEBUG
+log4j.logger.org.apache.directory.shared.ldap.name=WARN
+#log4j.logger.org.springframework=WARN
+log4j.logger.org.apache.directory.shared.codec=WARN
+log4j.logger.org.apache.directory.shared.asn1=WARN
\ No newline at end of file

Propchange: geronimo/plugins/directory/branches/1.0/directory/src/main/resources/META-INF/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/directory/branches/1.0/directory/src/main/resources/META-INF/log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/directory/branches/1.0/directory/src/main/resources/META-INF/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/plugins/directory/branches/1.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/pom.xml?rev=636649&r1=636648&r2=636649&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/pom.xml (original)
+++ geronimo/plugins/directory/branches/1.0/pom.xml Thu Mar 13 00:10:49 2008
@@ -58,7 +58,7 @@
         <version>1.0</version>
 
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1</geronimoVersion>
+        <geronimoVersion>2.1.1-SNAPSHOT</geronimoVersion>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
     </properties>