Author: vkumar
Date: Mon May  4 07:08:16 2009
New Revision: 771214

URL: http://svn.apache.org/viewvc?rev=771214&view=rev
Log:
Migrating to slf4j in apa-webcontent
See: http://issues.apache.org/jira/browse/JS2-97

Modified:
    portals/applications/webcontent/trunk/webcontent-jar/pom.xml
    
portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java
    
portals/applications/webcontent/trunk/webcontent-jar/src/test/java/org/apache/portals/applications/webcontent/rewriter/TestNekoRewriter.java
    portals/applications/webcontent/trunk/webcontent-war/pom.xml
    
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity.properties
    
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml

Modified: portals/applications/webcontent/trunk/webcontent-jar/pom.xml
URL: 
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/pom.xml?rev=771214&r1=771213&r2=771214&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-jar/pom.xml Mon May  4 
07:08:16 2009
@@ -1,117 +1,143 @@
 <?xml version="1.0" encoding="UTF-8"?>
-       <!--
-               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. $Id$
-       -->
+  <!--
+    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. $Id: pom.xml 
765879
+    2009-04-17 07:36:52Z woonsan $
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
-       <modelVersion>4.0.0</modelVersion>
-       <prerequisites>
-               <maven>2.0.4</maven>
-       </prerequisites>
-
-       <!-- POM Identification -->
-       <parent>
-               <groupId>org.apache.portals.applications</groupId>
-               <artifactId>apa-webcontent</artifactId>
-               <version>1.0-SNAPSHOT</version>
-       </parent>
-
-       <artifactId>apa-webcontent-jar</artifactId>
-       <packaging>jar</packaging>
-       <name>Portals Web Content Application JAR</name>
-
-    <properties>
-        <portlet-api.version>2.0</portlet-api.version>
-        <javax.servlet.version>2.4</javax.servlet.version>
-        
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
-        
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
-        <xalan.version>2.4.1</xalan.version>
-        <xerces.version>2.3.0</xerces.version>
-        <xml-apis.version>2.0.2</xml-apis.version>
-        <commons-logging.version>1.1</commons-logging.version>
-        <junit.version>3.8.1</junit.version>
-        <nekohtml.version>0.9.5</nekohtml.version>
-        <castor.version>1.1.1-xml</castor.version>
-        <commons-httpclient.version>3.0.1</commons-httpclient.version>
-    </properties>
-    
-       <!-- Dependencies -->
-
-       <dependencies>
-               
-
-               <!-- Build Dependencies -->
-               <dependency>
-                       <groupId>javax.portlet</groupId>
-                       <artifactId>portlet-api</artifactId>
-                       <version>${portlet-api.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
-                       <version>${javax.servlet.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>portals-bridges-common</artifactId>
-            <version>${org.apache.portals.bridges.common.version}</version>
-            <scope>provided</scope>
-        </dependency>
-               <dependency>
-                       <groupId>org.apache.portals.bridges</groupId>
-                       <artifactId>portals-bridges-velocity</artifactId>
-                       
<version>${org.apache.portals.bridges.velocity.version}</version>
-               </dependency>
-        <!-- Build Dependencies -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-                       <version>${commons-logging.version}</version>           
 
-        </dependency>
-        <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-               <version>${castor.version}</version>            
-        </dependency>
-        <dependency>
-            <groupId>nekohtml</groupId>
-            <artifactId>nekohtml</artifactId>
-               <version>${nekohtml.version}</version>            
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>${commons-httpclient.version}</version>
-        </dependency>
-
-      <dependency> 
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>junit-addons</groupId>
-            <artifactId>junit-addons-runner</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.4</maven>
+  </prerequisites>
+
+  <!-- POM Identification -->
+  <parent>
+    <groupId>org.apache.portals.applications</groupId>
+    <artifactId>apa-webcontent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>apa-webcontent-jar</artifactId>
+  <packaging>jar</packaging>
+  <name>Portals Web Content Application JAR</name>
+
+  <properties>
+    <portlet-api.version>2.0</portlet-api.version>
+    <javax.servlet.version>2.4</javax.servlet.version>
+    
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
+    
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
+    <xalan.version>2.4.1</xalan.version>
+    <xerces.version>2.3.0</xerces.version>
+    <xml-apis.version>2.0.2</xml-apis.version>
+    <slf4j.version>1.5.6</slf4j.version>
+    <junit.version>3.8.1</junit.version>
+    <nekohtml.version>0.9.5</nekohtml.version>
+    <castor.version>1.1.1-xml</castor.version>
+    <commons-httpclient.version>3.0.1</commons-httpclient.version>
+  </properties>
+
+  <!-- Dependencies -->
+
+  <dependencies>
+
+    <!-- Build Dependencies -->
+    <dependency>
+      <groupId>javax.portlet</groupId>
+      <artifactId>portlet-api</artifactId>
+      <version>${portlet-api.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${javax.servlet.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.bridges</groupId>
+      <artifactId>portals-bridges-common</artifactId>
+      <version>${org.apache.portals.bridges.common.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.bridges</groupId>
+      <artifactId>portals-bridges-velocity</artifactId>
+      <version>${org.apache.portals.bridges.velocity.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!-- Build Dependencies -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>castor</groupId>
+      <artifactId>castor</artifactId>
+      <version>${castor.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+      <version>${nekohtml.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>${commons-httpclient.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit-addons</groupId>
+          <artifactId>junit-addons-runner</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
 
-       </dependencies>
+  </dependencies>
 
 </project>

Modified: 
portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java
URL: 
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java?rev=771214&r1=771213&r2=771214&view=diff
==============================================================================
--- 
portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java
 (original)
+++ 
portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java
 Mon May  4 07:08:16 2009
@@ -56,8 +56,6 @@
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.MultipartPostMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import 
org.apache.portals.applications.webcontent.rewriter.MappingRewriterController;
 import org.apache.portals.applications.webcontent.rewriter.RewriterController;
 import org.apache.portals.applications.webcontent.rewriter.RewriterException;
@@ -68,6 +66,8 @@
 import 
org.apache.portals.applications.webcontent.rewriter.xml.SaxParserAdaptor;
 import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
 import org.apache.portals.messaging.PortletMessaging;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * WebContentPortlet * WebContentPortlet Allows navigation inside the portlet
@@ -98,7 +98,7 @@
     public static final String HTTP_STATE = "webcontent.http.state";
     
     // Class Data    
-    protected final static Log log = 
LogFactory.getLog(WebContentPortlet.class);
+    protected final static Logger log = 
LoggerFactory.getLogger(WebContentPortlet.class);
     public final static String defaultEncoding = "UTF-8";
 
     // Data Members    

Modified: 
portals/applications/webcontent/trunk/webcontent-jar/src/test/java/org/apache/portals/applications/webcontent/rewriter/TestNekoRewriter.java
URL: 
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/src/test/java/org/apache/portals/applications/webcontent/rewriter/TestNekoRewriter.java?rev=771214&r1=771213&r2=771214&view=diff
==============================================================================
--- 
portals/applications/webcontent/trunk/webcontent-jar/src/test/java/org/apache/portals/applications/webcontent/rewriter/TestNekoRewriter.java
 (original)
+++ 
portals/applications/webcontent/trunk/webcontent-jar/src/test/java/org/apache/portals/applications/webcontent/rewriter/TestNekoRewriter.java
 Mon May  4 07:08:16 2009
@@ -22,14 +22,13 @@
 import java.io.IOException;
 import java.util.Arrays;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import 
org.apache.portals.applications.webcontent.rewriter.html.neko.NekoParserAdaptor;
 import org.apache.portals.applications.webcontent.rewriter.rules.Ruleset;
 import 
org.apache.portals.applications.webcontent.rewriter.xml.SaxParserAdaptor;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.framework.TestCase;
-
 
 /**
  * TestNekoRewriter

Modified: portals/applications/webcontent/trunk/webcontent-war/pom.xml
URL: 
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/pom.xml?rev=771214&r1=771213&r2=771214&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-war/pom.xml (original)
+++ portals/applications/webcontent/trunk/webcontent-war/pom.xml Mon May  4 
07:08:16 2009
@@ -1,117 +1,104 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        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. $Id$
-    -->
+  <!--
+    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. $Id: pom.xml 
765879
+    2009-04-17 07:36:52Z woonsan $
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
-
-    <!-- POM Identification -->
-    <artifactId>apa-webcontent-war</artifactId>
-    <parent>
-        <groupId>org.apache.portals.applications</groupId>
-        <artifactId>apa-webcontent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <packaging>war</packaging>
-    <name>Portals Web Content Application WAR</name>
-
-    <!-- Dependencies -->
-    <properties>
-        <portlet-api.version>2.0</portlet-api.version>
-        <javax.servlet.version>2.4</javax.servlet.version>
-        
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
-        
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
-        
<portals.applications.apa-webapp-logging.version>1.0-SNAPSHOT</portals.applications.apa-webapp-logging.version>
        
-        <xalan.version>2.4.1</xalan.version>
-        <xerces.version>2.3.0</xerces.version>
-        <xml-apis.version>2.0.2</xml-apis.version>
-        <commons-logging.version>1.1</commons-logging.version>
-        <junit.version>3.8.1</junit.version>
-        <nekohtml.version>0.9.5</nekohtml.version>
-        <castor.version>1.1.1-xml</castor.version>
-        <commons-httpclient.version>3.0.1</commons-httpclient.version>
-        <velocity-tools.version>1.3</velocity-tools.version>
-        <commons-digester.version>1.8</commons-digester.version>
-        <commons-lang.version>2.1</commons-lang.version>
-        <commons-collections.version>3.2</commons-collections.version>
-        <log4j.version>1.2.14</log4j.version>
-        <oro.version>2.0.8</oro.version>
-    </properties>
-
-    <dependencies>
-
-        <!-- Runtime Dependencies -->
-
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>portals-bridges-common</artifactId>
-            <version>${org.apache.portals.bridges.common.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>apa-webcontent-jar</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.portals.applications</groupId>
-            <artifactId>apa-webapp-logging</artifactId>
-            
<version>${portals.applications.apa-webapp-logging.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xml-apis.version}</version>
-        </dependency>                
-        <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>${commons-digester.version}</version>
-            <scope>runtime</scope>
-        </dependency>           
-   <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>[1.1,)</version>
-        <exclusions>
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.4</maven>
+  </prerequisites>
+
+  <!-- POM Identification -->
+  <artifactId>apa-webcontent-war</artifactId>
+  <parent>
+    <groupId>org.apache.portals.applications</groupId>
+    <artifactId>apa-webcontent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <packaging>war</packaging>
+  <name>Portals Web Content Application WAR</name>
+
+  <!-- Dependencies -->
+  <properties>
+    <portlet-api.version>2.0</portlet-api.version>
+    <javax.servlet.version>2.4</javax.servlet.version>
+    
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
+    
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
+    
<portals.applications.apa-webapp-logging.version>1.0-SNAPSHOT</portals.applications.apa-webapp-logging.version>
+    <xalan.version>2.4.1</xalan.version>
+    <xerces.version>2.3.0</xerces.version>
+    <xml-apis.version>2.0.2</xml-apis.version>
+    <junit.version>3.8.1</junit.version>
+    <nekohtml.version>0.9.5</nekohtml.version>
+    <castor.version>1.1.1-xml</castor.version>
+    <commons-httpclient.version>3.0.1</commons-httpclient.version>
+    <velocity-tools.version>1.3</velocity-tools.version>
+    <commons-digester.version>1.8</commons-digester.version>
+    <commons-lang.version>2.1</commons-lang.version>
+    <commons-collections.version>3.2</commons-collections.version>
+    <log4j.version>1.2.14</log4j.version>
+    <oro.version>2.0.8</oro.version>
+  </properties>
+
+  <dependencies>
+
+    <!-- Runtime Dependencies -->
+
+    <dependency>
+      <groupId>org.apache.portals.bridges</groupId>
+      <artifactId>portals-bridges-common</artifactId>
+      <version>${org.apache.portals.bridges.common.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>apa-webcontent-jar</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>${xml-apis.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>${commons-digester.version}</version>
+      <scope>runtime</scope>
+          <exclusions>
           <exclusion>
-            <groupId>logkit</groupId>
-            <artifactId>logkit</artifactId>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>avalon-framework</groupId>
-            <artifactId>avalon-framework</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>     
+       </exclusions>
+    </dependency>
 
-    </dependencies>
+  </dependencies>
 
 </project>

Modified: 
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity.properties
URL: 
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity.properties?rev=771214&r1=771213&r2=771214&view=diff
==============================================================================
--- 
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity.properties
 (original)
+++ 
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/velocity/velocity.properties
 Mon May  4 07:08:16 2009
@@ -28,10 +28,10 @@
 
 runtime.log = velocity.log
 
-# use Commons Logging for routing Velocity message through our 
IsolatedLog4JLogger
-runtime.log.logsystem.class 
=org.apache.portals.applications.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+# use Log4J for routing Velocity messages
+runtime.log.logsystem.class =org.apache.velocity.runtime.log.Log4JLogChute
 # Log4J Category used (default is "velocity")
-runtime.log.logsystem.log4j.category = velocity
+runtime.log.logsystem.log4j.logger = velocity
 
 #----------------------------------------------------------------------------
 # T E M P L A T E  E N C O D I N G

Modified: 
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml?rev=771214&r1=771213&r2=771214&view=diff
==============================================================================
--- 
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml
 (original)
+++ 
portals/applications/webcontent/trunk/webcontent-war/src/main/webapp/WEB-INF/web.xml
 Mon May  4 07:08:16 2009
@@ -20,10 +20,6 @@
 <web-app>
   <display-name>Webcontent Portlet Application</display-name>
   <description>Apache Portals Applications: Webcontent PA</description>
-
-  <listener>
-    
<listener-class>org.apache.portals.applications.webapp.logging.Log4JConfigurator</listener-class>
-  </listener>
   
   <servlet>
     <servlet-name>JetspeedContainer</servlet-name>


Reply via email to