tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r390628 - in /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy: FarmWarDeployer.java WarWatcher.java
Date Sat, 01 Apr 2006 09:25:22 GMT
Author: pero
Date: Sat Apr  1 01:25:21 2006
New Revision: 390628

URL: http://svn.apache.org/viewcvs?rev=390628&view=rev
Log:
Cosmetic change

Modified:
    tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
    tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java

Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=390628&r1=390627&r2=390628&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
(original)
+++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
Sat Apr  1 01:25:21 2006
@@ -127,7 +127,7 @@
             if (log.isInfoEnabled())
                 log.info("Cluster deployment is watching " + getWatchDir()
                         + " for changes.");
-        } //end if
+        }
 
         // Check to correct engine and host setup
         host = (Host) getCluster().getContainer();
@@ -224,7 +224,7 @@
                     } finally {
                         removeFactory(fmsg);
                     }
-                } //end if
+                }
             } else if (msg instanceof UndeployMessage && msg != null) {
                 try {
                     UndeployMessage umsg = (UndeployMessage) msg;
@@ -242,14 +242,13 @@
                             log.debug("undeployment from " + path
                                     + " finished.");
                     } else
-                        log
-                                .error("Application "
-                                        + path
-                                        + " in used. Sorry not remove from backup cluster
nodes!");
+                        log.error("Application "
+                            + path
+                            + " in used. Sorry not remove from backup cluster nodes!");
                 } catch (Exception ex) {
                     log.error(ex);
                 }
-            } //end if
+            }
         } catch (java.io.IOException x) {
             log.error("Unable to read farm deploy file message.", x);
         }
@@ -346,9 +345,9 @@
                     log.debug("Send cluster war fragment [ path: "
                             + contextPath + " war: " + war + " to: " +  members[i] + " ]");
                 getCluster().send(msg, members[i]);
-            } //for
+            }
             msg = factory.readMessage(msg);
-        } //while
+        }
         if(log.isDebugEnabled())
             log.debug("Send cluster war deployment [ path: "
                     + contextPath + " war: " + war + " ] finished.");
@@ -379,8 +378,6 @@
     public void remove(String contextPath, boolean undeploy) throws IOException {
         if (log.isInfoEnabled())
             log.info("Cluster wide remove of web app " + contextPath);
-        // send to other nodes
-        Member[] members = getCluster().getMembers();
         Member localMember = getCluster().getLocalMember();
         UndeployMessage msg = new UndeployMessage(localMember, System
                 .currentTimeMillis(), "Undeploy:" + contextPath + ":"
@@ -687,8 +684,10 @@
     }
 
     /**
-     * Copy a file to the specified temp directory. This is required only
-     * because Jasper depends on it.
+     * Copy a file to the specified temp directory.
+     * @param from copy from temp
+     * @param to   to host appBase directory
+     * @return true, copy successful
      */
     protected boolean copy(File from, File to) {
         try {

Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java?rev=390628&r1=390627&r2=390628&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
(original)
+++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
Sat Apr  1 01:25:21 2006
@@ -79,7 +79,7 @@
         //first make sure all the files are listed in our current status
         for (int i = 0; i < list.length; i++) {
             addWarInfo(list[i]);
-        }//for
+        }
 
         //check all the status codes and update the FarmDeployer
         for (Iterator i = currentStatus.entrySet().iterator(); i.hasNext();) {
@@ -92,8 +92,8 @@
                 listener.fileRemoved(info.getWar());
                 //no need to keep in memory
                 currentStatus.remove(info.getWar());
-            }//end if
-        }//for
+            }
+        }
 
     }
 



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


Mime
View raw message