You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/05/01 13:30:06 UTC
svn commit: r939978 [4/5] - in /myfaces/tobago/trunk: ./ core/
core/src/main/java-jsf-1.1-todo/org/apache/myfaces/tobago/taglib/component/
core/src/main/java-jsf-1.2-todo/org/apache/myfaces/tobago/taglib/component/
core/src/main/java/org/apache/myfaces...
Modified: myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/component/AbstractUIEquationGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/component/AbstractUIEquationGridLayout.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/component/AbstractUIEquationGridLayout.java (original)
+++ myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/component/AbstractUIEquationGridLayout.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.compon
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.internal.layout.Cell;
import org.apache.myfaces.tobago.internal.layout.Grid;
@@ -42,7 +42,7 @@ import java.util.List;
public abstract class AbstractUIEquationGridLayout extends UILayout
implements EquationLayoutManager, Configurable {
- private static final Log LOG = LogFactory.getLog(AbstractUIEquationGridLayout.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUIEquationGridLayout.class);
private Grid grid;
@@ -318,4 +318,4 @@ public abstract class AbstractUIEquation
? "(" + Arrays.toString(grid.getWidths()) + ", " + Arrays.toString(grid.getHeights()) + ")"
: "");
}
-}
\ No newline at end of file
+}
Modified: myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/ReferenceToVariable.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/ReferenceToVariable.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/ReferenceToVariable.java (original)
+++ myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/ReferenceToVariable.java Sat May 1 11:30:00 2010
@@ -17,15 +17,15 @@ package org.apache.myfaces.tobago.layout
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
public class ReferenceToVariable {
- private static final Log LOG = LogFactory.getLog(ReferenceToVariable.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReferenceToVariable.class);
private int indexOfVariable;
Modified: myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SubsetOfReferencesToVariables.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SubsetOfReferencesToVariables.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SubsetOfReferencesToVariables.java (original)
+++ myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SubsetOfReferencesToVariables.java Sat May 1 11:30:00 2010
@@ -17,15 +17,15 @@ package org.apache.myfaces.tobago.layout
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
public class SubsetOfReferencesToVariables {
- private static final Log LOG = LogFactory.getLog(SubsetOfReferencesToVariables.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SubsetOfReferencesToVariables.class);
private final List<ReferenceToVariable> variables;
Modified: myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java (original)
+++ myfaces/tobago/trunk/extension/math/src/main/java/org/apache/myfaces/tobago/layout/math/SystemOfEquations.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.layout
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.layout.MathUtils;
import org.apache.myfaces.tobago.layout.Measure;
@@ -84,7 +84,7 @@ import java.util.List;
public class SystemOfEquations {
- private static final Log LOG = LogFactory.getLog(SystemOfEquations.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SystemOfEquations.class);
private int numberOfVariables;
private List<Equation> equations = new ArrayList<Equation>();
Modified: myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java (original)
+++ myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.compon
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.EquationLayoutContext;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.layout.MockComponent;
@@ -30,7 +30,7 @@ import java.util.Arrays;
public class GridLayoutManagerUnitTest {
- private static final Log LOG = LogFactory.getLog(GridLayoutManagerUnitTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GridLayoutManagerUnitTest.class);
/**
* <pre>
Modified: myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java (original)
+++ myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.layout
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
@@ -32,7 +32,7 @@ import java.util.Arrays;
*/
public class EquationManagerUnitTest {
- private static final Log LOG = LogFactory.getLog(EquationManagerUnitTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EquationManagerUnitTest.class);
/**
Horizontal model: (this example only contains information for horizontal layouting)<br/>
Modified: myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java (original)
+++ myfaces/tobago/trunk/extension/math/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.layout
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.layout.LayoutTokens;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.layout.RelativeLayoutToken;
@@ -30,7 +30,7 @@ import java.util.Arrays;
public class SystemOfEquationsUnitTest {
- private static final Log LOG = LogFactory.getLog(SystemOfEquationsUnitTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SystemOfEquationsUnitTest.class);
@Test
public void test2To3() {
Modified: myfaces/tobago/trunk/extension/message-fix/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/message-fix/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/message-fix/pom.xml (original)
+++ myfaces/tobago/trunk/extension/message-fix/pom.xml Sat May 1 11:30:00 2010
@@ -37,8 +37,8 @@
<artifactId>el-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
Modified: myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java (original)
+++ myfaces/tobago/trunk/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.extens
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContextFactory;
import javax.faces.context.FacesContext;
@@ -30,7 +30,7 @@ import javax.faces.FacesException;
* Time: 7:41:04 PM
*/
public class MessageFixFacesContextFactoryImpl extends FacesContextFactory {
- private static final Log LOG = LogFactory.getLog(MessageFixFacesContextFactoryImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MessageFixFacesContextFactoryImpl.class);
private FacesContextFactory facesContextFactory;
public MessageFixFacesContextFactoryImpl(FacesContextFactory facesContextFactory) {
Modified: myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationFactoryImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationFactoryImpl.java (original)
+++ myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationFactoryImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.securi
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.application.ApplicationFactory;
import javax.faces.application.Application;
@@ -28,7 +28,7 @@ import javax.faces.application.Applicati
* Time: 15:42:14
*/
public class ApplicationFactoryImpl extends ApplicationFactory {
- private static final Log LOG = LogFactory.getLog(ApplicationFactoryImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ApplicationFactoryImpl.class);
private ApplicationFactory applicationFactory = null;
Modified: myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationImpl.java (original)
+++ myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/ApplicationImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.securi
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.application.Application;
import javax.faces.application.NavigationHandler;
@@ -40,7 +40,7 @@ import java.util.Iterator;
import java.util.Collection;
public class ApplicationImpl extends Application {
- private static final Log LOG = LogFactory.getLog(ApplicationImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ApplicationImpl.class);
private Application application;
Modified: myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodBinding.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodBinding.java (original)
+++ myfaces/tobago/trunk/extension/security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodBinding.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.securi
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.el.MethodBinding;
import javax.faces.el.MethodNotFoundException;
@@ -42,7 +42,7 @@ import java.lang.annotation.Annotation;
* Time: 16:11:43
*/
public class CheckAuthorisationMethodBinding extends MethodBinding implements StateHolder {
- private static final Log LOG = LogFactory.getLog(CheckAuthorisationMethodBinding.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CheckAuthorisationMethodBinding.class);
private static final Map<String, Annotation> AUTHORISATION_CACHE = new HashMap<String, Annotation>();
private MethodBinding methodBinding;
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/pom.xml Sat May 1 11:30:00 2010
@@ -150,10 +150,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool-annotation</artifactId>
<version>${project.version}</version>
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.taglib
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.component.Facets;
@@ -40,7 +40,7 @@ import javax.servlet.jsp.tagext.BodyTagS
public class LabelExtensionTag extends BodyTagSupport
implements HasValue, HasLabelWidth, HasTip {
- private static final Log LOG = LogFactory.getLog(LabelExtensionTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LabelExtensionTag.class);
public static final String DEFAULT_COLUMNS = "fixed;*";
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.taglib
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
@@ -169,7 +169,7 @@ public class InExtensionTag extends Toba
return super.doEndTag();
}
- private static final Log LOG = LogFactory.getLog(InExtensionTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InExtensionTag.class);
@Override
public void release() {
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.taglib
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
@@ -37,7 +37,7 @@ import javax.servlet.jsp.JspException;
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.LabelTag")
public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
- private static final Log LOG = LogFactory.getLog(LabelExtensionTag.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LabelExtensionTag.class);
public static final String DEFAULT_COLUMNS = "fixed;*";
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Sat May 1 11:30:00 2010
@@ -192,6 +192,7 @@
</link>
<link>http://jakarta.apache.org/commons/io/api-${common-io.version}/</link>
<link>http://jakarta.apache.org/commons/logging/commons-logging-${commons-logging.version}/apidocs/</link>
+ <link>http://www.slf4j.org/apidocs</link>
<link>http://junit.sourceforge.net/javadoc/</link>
<link>http://logging.apache.org/log4j/docs/api/</link>
</links>
@@ -380,6 +381,31 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <!--dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
@@ -1687,6 +1713,9 @@
<mojarra20.version>2.0.3-SNAPSHOT</mojarra20.version>
<facelets.version>1.1.14</facelets.version>
<jetty.version>6.1.22</jetty.version>
+ <slf4j.version>1.5.11</slf4j.version>
+ <!--slf4j.version>1.6.0-alpha2</slf4j.version-->
+ <logback.version>0.9.20</logback.version>
<commons-io.version>1.1</commons-io.version>
<commons-lang.version>2.4</commons-lang.version>
<commons-logging.version>1.1.1</commons-logging.version>
Modified: myfaces/tobago/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/sandbox/pom.xml Sat May 1 11:30:00 2010
@@ -338,6 +338,11 @@
<groupId>maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.applic
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.application.ViewHandlerImpl;
import org.apache.myfaces.tobago.internal.webapp.TobagoResponse;
import org.apache.myfaces.tobago.util.DebugUtils;
@@ -41,7 +41,7 @@ import java.io.IOException;
*/
public class FoViewHandlerImpl extends ViewHandlerImpl {
- private static final Log LOG = LogFactory.getLog(FoViewHandlerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FoViewHandlerImpl.class);
public FoViewHandlerImpl(ViewHandler base) {
super(base);
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FopConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FopConverter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FopConverter.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FopConverter.java Sat May 1 11:30:00 2010
@@ -17,11 +17,10 @@ package org.apache.myfaces.tobago.applic
* limitations under the License.
*/
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.fop.apps.Driver;
-import org.apache.myfaces.tobago.util.CommonsLoggingLogger;
+import org.apache.myfaces.tobago.util.Slf4jLogger;
import org.xml.sax.InputSource;
import javax.faces.FacesException;
@@ -31,16 +30,15 @@ import java.io.StringReader;
public class FopConverter {
- private static final Log LOG = LogFactory.getLog(FopConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FopConverter.class);
public static void fo2Pdf(ServletResponse servletResponse, String buffer) {
if (LOG.isDebugEnabled()) {
- LOG.debug("buffer = '" + buffer + "'");
+ LOG.debug("buffer = '{}'", buffer);
}
try {
Driver driver = new Driver();
- Logger logger = new CommonsLoggingLogger(LOG);
- driver.setLogger(logger);
+ driver.setLogger(new Slf4jLogger(LOG));
driver.setRenderer(Driver.RENDER_PDF);
driver.setErrorDump(true);
// driver.setInputSource(new InputSource(new FileInputStream("C:/simple.fo")));
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
/*
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.renderk
*/
public class FoRendererBase extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(FoRendererBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FoRendererBase.class);
}
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java Sat May 1 11:30:00 2010
@@ -17,12 +17,12 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GridLayoutRenderer extends FoRendererBase {
- private static final Log LOG = LogFactory.getLog(GridLayoutRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GridLayoutRenderer.class);
public boolean getRendersChildren() {
return false;
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
@@ -35,7 +35,7 @@ import java.io.IOException;
*/
public class InRenderer extends InputRendererBase {
- private static final Log LOG = LogFactory.getLog(InRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InRenderer.class);
public void encodeEnd(FacesContext facesContext,
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
/*
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.renderk
* $Id:MessagesRenderer.java 472227 2006-11-07 21:05:00 +0100 (Tue, 07 Nov 2006) bommel $
*/
public class MessagesRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(MessagesRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MessagesRenderer.class);
// todo
}
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
@@ -34,7 +34,7 @@ import java.io.IOException;
*/
public class PageRenderer extends PageRendererBase {
- private static final Log LOG = LogFactory.getLog(PageRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PageRenderer.class);
private static final String HEADER = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
private static final String FO_ROOT = "fo:root";
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
@@ -31,7 +31,7 @@ import java.io.IOException;
* $Id:TextAreaRenderer.java 472227 2006-11-07 21:05:00 +0100 (Tue, 07 Nov 2006) bommel $
*/
public class TextAreaRenderer extends InputRendererBase {
- private static final Log LOG = LogFactory.getLog(TextAreaRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TextAreaRenderer.class);
public boolean getRendersChildren() {
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java Sat May 1 11:30:00 2010
@@ -24,8 +24,8 @@ package org.apache.myfaces.tobago.render
import org.apache.commons.collections.KeyValue;
import org.apache.commons.collections.keyvalue.DefaultKeyValue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
@@ -42,7 +42,7 @@ import java.io.IOException;
public class ButtonRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(ButtonRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ButtonRenderer.class);
public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException {
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/Slf4jLogger.java (from r939938, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/Slf4jLogger.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/Slf4jLogger.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java&r1=939938&r2=939978&rev=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/Slf4jLogger.java Sat May 1 11:30:00 2010
@@ -18,13 +18,12 @@ package org.apache.myfaces.tobago.util;
*/
import org.apache.avalon.framework.logger.Logger;
-import org.apache.commons.logging.Log;
-public class CommonsLoggingLogger implements Logger {
+public class Slf4jLogger implements Logger {
- private Log log;
+ private org.slf4j.Logger log;
- public CommonsLoggingLogger(Log log) {
+ public Slf4jLogger(org.slf4j.Logger log) {
this.log = log;
}
@@ -77,15 +76,15 @@ public class CommonsLoggingLogger implem
}
public void fatalError(String reference) {
- log.fatal(reference);
+ log.error(reference);
}
public void fatalError(String reference, Throwable throwable) {
- log.fatal(reference, throwable);
+ log.error(reference, throwable);
}
public boolean isFatalErrorEnabled() {
- return log.isFatalEnabled();
+ return log.isErrorEnabled();
}
public Logger getChildLogger(String reference) {
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/Slf4jLogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/util/Slf4jLogger.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/theme/scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/theme/scarborough/pom.xml Sat May 1 11:30:00 2010
@@ -90,6 +90,11 @@
<!--version>1.1.0-SNAPSHOT</version-->
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UIButton;
import org.apache.myfaces.tobago.config.Configurable;
@@ -46,7 +46,7 @@ import java.io.IOException;
public class ButtonRenderer extends CommandRendererBase {
- private static final Log LOG = LogFactory.getLog(ButtonRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ButtonRenderer.class);
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.render
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UICalendar;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
@@ -45,7 +45,7 @@ import java.util.Locale;
public class CalendarRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(CalendarRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CalendarRenderer.class);
private static final String[] SCRIPTS = {
"script/calendar.js",
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
@@ -52,7 +52,7 @@ import java.util.TimeZone;
public class DatePickerRenderer extends LinkRenderer {
- private static final Log LOG = LogFactory.getLog(DatePickerRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DatePickerRenderer.class);
@Override
public void onComponentCreated(FacesContext facesContext, UIComponent component, UIComponent parent) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.internal.util.DateFormatUtils;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -35,7 +35,7 @@ import java.util.Arrays;
public class DateRenderer extends InRenderer {
- private static final Log LOG = LogFactory.getLog(DateRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DateRenderer.class);
private static final String[] SCRIPTS = {
"script/dateConverter.js",
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java Sat May 1 11:30:00 2010
@@ -23,8 +23,8 @@ package org.apache.myfaces.tobago.render
*/
import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UIFileInput;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
@@ -46,7 +46,7 @@ import java.io.IOException;
public class FileRenderer extends InputRendererBase {
- private static final Log LOG = LogFactory.getLog(FileRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileRenderer.class);
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.layout.Measure;
@@ -32,7 +32,7 @@ import java.io.IOException;
public class GridLayoutRenderer extends RendererBase implements SpacingValues {
- private static final Log LOG = LogFactory.getLog(GridLayoutRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GridLayoutRenderer.class);
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIImage;
@@ -43,7 +43,7 @@ import java.util.Locale;
public class ImageRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(ImageRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ImageRenderer.class);
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UIInput;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
@@ -50,7 +50,7 @@ import java.util.List;
public class InRenderer extends InputRendererBase {
- private static final Log LOG = LogFactory.getLog(InRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InRenderer.class);
private static final String[] SCRIPTS = new String[] {"script/inputSuggest.js"};
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UILabel;
import org.apache.myfaces.tobago.internal.util.AccessKeyMap;
@@ -40,7 +40,7 @@ import java.util.Locale;
public class LabelRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(LabelRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LabelRenderer.class);
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UILink;
@@ -47,7 +47,7 @@ import java.io.IOException;
public class LinkRenderer extends CommandRendererBase {
- private static final Log LOG = LogFactory.getLog(LinkRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LinkRenderer.class);
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.RendererTypes;
@@ -52,7 +52,7 @@ import java.util.List;
*/
public class MenuCommandRenderer extends CommandRendererBase {
- private static final Log LOG = LogFactory.getLog(MenuCommandRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MenuCommandRenderer.class);
private static final String MENU_ACCELERATOR_KEYS = "menuAcceleratorKeys";
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIMenu;
import org.apache.myfaces.tobago.internal.context.ResponseWriterDivider;
@@ -39,7 +39,7 @@ import java.util.List;
public class MenuRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(MenuRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MenuRenderer.class);
private static final String MENU_ACCELERATOR_KEYS = "menuAcceleratorKeys";
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuSeparatorRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
@@ -30,7 +30,7 @@ import java.io.IOException;
public class MenuSeparatorRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(MenuSeparatorRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MenuSeparatorRenderer.class);
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
import org.apache.myfaces.tobago.component.Facets;
@@ -55,7 +55,7 @@ import java.util.Map;
public class MessagesRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(MessagesRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MessagesRenderer.class);
public static final String CLOSE_POPUP = "closePopup";
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.render
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UIForm;
@@ -69,7 +69,7 @@ import java.util.StringTokenizer;
public class PageRenderer extends PageRendererBase {
- private static final Log LOG = LogFactory.getLog(PageRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PageRenderer.class);
private static final String CLIENT_DEBUG_SEVERITY = "clientDebugSeverity";
private static final String LAST_FOCUS_ID = "lastFocusId";
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.component.UIReload;
@@ -40,7 +40,7 @@ import java.io.IOException;
public class PanelRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(PanelRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PanelRenderer.class);
@Override
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.UIPopup;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
@@ -38,7 +38,7 @@ import java.text.DecimalFormat;
public class PopupRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(PopupRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PopupRenderer.class);
@Override
public boolean getRendersChildren() {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIProgress;
@@ -43,7 +43,7 @@ import java.io.IOException;
public class ProgressRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(ProgressRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ProgressRenderer.class);
public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
import org.apache.myfaces.tobago.component.Facets;
@@ -48,7 +48,7 @@ import java.io.IOException;
/** TODO: under construction */
public class RichTextEditorRenderer extends InputRendererBase {
- private static final Log LOG = LogFactory.getLog(RichTextEditorRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RichTextEditorRenderer.class);
public static final String CHANGE_BUTTON = "togleState";
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UISelectBooleanCheckbox;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
@@ -37,7 +37,7 @@ import java.io.IOException;
public class SelectBooleanCheckboxRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectBooleanCheckboxRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectBooleanCheckboxRenderer.class);
public void decode(FacesContext facesContext, UIComponent component) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.UISelectManyCheckbox;
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.layout.Measure;
@@ -42,7 +42,7 @@ import java.util.List;
public class SelectManyCheckboxRenderer extends SelectManyRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectManyCheckboxRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectManyCheckboxRenderer.class);
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
if (!(component instanceof UISelectManyCheckbox)) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.UISelectManyListbox;
import org.apache.myfaces.tobago.renderkit.SelectManyRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Style;
@@ -36,7 +36,7 @@ import java.util.List;
public class SelectManyListboxRenderer extends SelectManyRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectManyListboxRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectManyListboxRenderer.class);
public boolean getRendersChildren() {
return true;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.UISelectOneChoice;
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
import org.apache.myfaces.tobago.renderkit.SelectOneRendererBase;
@@ -38,7 +38,7 @@ import java.util.List;
public class SelectOneChoiceRenderer extends SelectOneRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectOneChoiceRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectOneChoiceRenderer.class);
public boolean getRendersChildren() {
return true;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UISelectOneListbox;
import org.apache.myfaces.tobago.renderkit.SelectOneRendererBase;
@@ -38,7 +38,7 @@ import java.util.List;
public class SelectOneListboxRenderer extends SelectOneRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectOneListboxRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectOneListboxRenderer.class);
public boolean getRendersChildren() {
return true;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.UISelectOneRadio;
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
@@ -43,7 +43,7 @@ import java.util.List;
public class SelectOneRadioRenderer extends SelectOneRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectOneRadioRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectOneRadioRenderer.class);
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
@@ -34,7 +34,7 @@ import java.io.IOException;
public class SelectReferenceRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(SelectReferenceRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectReferenceRenderer.class);
public void encodeEnd(FacesContext facesContext,
UIComponent component)
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetPageCommandRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.event.PageAction;
import org.apache.myfaces.tobago.event.PageActionEvent;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -29,7 +29,7 @@ import java.util.Map;
public class SheetPageCommandRenderer extends LinkRenderer {
- private static final Log LOG = LogFactory.getLog(SheetPageCommandRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SheetPageCommandRenderer.class);
@Override
public void decode(FacesContext facesContext, UIComponent component) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.CreateComponentUtils;
import org.apache.myfaces.tobago.component.Facets;
@@ -72,7 +72,7 @@ import java.util.Map;
public class SheetRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(SheetRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SheetRenderer.class);
private static final String[] SCRIPTS = new String[]{"script/tobago-sheet.js"};
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.render
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import javax.faces.component.UIComponent;
@@ -32,7 +32,7 @@ import java.io.IOException;
public class SubviewRenderer extends LayoutComponentRendererBase {
- private static final Log LOG = LogFactory.getLog(SubviewRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SubviewRenderer.class);
public void encodeBegin(FacesContext facesContext, UIComponent component)
throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupLayoutRenderer.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupLayoutRenderer.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
@@ -28,7 +28,7 @@ import java.io.IOException;
public class TabGroupLayoutRenderer extends RendererBase {
- private static final Log LOG = LogFactory.getLog(TabGroupLayoutRenderer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TabGroupLayoutRenderer.class);
@Override
public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {