cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r492612 - in /cocoon/trunk: core/cocoon-webapp/src/main/webapp/WEB-INF/ core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/ tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/ tools/coc...
Date Thu, 04 Jan 2007 15:38:13 GMT
Author: cziegeler
Date: Thu Jan  4 07:38:12 2007
New Revision: 492612

URL: http://svn.apache.org/viewvc?view=rev&rev=492612
Log:
The log4j configuration is no Avalon configuration, so use correct suffix ".xml"

Added:
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xml
      - copied unchanged from r492577, cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xconf
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xml
      - copied, changed from r492564, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xconf
Removed:
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/log4j.xconf
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xconf
Modified:
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml
    cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=492612&r1=492611&r2=492612
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml Thu Jan
 4 07:38:12 2007
@@ -29,13 +29,14 @@
   <!-- Activate Cocoon Spring Configurator -->
   <configurator:settings/>
 
+  <!-- Configure Log4j -->
   <bean name="org.apache.cocoon.spring.configurator.log4j"
         class="org.apache.cocoon.spring.configurator.log4j.Log4JConfigurator"
         scope="singleton">
-    <property name="resource" value="/WEB-INF/cocoon/log4j.xconf"/>
+    <property name="resource" value="/WEB-INF/cocoon/log4j.xml"/>
   </bean>
 
-  <!-- Load Avalon configurations -->
+  <!-- Activate Avalon Bridge -->
   <avalon:bridge/>
 
 </beans>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=492612&r1=492611&r2=492612
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
Thu Jan  4 07:38:12 2007
@@ -29,13 +29,14 @@
   <!-- Activate Cocoon Spring Configurator -->
   <configurator:settings/>
 
+  <!-- Configure Log4j -->
   <bean name="org.apache.cocoon.spring.configurator.log4j"
         class="org.apache.cocoon.spring.configurator.log4j.Log4JConfigurator"
         scope="singleton">
-    <property name="resource" value="/WEB-INF/cocoon/log4j.xconf"/>
+    <property name="resource" value="/WEB-INF/cocoon/log4j.xml"/>
   </bean>
 
-  <!-- Load Avalon configurations -->
+  <!-- Activate Avalon Bridge -->
   <avalon:bridge/>
 
 </beans>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml?view=diff&rev=492612&r1=492611&r2=492612
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
Thu Jan  4 07:38:12 2007
@@ -15,6 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
 
     <!-- This is a sample configuration for log4j.
@@ -23,7 +24,7 @@
          Note, that you can use properties for value substitution.
     -->
     <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
-        <param name="File"   value="${log-dir}/log4j.log" />
+        <param name="File"   value="${org.apache.cocoon.work.directory}/cocoon-logs/log4j.log"
/>
         <param name="Append" value="false" />       
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml?view=diff&rev=492612&r1=492611&r2=492612
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/applicationContext.xml
Thu Jan  4 07:38:12 2007
@@ -29,13 +29,14 @@
   <!-- Activate Cocoon Spring Configurator -->
   <configurator:settings/>
 
+  <!-- Configure Log4j -->
   <bean name="org.apache.cocoon.spring.configurator.log4j"
         class="org.apache.cocoon.spring.configurator.log4j.Log4JConfigurator"
         scope="singleton">
-    <property name="resource" value="/WEB-INF/cocoon/log4j.xconf"/>
+    <property name="resource" value="/WEB-INF/cocoon/log4j.xml"/>
   </bean>
 
-  <!-- Load Avalon configurations -->
+  <!-- Activate Avalon Bridge -->
   <avalon:bridge/>
 
 </beans>

Copied: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xml
(from r492564, cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xconf)
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xml?view=diff&rev=492612&p1=cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xconf&r1=492564&p2=cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xml&r2=492612
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xconf
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/log4j.xml
Thu Jan  4 07:38:12 2007
@@ -15,6 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
 
     <!-- This is a sample configuration for log4j.
@@ -23,7 +24,7 @@
          Note, that you can use properties for value substitution.
     -->
     <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
-        <param name="File"   value="\${log-dir}/log4j.log" />
+        <param name="File"   value="${org.apache.cocoon.work.directory}/cocoon-logs/log4j.log"
/>
         <param name="Append" value="false" />	    	
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml?view=diff&rev=492612&r1=492611&r2=492612
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml
(original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/applicationContext.xml
Thu Jan  4 07:38:12 2007
@@ -29,13 +29,14 @@
   <!-- Activate Cocoon Spring Configurator -->
   <configurator:settings/>
 
+  <!-- Configure Log4j -->
   <bean name="org.apache.cocoon.spring.configurator.log4j"
         class="org.apache.cocoon.spring.configurator.log4j.Log4JConfigurator"
         scope="singleton">
-    <property name="resource" value="/WEB-INF/cocoon/log4j.xconf"/>
+    <property name="resource" value="/WEB-INF/cocoon/log4j.xml"/>
   </bean>
 
-  <!-- Load Avalon configurations -->
+  <!-- Activate Avalon Bridge -->
   <avalon:bridge/>
 
 </beans>

Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml?view=diff&rev=492612&r1=492611&r2=492612
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml
(original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/log4j.xml
Thu Jan  4 07:38:12 2007
@@ -15,6 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
 
     <!-- This is a sample configuration for log4j.
@@ -23,7 +24,7 @@
          Note, that you can use properties for value substitution.
     -->
     <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
-        <param name="File"   value="\${log-dir}/log4j.log" />
+        <param name="File"   value="${org.apache.cocoon.work.directory}/cocoon-logs/log4j.log"
/>
         <param name="Append" value="false" />       
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>



Mime
View raw message