svn commit: r1240041 - in /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info: ActivityList.java ActivityPhaseListener.java ActivityServletContextListener.java ActivitySessionListener.java

[lo...@apache.org]

Author: lofwyr
Date: Fri Feb  3 09:32:47 2012
New Revision: 1240041

URL: http://svn.apache.org/viewvc?rev=1240041&view=rev
Log:
TOBAGO-1089: Examples: Update to Jetty 7 and cleanup
 - fixing wrong log classes

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityServletContextListener.java
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java?rev=1240041&r1=1240040&r2=1240041&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java Fri Feb  3 09:32:47 2012
@@ -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.ArrayList;
 import java.util.Collection;
@@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHa
 
 public class ActivityList {
 
-  private static final Log LOG = LogFactory.getLog(ActivityList.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ActivityList.class);
 
   public static final String NAME = "activities";
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java?rev=1240041&r1=1240040&r2=1240041&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java Fri Feb  3 09:32:47 2012
@@ -17,8 +17,6 @@ package org.apache.myfaces.tobago.exampl
  * limitations under the License.
  */
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.ajax.AjaxUtils;
 import org.apache.myfaces.tobago.util.VariableResolverUtils;
 
@@ -30,8 +28,6 @@ import javax.servlet.http.HttpSession;
 
 public class ActivityPhaseListener implements PhaseListener {
 
-  private static final Log LOG = LogFactory.getLog(ActivityPhaseListener.class);
-
   public ActivityPhaseListener() {
   }
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityServletContextListener.java?rev=1240041&r1=1240040&r2=1240041&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityServletContextListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityServletContextListener.java Fri Feb  3 09:32:47 2012
@@ -17,17 +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 javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
 public class ActivityServletContextListener implements ServletContextListener {
 
-  private static final Log LOG = LogFactory.getLog(ActivityServletContextListener.class);
-
   public void contextInitialized(ServletContextEvent event) {
     final ServletContext application = event.getServletContext();
     application.setAttribute(ActivityList.NAME, new ActivityList());

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java?rev=1240041&r1=1240040&r2=1240041&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java Fri Feb  3 09:32:47 2012
@@ -17,9 +17,6 @@ package org.apache.myfaces.tobago.exampl
  * limitations under the License.
  */
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionEvent;
@@ -27,8 +24,6 @@ import javax.servlet.http.HttpSessionLis
 
 public class ActivitySessionListener implements HttpSessionListener {
 
-  private static final Log LOG = LogFactory.getLog(ActivitySessionListener.class);
-
   private static final String SESSION_MAP = ActivitySessionListener.class.getName() + ".SESSION_MAP";
 
   public void sessionCreated(HttpSessionEvent event) {