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 [3/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/example/addressbook/lib/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/pom.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/pom.xml Sat May 1 11:30:00 2010
@@ -157,6 +157,14 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.3.1.4</version>
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.persistence.CascadeType;
import javax.persistence.Entity;
@@ -40,7 +40,7 @@ import java.util.Locale;
@Entity
public class Address implements Serializable {
private static final long serialVersionUID = 1833416321633117657L;
- private static final Log LOG = LogFactory.getLog(Address.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Address.class);
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -31,7 +31,7 @@ import java.sql.DriverManager;
*/
public class DerbyShutdownServletContextListener implements ServletContextListener {
- private static final Log LOG = LogFactory.getLog(DerbyShutdownServletContextListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DerbyShutdownServletContextListener.class);
public void contextInitialized(ServletContextEvent servletContextEvent) {
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDao.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.exampl
* $Id$
*/
-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.Collections;
@@ -32,7 +32,7 @@ import java.util.List;
public class InMemoryAddressDao implements AddressDao {
- private static final Log LOG = LogFactory.getLog(InMemoryAddressDao.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InMemoryAddressDao.class);
private List<Address> addresses;
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -34,7 +34,7 @@ import java.util.List;
@Service("addressDao")
public class JpaAddressDao implements AddressDao {
- private static final Log LOG = LogFactory.getLog(JpaAddressDao.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JpaAddressDao.class);
@PersistenceContext(unitName = "addressBook")
private EntityManager entityManager;
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java Sat May 1 11:30:00 2010
@@ -23,8 +23,8 @@ package org.apache.myfaces.tobago.exampl
*/
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.UIColumn;
import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.config.TobagoConfig;
@@ -60,7 +60,7 @@ import java.util.Locale;
@Scope("session")
public class Controller {
- private static final Log LOG = LogFactory.getLog(Controller.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Controller.class);
private static final String OUTCOME_LIST = "list";
private static final String OUTCOME_EDITOR = "editor";
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressConverter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressConverter.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressConverter.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.exampl
* $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.example.addressbook.EmailAddress;
import javax.faces.component.UIComponent;
@@ -33,7 +33,7 @@ import javax.faces.convert.ConverterExce
public class EmailAddressConverter implements Converter {
- private static final Log LOG = LogFactory.getLog(EmailAddressConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EmailAddressConverter.class);
public Object getAsObject(
FacesContext facesContext, UIComponent component, String reference) {
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java Sat May 1 11:30:00 2010
@@ -18,12 +18,11 @@ package org.apache.myfaces.tobago.exampl
*/
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.log4j.Appender;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.apache.myfaces.tobago.component.UIInput;
import org.apache.myfaces.tobago.example.addressbook.Log4jUtils;
import org.apache.myfaces.tobago.model.SelectItem;
@@ -52,7 +51,7 @@ import java.util.Set;
@Scope("session")
public class LoggingController {
- private static final Log LOG = LogFactory.getLog(LoggingController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LoggingController.class);
private List<AppenderModel> appenders = new ArrayList<AppenderModel>();
private List<CategoryModel> categories = new ArrayList<CategoryModel>();
@@ -84,15 +83,15 @@ public class LoggingController {
categories.clear();
Enumeration enumeration = LogManager.getCurrentLoggers();
while (enumeration.hasMoreElements()) {
- Logger logger = (Logger) enumeration.nextElement();
+ org.apache.log4j.Logger logger = (org.apache.log4j.Logger) enumeration.nextElement();
categories.add(new CategoryModel(logger));
}
categories.add(new CategoryModel(LogManager.getRootLogger()));
Collections.sort(categories, new Comparator<CategoryModel>() {
public int compare(CategoryModel c1, CategoryModel c2) {
- Logger l1 = c1.getLogger();
- Logger l2 = c2.getLogger();
+ org.apache.log4j.Logger l1 = c1.getLogger();
+ org.apache.log4j.Logger l2 = c2.getLogger();
return l1.getName().compareTo(l2.getName());
}
});
@@ -122,7 +121,7 @@ public class LoggingController {
boolean update = false;
for (CategoryModel category : categories) {
if (category.isLevelUpdated()) {
- Logger logger = getLogger(category.getName());
+ org.apache.log4j.Logger logger = getLogger(category.getName());
logger.setLevel(Level.toLevel(category.getLevel()));
update = true;
}
@@ -136,7 +135,7 @@ public class LoggingController {
public String addCategory() {
LOG.debug("debug");
LOG.trace("trace");
- Logger logger = getLogger(category);
+ org.apache.log4j.Logger logger = getLogger(category);
logger.setLevel(Level.toLevel(level));
initCategories();
return null;
@@ -148,7 +147,7 @@ public class LoggingController {
return null;
}
- private Logger getLogger(String category) {
+ private org.apache.log4j.Logger getLogger(String category) {
return ("root".equals(category))
? LogManager.getRootLogger()
: LogManager.getLogger(category);
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.exampl
*/
import org.apache.commons.io.IOUtils;
-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.example.addressbook.Address;
import org.apache.myfaces.tobago.example.addressbook.Picture;
import org.apache.myfaces.tobago.servlet.NonFacesRequestServlet;
@@ -32,7 +32,7 @@ import java.io.IOException;
public class PictureServlet extends NonFacesRequestServlet {
- private static final Log LOG = LogFactory.getLog(PictureServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PictureServlet.class);
public String invokeApplication(FacesContext facesContext) {
Controller controller = (Controller) VariableResolverUtils.resolveVariable(facesContext, "controller");
Modified: myfaces/tobago/trunk/example/addressbook/war/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/war/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/war/pom.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/war/pom.xml Sat May 1 11:30:00 2010
@@ -52,12 +52,6 @@
</configuration>
<dependencies>
<!--dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
<version>1.0.1</version>
Modified: myfaces/tobago/trunk/example/addressbook/war/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/war/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/war/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java (original)
+++ myfaces/tobago/trunk/example/addressbook/war/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.exampl
*/
import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
@@ -31,7 +31,7 @@ import java.io.IOException;
public class StartupPhaseListener implements PhaseListener {
- private static final Log LOG = LogFactory.getLog(StartupPhaseListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StartupPhaseListener.class);
public static final String LOGGED_IN = StartupPhaseListener.class.getName() + ".LOGGED_IN";
public static final String PRINCIPAL = StartupPhaseListener.class.getName() + ".PRINCIPAL";
Modified: myfaces/tobago/trunk/example/addressbook/war/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/war/src/main/resources/log4j.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/war/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/war/src/main/resources/log4j.xml Sat May 1 11:30:00 2010
@@ -36,7 +36,7 @@
<root>
<priority value="info" />
- <appender-ref ref="logfile" />
+ <appender-ref ref="console" />
</root>
</log4j:configuration>
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Sat May 1 11:30:00 2010
@@ -166,6 +166,10 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.ResourceManagerUtil;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
@@ -27,7 +27,7 @@ import javax.faces.context.FacesContext;
public class MultiplePageDeclarationLanguageNavigationHandler extends NavigationHandler {
- private static final Log LOG = LogFactory.getLog(MultiplePageDeclarationLanguageNavigationHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MultiplePageDeclarationLanguageNavigationHandler.class);
private NavigationHandler navigationHandler;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.ResourceManagerUtil;
import org.apache.myfaces.tobago.example.demo.jsp.JspFormatter;
import org.apache.myfaces.tobago.model.TreePath;
@@ -40,7 +40,7 @@ import java.util.Enumeration;
*/
public class Navigation {
- private static final Log LOG = LogFactory.getLog(Navigation.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Navigation.class);
private DefaultMutableTreeNode tree;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java Sat May 1 11:30:00 2010
@@ -17,13 +17,13 @@ package org.apache.myfaces.tobago.exampl
* 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.TreeExpansionEvent;
public class Node {
- private static final Log LOG = LogFactory.getLog(Node.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Node.class);
private String name;
private String markup;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.FacesContext;
import javax.servlet.ServletContext;
@@ -29,7 +29,7 @@ import java.util.Properties;
public class ServerInfo {
- private static final Log LOG = LogFactory.getLog(ServerInfo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServerInfo.class);
private String version;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.RendererTypes;
@@ -50,7 +50,7 @@ import java.util.List;
public class TobagoDemoController {
- private static final Log LOG = LogFactory.getLog(TobagoDemoController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoDemoController.class);
private String[] salutation;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.model.TreeState;
import javax.faces.event.ActionEvent;
@@ -28,7 +28,7 @@ import java.util.Date;
public class TreeController {
- private static final Log LOG = LogFactory.getLog(TreeController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TreeController.class);
private static final String STRONG = "strong";
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.TabChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeListener;
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.event.T
*/
public class SimpleTabChangeListener implements TabChangeListener {
- private static final Log LOG = LogFactory.getLog(SimpleTabChangeListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SimpleTabChangeListener.class);
public SimpleTabChangeListener() {
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.exampl
*/
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletResponse;
@@ -32,7 +32,7 @@ import java.util.List;
public class BestPracticeController {
- private static final Log LOG = LogFactory.getLog(BestPracticeController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BestPracticeController.class);
private List<Bird> birds = new ArrayList<Bird>(Arrays.asList(
new Bird("Amsel", 25),
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/Bird.java Sat May 1 11:30:00 2010
@@ -17,15 +17,15 @@ package org.apache.myfaces.tobago.exampl
* 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.util.VariableResolverUtils;
import javax.faces.context.FacesContext;
public class Bird {
- private static final Log LOG = LogFactory.getLog(Bird.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Bird.class);
private String name;
private int size;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java Sat May 1 11:30:00 2010
@@ -17,12 +17,12 @@ package org.apache.myfaces.tobago.exampl
* 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 TransitionController {
- private static final Log LOG = LogFactory.getLog(TransitionController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TransitionController.class);
public String sleep5s() throws InterruptedException {
int sleep = 5000;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.exampl
* $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.config.TobagoConfig;
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.context.Theme;
@@ -39,7 +39,7 @@ import java.util.Locale;
public class ClientConfigController {
- private static final Log LOG = LogFactory.getLog(ClientConfigController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClientConfigController.class);
private boolean debugMode;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java Sat May 1 11:30:00 2010
@@ -25,8 +25,8 @@ package org.apache.myfaces.tobago.exampl
import org.apache.commons.collections.KeyValue;
import org.apache.commons.collections.keyvalue.DefaultKeyValue;
import org.apache.commons.io.IOUtils;
-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.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.layout.LayoutBase;
@@ -48,7 +48,7 @@ import java.util.Set;
public class ThemeConfigViewController {
- private static final Log LOG = LogFactory.getLog(ThemeConfigViewController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThemeConfigViewController.class);
private static final String PROPERTY_FILE_PREFIX = "tobago/html/";
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.exampl
* $Id$
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.oro.text.perl.Perl5Util;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.MatchResult;
@@ -34,7 +34,7 @@ import org.apache.oro.text.regex.Perl5Ma
public abstract class AbstractConverter implements Converter {
- private static final Log LOG = LogFactory.getLog(AbstractConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractConverter.class);
private Pattern pattern;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java Sat May 1 11:30:00 2010
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.exampl
* $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.util.XmlUtils;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Pattern;
@@ -33,7 +33,7 @@ import java.util.Map;
public class JspTagConverter extends AbstractConverter {
- private static final Log LOG = LogFactory.getLog(JspTagConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JspTagConverter.class);
private TagConverter tagConverter = new TagConverter();
private Map<String, String> tags = new HashMap<String, String>();
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java Sat May 1 11:30:00 2010
@@ -23,8 +23,8 @@ package org.apache.myfaces.tobago.exampl
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.util.Enumeration;
@@ -34,7 +34,7 @@ import java.util.Vector;
public class StringExpression implements Serializable {
- private static final Log LOG = LogFactory.getLog(StringExpression.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StringExpression.class);
private static final long serialVersionUID = -152894508593519474L;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.UISheet;
import org.apache.myfaces.tobago.component.UIToolBar;
import org.apache.myfaces.tobago.context.ResourceManager;
@@ -43,7 +43,7 @@ import java.util.List;
public class OverviewController {
- private static final Log LOG = LogFactory.getLog(OverviewController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OverviewController.class);
private static final String[] TREE_SELECT_MODE_KEYS = {
"none",
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java Sat May 1 11:30:00 2010
@@ -17,15 +17,15 @@ package org.apache.myfaces.tobago.exampl
* 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.event.ValueChangeEvent;
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
public class Controller {
- private static final Log LOG = LogFactory.getLog(Controller.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Controller.class);
private String text;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/InputSuggestController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/InputSuggestController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/InputSuggestController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/InputSuggestController.java Sat May 1 11:30:00 2010
@@ -26,12 +26,12 @@ import javax.faces.model.SelectItem;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class InputSuggestController {
- private static final Log LOG = LogFactory.getLog(InputSuggestController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InputSuggestController.class);
private String simpleValue;
private String zipValue;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/OnOffConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/OnOffConverter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/OnOffConverter.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/OnOffConverter.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.convert.Converter;
import javax.faces.convert.ConverterException;
@@ -30,7 +30,7 @@ import javax.faces.component.UIComponent
*/
public class OnOffConverter implements Converter {
- private static final Log LOG = LogFactory.getLog(OnOffConverter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OnOffConverter.class);
public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
LOG.info("getAsObject" + value);
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PartialReloadController.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.ajax.AjaxUtils;
import org.apache.myfaces.tobago.example.demo.Navigation;
@@ -28,7 +28,7 @@ import java.util.Date;
public class PartialReloadController {
- private static final Log LOG = LogFactory.getLog(PartialReloadController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PartialReloadController.class);
private String navigateAction;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.UISheet;
import javax.faces.component.UIComponent;
@@ -28,7 +28,7 @@ import java.util.List;
public class PopupReferenceController {
- private static final Log LOG = LogFactory.getLog(PopupReferenceController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PopupReferenceController.class);
private Entry entry;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/SimpleBeanList.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/SimpleBeanList.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/SimpleBeanList.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/SimpleBeanList.java Sat May 1 11:30:00 2010
@@ -17,14 +17,14 @@ package org.apache.myfaces.tobago.exampl
* 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;
public class SimpleBeanList extends ArrayList<SimpleBean> {
- private static final Log LOG = LogFactory.getLog(SimpleBeanList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SimpleBeanList.class);
public SimpleBeanList() {
add(new SimpleBean(1, "One"));
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/TreeCommandController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/TreeCommandController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/TreeCommandController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/TreeCommandController.java Sat May 1 11:30:00 2010
@@ -18,14 +18,14 @@ package org.apache.myfaces.tobago.exampl
*/
import org.apache.myfaces.tobago.model.TreeState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.swing.tree.DefaultMutableTreeNode;
public class TreeCommandController {
- private static final Log LOG = LogFactory.getLog(TreeCommandController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TreeCommandController.class);
private DefaultMutableTreeNode tree;
@@ -56,7 +56,7 @@ public class TreeCommandController {
}
public String command() {
- LOG.info(state.getMarker());
+ LOG.info("{}", state.getMarker());
return null;
}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Upload.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Upload.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Upload.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/reference/Upload.java Sat May 1 11:30:00 2010
@@ -18,12 +18,12 @@ package org.apache.myfaces.tobago.exampl
*/
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;
public class Upload {
- private static final Log LOG = LogFactory.getLog(Upload.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Upload.class);
private FileItem file;
Modified: myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.1/org/apache/myfaces/tobago/example/reference/DynamicController.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.taglib.ButtonTag;
import org.apache.myfaces.tobago.internal.taglib.LinkTag;
import org.apache.myfaces.tobago.taglib.extension.InExtensionTag;
@@ -29,7 +29,7 @@ import java.util.List;
public class DynamicController {
- private static final Log LOG = LogFactory.getLog(DynamicController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DynamicController.class);
private List<TagData> tags;
Modified: myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.taglib.ButtonTag;
import org.apache.myfaces.tobago.internal.taglib.LinkTag;
import org.apache.myfaces.tobago.taglib.extension.InExtensionTag;
@@ -31,7 +31,7 @@ import java.util.List;
public class DynamicController {
- private static final Log LOG = LogFactory.getLog(DynamicController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DynamicController.class);
private List<TagData> tags;
Modified: myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.exampl
*/
-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.UISheet;
import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.model.SelectItem;
@@ -41,7 +41,7 @@ import java.util.TimeZone;
public class SessionController {
- private static final Log LOG = LogFactory.getLog(SessionController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SessionController.class);
private TabChangeListener tabChangeListener;
@@ -110,12 +110,12 @@ public class SessionController {
UIComponent component = e.getComponent();
for (UIComponent child : (List<UIComponent>) component.getChildren()) {
if (child instanceof UIParameter) {
- LOG.error(((UIParameter) child).getValue());
+ LOG.error("{}", ((UIParameter) child).getValue());
}
}
while ((component = component.getParent()) != null) {
if (component instanceof UISheet) {
- LOG.error(((UISheet) component).getRowIndex());
+ LOG.error("{}", ((UISheet) component).getRowIndex());
}
}
}
@@ -145,12 +145,12 @@ public class SessionController {
}
public TabChangeListener getTabChangeListener() {
- LOG.info("getTabChangeListener " + tabChangeListener);
+ LOG.info("getTabChangeListener {}", tabChangeListener);
return tabChangeListener;
}
public void setTabChangeListener(TabChangeListener tabChangeListener) {
- LOG.info("Setting TabChangeListener " + tabChangeListener);
+ LOG.info("Setting TabChangeListener {}", tabChangeListener);
this.tabChangeListener = tabChangeListener;
}
Modified: myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SimpleTabChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SimpleTabChangeListener.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SimpleTabChangeListener.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SimpleTabChangeListener.java Sat May 1 11:30:00 2010
@@ -19,8 +19,8 @@ package org.apache.myfaces.tobago.exampl
import javax.faces.context.FacesContext;
-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.TabChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeListener;
@@ -29,11 +29,10 @@ import org.apache.myfaces.tobago.event.T
*/
public class SimpleTabChangeListener implements TabChangeListener {
- private static final Log LOG = LogFactory
- .getLog(SimpleTabChangeListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SimpleTabChangeListener.class);
public SimpleTabChangeListener() {
- LOG.info("new SimpleTabChangeListener " + this);
+ LOG.info("new SimpleTabChangeListener {}", this);
}
public void processTabChange(TabChangeEvent tabChangeEvent) {
Modified: myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SolarServlet.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.servlet.NonFacesRequestServlet;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
@@ -26,7 +26,7 @@ import javax.faces.context.FacesContext;
public class SolarServlet extends NonFacesRequestServlet {
- private static final Log LOG = LogFactory.getLog(SolarServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SolarServlet.class);
public String invokeApplication(FacesContext facesContext) {
Modified: myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.exampl
*/
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.UIColumn;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIMenu;
@@ -50,7 +50,7 @@ import java.util.Map;
* Time: 11:08:45
*/
public class TestBean {
- private static final Log LOG = LogFactory.getLog(TestBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestBean.class);
private ResultSet resultSet = null;
private Connection connection = null;
Modified: myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java (original)
+++ myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.Map;
import java.util.HashMap;
@@ -26,7 +26,7 @@ import java.util.Random;
public class FishPond {
- private static final Log LOG = LogFactory.getLog(FishPond.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FishPond.class);
private Map<String, String> fishes;
Modified: myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java (original)
+++ myfaces/tobago/trunk/example/nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.servlet.NonFacesRequestServlet;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
@@ -26,7 +26,7 @@ import javax.faces.context.FacesContext;
public class FishServlet extends NonFacesRequestServlet {
- private static final Log LOG = LogFactory.getLog(FishServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FishServlet.class);
public String invokeApplication(FacesContext facesContext) {
Modified: myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java (original)
+++ myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/BindingRequestBean.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.UIPanel;
import org.apache.myfaces.tobago.model.SelectItem;
@@ -31,7 +31,7 @@ import javax.faces.component.UISelectOne
* Time: 8:47:48 AM
*/
public class BindingRequestBean {
- private static final Log LOG = LogFactory.getLog(BindingRequestBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BindingRequestBean.class);
private String selectOne;
private UISelectOne uiSelectOne;
private UIPanel uiPanel;
Modified: myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java Sat May 1 11:30:00 2010
@@ -17,15 +17,15 @@ package org.apache.myfaces.tobago.exampl
* 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.text.SimpleDateFormat;
import java.util.Date;
public class Controller {
- private static final Log LOG = LogFactory.getLog(Controller.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Controller.class);
private int sliderValue;
Modified: myfaces/tobago/trunk/example/seam/src/main/java/org/apache/myfaces/tobago/example/seam/Issue.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/seam/src/main/java/org/apache/myfaces/tobago/example/seam/Issue.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/seam/src/main/java/org/apache/myfaces/tobago/example/seam/Issue.java (original)
+++ myfaces/tobago/trunk/example/seam/src/main/java/org/apache/myfaces/tobago/example/seam/Issue.java Sat May 1 11:30:00 2010
@@ -19,13 +19,13 @@ package org.apache.myfaces.tobago.exampl
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.bpm.CreateProcess;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Name("issue")
public class Issue {
- private static final Log LOG = LogFactory.getLog(Issue.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Issue.class);
private String title;
private String description;
Modified: myfaces/tobago/trunk/example/test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/pom.xml (original)
+++ myfaces/tobago/trunk/example/test/pom.xml Sat May 1 11:30:00 2010
@@ -200,6 +200,10 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.model.TreeState;
import javax.faces.context.FacesContext;
@@ -30,7 +30,7 @@ import java.util.Set;
public class DirectoryBrowser {
- private static final Log LOG = LogFactory.getLog(DirectoryBrowser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DirectoryBrowser.class);
private PageItem tree;
private TreeState state;
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.Arrays;
import java.util.HashSet;
@@ -27,7 +27,7 @@ import java.util.Set;
public class Filter {
- private static final Log LOG = LogFactory.getLog(Filter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Filter.class);
public static final List<String> ALLOWED = Arrays.asList(
".*\\/",
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/FilterController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/FilterController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/FilterController.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/FilterController.java Sat May 1 11:30:00 2010
@@ -17,13 +17,13 @@ package org.apache.myfaces.tobago.exampl
* 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.model.Wizard;
public class FilterController {
- private static final Log LOG = LogFactory.getLog(FilterController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FilterController.class);
private Wizard wizard;
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Hidden.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Hidden.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Hidden.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Hidden.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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 Hidden {
@@ -26,7 +26,7 @@ public class Hidden {
private String value2 = "value 2";
private String value3 = "value 3";
- private static final Log LOG = LogFactory.getLog(Hidden.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Hidden.class);
public String getValue1() {
return value1;
@@ -51,4 +51,4 @@ public class Hidden {
public void setValue3(String value3) {
this.value3 = value3;
}
-}
\ No newline at end of file
+}
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Immediate.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Immediate.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Immediate.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Immediate.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.FacesContext;
import javax.faces.model.SelectItem;
@@ -37,7 +37,7 @@ public class Immediate {
new SelectItem(4, "Four"),
};
- private static final Log LOG = LogFactory.getLog(Immediate.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Immediate.class);
public String test() {
FacesContext facesContext = FacesContext.getCurrentInstance();
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/InputSuggestController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/InputSuggestController.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/InputSuggestController.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/InputSuggestController.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.UIInput;
import java.util.ArrayList;
@@ -27,7 +27,7 @@ import java.util.List;
public class InputSuggestController {
- private static final Log LOG = LogFactory.getLog(InputSuggestController.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InputSuggestController.class);
public List<String> getInputSuggestItems(UIInput component) {
String prefix = (String) component.getSubmittedValue();
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java Sat May 1 11:30:00 2010
@@ -18,12 +18,12 @@ package org.apache.myfaces.tobago.exampl
*/
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;
public class Upload {
- private static final Log LOG = LogFactory.getLog(Upload.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Upload.class);
private FileItem file;
Modified: myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java (original)
+++ myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.exampl
* 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.junit.Assert;
import org.junit.Test;
@@ -29,7 +29,7 @@ import java.util.List;
public class TestTheAutomaticSeleniumTest {
- private static final Log LOG = LogFactory.getLog(TestTheAutomaticSeleniumTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestTheAutomaticSeleniumTest.class);
@Test
public void areTheCorrectFilesTested() {
Modified: myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java (original)
+++ myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.bean;
* 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.io.IOException;
import java.io.InputStream;
@@ -30,7 +30,7 @@ import java.util.Properties;
@Deprecated
public class ResourceMap extends Properties {
- private static final Log LOG = LogFactory.getLog(ResourceMap.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResourceMap.class);
private static final long serialVersionUID = -6696019120255349519L;
public ResourceMap() {
@@ -55,7 +55,7 @@ public class ResourceMap extends Propert
if (LOG.isDebugEnabled()) {
LOG.debug("size() = \"" + size() + "\"");
for (Object x : keySet()) {
- LOG.debug(x);
+ LOG.debug("{}", x);
}
}
}
Modified: myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.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.SupportsMarkup;
import org.apache.myfaces.tobago.component.UICommand;
@@ -59,7 +59,7 @@ import java.util.Map;
@Deprecated
public final class HtmlRendererUtil {
- private static final Log LOG = LogFactory.getLog(HtmlRendererUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HtmlRendererUtil.class);
private static final String ERROR_FOCUS_KEY = HtmlRendererUtil.class.getName() + ".ErrorFocusId";
private HtmlRendererUtil() {
Modified: myfaces/tobago/trunk/extension/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/pom.xml?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/extension/facelets/pom.xml Sat May 1 11:30:00 2010
@@ -143,6 +143,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java Sat May 1 11:30:00 2010
@@ -27,8 +27,8 @@ import com.sun.facelets.tag.TagException
import com.sun.facelets.tag.TagHandler;
import com.sun.facelets.tag.jsf.ComponentSupport;
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.SupportsMarkup;
import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
@@ -48,7 +48,7 @@ import javax.faces.convert.Converter;
public final class AttributeHandler extends TagHandler {
- private static final Log LOG = LogFactory.getLog(AttributeHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AttributeHandler.class);
private final TagAttribute name;
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java Sat May 1 11:30:00 2010
@@ -21,8 +21,8 @@ import com.sun.facelets.FaceletContext;
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.TagConfig;
import com.sun.facelets.tag.TagHandler;
-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.layout.LayoutBase;
import org.apache.myfaces.tobago.layout.LayoutComponent;
@@ -35,7 +35,7 @@ import java.io.IOException;
public class GridLayoutConstraintHandler extends TagHandler {
- private static final Log LOG = LogFactory.getLog(GridLayoutConstraintHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GridLayoutConstraintHandler.class);
private final TagAttribute columnSpan;
private final TagAttribute rowSpan;
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java Sat May 1 11:30:00 2010
@@ -18,8 +18,8 @@ package org.apache.myfaces.tobago.facele
*/
import com.sun.facelets.impl.DefaultResourceResolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.net.URL;
@@ -42,7 +42,7 @@ import java.net.URL;
*/
public class MetaInfResourcesClasspathResourceResolver extends DefaultResourceResolver {
- private static final Log LOG = LogFactory.getLog(MetaInfResourcesClasspathResourceResolver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MetaInfResourcesClasspathResourceResolver.class);
public MetaInfResourcesClasspathResourceResolver() {
if (LOG.isDebugEnabled()) {
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Sat May 1 11:30:00 2010
@@ -24,8 +24,8 @@ import com.sun.facelets.tag.TagAttribute
import com.sun.facelets.tag.jsf.ComponentConfig;
import com.sun.facelets.tag.jsf.ComponentHandler;
import com.sun.facelets.tag.jsf.ComponentSupport;
-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.InputSuggest;
@@ -55,7 +55,7 @@ import java.util.List;
* Time: 6:14:34 PM
*/
public abstract class TobagoLabelExtensionHandler extends ComponentHandler {
- private static final Log LOG = LogFactory.getLog(TobagoLabelExtensionHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoLabelExtensionHandler.class);
private static final String DEFAULT_COLUMNS = "fixed;*";
private TagAttribute labelWidthAttribute;
private TagAttribute tipAttribute;
Modified: myfaces/tobago/trunk/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java?rev=939978&r1=939977&r2=939978&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java (original)
+++ myfaces/tobago/trunk/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java Sat May 1 11:30:00 2010
@@ -17,8 +17,8 @@ package org.apache.myfaces.tobago.fileup
* 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.util.JndiUtils;
import org.apache.myfaces.tobago.internal.webapp.TobagoMultipartFormdataRequest;
@@ -60,7 +60,7 @@ import java.io.File;
*
*/
public class FileUploadFacesContextFactoryImpl extends FacesContextFactory {
- private static final Log LOG = LogFactory.getLog(FileUploadFacesContextFactoryImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileUploadFacesContextFactoryImpl.class);
private FacesContextFactory facesContextFactory;
private String repositoryPath = System.getProperty("java.io.tmpdir");
private long maxSize = TobagoMultipartFormdataRequest.ONE_MB;