tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r529092 - /tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/
Date Sun, 15 Apr 2007 23:18:35 GMT
Author: markt
Date: Sun Apr 15 16:18:34 2007
New Revision: 529092

URL: http://svn.apache.org/viewvc?view=rev&rev=529092
Log:
Code clean-up before looking at bug 41956

Modified:
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorSF.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/PersistentManagerSF.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardContextSF.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardEngineSF.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardHostSF.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServerSF.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServiceSF.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreAppender.java
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreContextAppender.java

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java
Sun Apr 15 16:18:34 2007
@@ -28,8 +28,6 @@
 import org.apache.catalina.cluster.MembershipService;
 import org.apache.catalina.cluster.MessageListener;
 import org.apache.catalina.cluster.tcp.SimpleTcpCluster;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Generate Cluster Element with Membership,Sender,Receiver,Deployer and
@@ -38,8 +36,6 @@
  * @author Peter Rossbach
  */
 public class CatalinaClusterSF extends StoreFactoryBase {
-
-    private static Log log = LogFactory.getLog(CatalinaClusterSF.class);
 
     /**
      * Store the specified Cluster childs.

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorSF.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorSF.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorSF.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorSF.java
Sun Apr 15 16:18:34 2007
@@ -22,8 +22,6 @@
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.connector.Connector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Store Connector and Listeners
@@ -31,8 +29,6 @@
  * @author Peter Rossbach
  */
 public class ConnectorSF extends StoreFactoryBase {
-
-    private static Log log = LogFactory.getLog(ConnectorSF.class);
 
     /**
      * Store Connector description

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
Sun Apr 15 16:18:34 2007
@@ -79,9 +79,6 @@
             boolean include, Object bean, StoreDescription desc)
             throws Exception {
 
-        // Render the relevant properties of this bean
-        String className = bean.getClass().getName();
-
         // Render a className attribute if requested
         if (include && desc != null && !desc.isStandard()) {
             writer.print(" className=\"");
@@ -256,7 +253,6 @@
 
     protected File getCatalinaBase() {
 
-        File appBase;
         File file = new File(System.getProperty("catalina.base"));
         try {
             file = file.getCanonicalFile();

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
Sun Apr 15 16:18:34 2007
@@ -55,9 +55,6 @@
             boolean include, Object bean, StoreDescription desc)
             throws Exception {
 
-        // Render the relevant properties of this bean
-        String className = bean.getClass().getName();
-
         // Render a className attribute if requested
         if (include && desc != null && !desc.isStandard()) {
             writer.print(" className=\"");

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/PersistentManagerSF.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/PersistentManagerSF.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/PersistentManagerSF.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/PersistentManagerSF.java
Sun Apr 15 16:18:34 2007
@@ -21,8 +21,6 @@
 
 import org.apache.catalina.Store;
 import org.apache.catalina.session.PersistentManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * store server.xml PersistentManager element with nested "Store"
@@ -30,8 +28,6 @@
  * @author Peter Rossbach
  */
 public class PersistentManagerSF extends StoreFactoryBase {
-
-    private static Log log = LogFactory.getLog(PersistentManagerSF.class);
 
     /**
      * Store the specified PersistentManager properties.

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardContextSF.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardContextSF.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardContextSF.java
Sun Apr 15 16:18:34 2007
@@ -207,7 +207,6 @@
     protected StoreFileMover getConfigFileWriter(Context context)
             throws IOException {
         String configFile = context.getConfigFile();
-        PrintWriter writer = null;
         StoreFileMover mover = null;
         if (configFile != null) {
             File config = new File(configFile);

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardEngineSF.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardEngineSF.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardEngineSF.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardEngineSF.java
Sun Apr 15 16:18:34 2007
@@ -26,8 +26,6 @@
 import org.apache.catalina.Realm;
 import org.apache.catalina.Valve;
 import org.apache.catalina.core.StandardEngine;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Store server.xml Element Engine
@@ -35,8 +33,6 @@
  * @author Peter Rossbach
  */
 public class StandardEngineSF extends StoreFactoryBase {
-
-    private static Log log = LogFactory.getLog(StandardEngineSF.class);
 
     /**
      * Store the specified Engine properties.

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardHostSF.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardHostSF.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardHostSF.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardHostSF.java
Sun Apr 15 16:18:34 2007
@@ -30,8 +30,6 @@
 import org.apache.catalina.Valve;
 import org.apache.catalina.cluster.ClusterValve;
 import org.apache.catalina.core.StandardHost;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Store server.xml Element Host
@@ -39,8 +37,6 @@
  * @author Peter Rossbach
  */
 public class StandardHostSF extends StoreFactoryBase {
-
-    private static Log log = LogFactory.getLog(StandardHostSF.class);
 
     /**
      * Store the specified Host properties and childs

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServerSF.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServerSF.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServerSF.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServerSF.java
Sun Apr 15 16:18:34 2007
@@ -25,8 +25,6 @@
 import org.apache.catalina.core.StandardServer;
 import org.apache.catalina.deploy.NamingResources;
 import org.apache.catalina.mbeans.ServerLifecycleListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Store server.xml Server element and childs (
@@ -35,8 +33,6 @@
  * @author Peter Rossbach
  */
 public class StandardServerSF extends StoreFactoryBase {
-
-    private static Log log = LogFactory.getLog(StandardServerSF.class);
 
     /**
      * Store the specified Server properties.

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServiceSF.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServiceSF.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServiceSF.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardServiceSF.java
Sun Apr 15 16:18:34 2007
@@ -24,16 +24,12 @@
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.core.StandardService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Store server.xml Element Service and all childs 
  * @author Peter Rossbach (pero@apache.org)
  */
 public class StandardServiceSF extends StoreFactoryBase {
-
-    private static Log log = LogFactory.getLog(StandardServiceSF.class);
 
     /**
      * Store Childs from this StandardService description

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreAppender.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreAppender.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreAppender.java
Sun Apr 15 16:18:34 2007
@@ -24,8 +24,6 @@
 import java.util.Iterator;
 
 import org.apache.catalina.deploy.ResourceBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.tomcat.util.IntrospectionUtils;
 
 /**
@@ -35,7 +33,6 @@
  *  
  */
 public class StoreAppender {
-    private static Log log = LogFactory.getLog(StoreAppender.class);
 
     /**
      * The set of classes that represent persistable properties.
@@ -212,9 +209,6 @@
     public void printAttributes(PrintWriter writer, int indent,
             boolean include, Object bean, StoreDescription desc)
             throws Exception {
-
-        // Render the relevant properties of this bean
-        String className = bean.getClass().getName();
 
         // Render a className attribute if requested
         if (include && desc != null && !desc.isStandard()) {

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreContextAppender.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreContextAppender.java?view=diff&rev=529092&r1=529091&r2=529092
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreContextAppender.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StoreContextAppender.java
Sun Apr 15 16:18:34 2007
@@ -23,8 +23,6 @@
 import org.apache.catalina.Container;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardHost;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * store StandardContext Attributes ... 
@@ -33,8 +31,6 @@
  *  
  */
 public class StoreContextAppender extends StoreAppender {
-
-    private static Log log = LogFactory.getLog(StoreContextAppender.class);
 
     /**
      * @param writer



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message