You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2005/09/05 22:01:23 UTC
svn commit: r278824 - in
/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine:
modules/navigations/ om/ services/security/db/ services/security/torque/
util/parser/ util/template/
Author: henning
Date: Mon Sep 5 13:01:15 2005
New Revision: 278824
URL: http://svn.apache.org/viewcvs?rev=278824&view=rev
Log:
Remove a bunch of unused variables and imports
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/OMTool.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/db/DBUserManager.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java?rev=278824&r1=278823&r2=278824&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java Mon Sep 5 13:01:15 2005
@@ -16,17 +16,12 @@
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.StringElement;
-
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
-
import org.apache.velocity.context.Context;
/**
@@ -44,9 +39,6 @@
public class VelocityNavigation
extends TemplateNavigation
{
- /** Logging */
- private static Log log = LogFactory.getLog(VelocityNavigation.class);
-
/** The prefix for lookup up navigation pages */
private String prefix = TurbineConstants.NAVIGATION_PREFIX + "/";
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/OMTool.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/OMTool.java?rev=278824&r1=278823&r2=278824&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/OMTool.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/OMTool.java Mon Sep 5 13:01:15 2005
@@ -19,7 +19,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.turbine.Turbine;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.util.pool.Recyclable;
@@ -52,10 +51,10 @@
public OMTool()throws Exception
{
omMap = new HashMap();
- String className = Turbine.getConfiguration()
- .getString("tool.om.factory");
- // RetrieverFactory omFactory =
- // (RetrieverFactory)Class.forName(className).newInstance();
+ // String className = Turbine.getConfiguration()
+ // .getString("tool.om.factory");
+ // RetrieverFactory omFactory =
+ // (RetrieverFactory)Class.forName(className).newInstance();
}
/**
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/db/DBUserManager.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/db/DBUserManager.java?rev=278824&r1=278823&r2=278824&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/db/DBUserManager.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/db/DBUserManager.java Mon Sep 5 13:01:15 2005
@@ -16,23 +16,16 @@
* limitations under the License.
*/
-import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.configuration.Configuration;
-
import org.apache.commons.lang.StringUtils;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.torque.om.BaseObject;
import org.apache.torque.om.ObjectKey;
import org.apache.torque.om.Persistent;
import org.apache.torque.util.Criteria;
-
import org.apache.turbine.om.security.User;
import org.apache.turbine.om.security.peer.TurbineUserPeer;
import org.apache.turbine.services.security.TurbineSecurity;
@@ -64,9 +57,6 @@
public class DBUserManager
implements UserManager
{
- /** Logging */
- private static Log log = LogFactory.getLog(DBUserManager.class);
-
/**
* Initializes the UserManager
*
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java?rev=278824&r1=278823&r2=278824&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java Mon Sep 5 13:01:15 2005
@@ -18,18 +18,13 @@
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
-
import java.sql.Connection;
-
import java.util.Date;
import java.util.Hashtable;
import javax.servlet.http.HttpSessionBindingEvent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.torque.om.Persistent;
-
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.ObjectUtils;
@@ -56,8 +51,6 @@
{
/** Serial Version UID */
private static final long serialVersionUID = 6623129207135917717L;
-
- private static Log log = LogFactory.getLog(TorqueUser.class);
/** The date on which the user last accessed the application. */
private Date lastAccessDate = null;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java?rev=278824&r1=278823&r2=278824&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUserManager.java Mon Sep 5 13:01:15 2005
@@ -16,20 +16,13 @@
* limitations under the License.
*/
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.configuration.Configuration;
-
import org.apache.commons.lang.StringUtils;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.torque.om.Persistent;
import org.apache.torque.util.Criteria;
-
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.security.TurbineSecurity;
@@ -59,9 +52,6 @@
public class TorqueUserManager
implements UserManager
{
- /** Logging */
- private static Log log = LogFactory.getLog(TorqueUserManager.class);
-
/**
* Initializes the UserManager
*
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java?rev=278824&r1=278823&r2=278824&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java Mon Sep 5 13:01:15 2005
@@ -19,16 +19,11 @@
import java.beans.IndexedPropertyDescriptor;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
-
import java.io.UnsupportedEncodingException;
-
import java.lang.reflect.Method;
-
import java.math.BigDecimal;
-
import java.text.DateFormat;
import java.text.ParseException;
-
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
@@ -36,21 +31,17 @@
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Set;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.torque.om.NumberKey;
import org.apache.torque.om.StringKey;
-
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.util.DateSelector;
import org.apache.turbine.util.TimeSelector;
-import org.apache.turbine.util.pool.Recyclable;
import org.apache.turbine.util.pool.RecyclableSupport;
/**
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java?rev=278824&r1=278823&r2=278824&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java Mon Sep 5 13:01:15 2005
@@ -16,11 +16,8 @@
* limitations under the License.
*/
-import java.util.Map;
import java.util.HashMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Map;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.RunData;
@@ -39,9 +36,6 @@
*/
public class TemplateInfo
{
- /** Logging */
- private static Log log = LogFactory.getLog(TemplateInfo.class);
-
/* Constants for tempStorage hash map. */
public static final String NAVIGATION_TEMPLATE = "00navigation_template00";
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org