Author: markt
Date: Fri Jul 13 22:31:38 2012
New Revision: 1361424
URL: http://svn.apache.org/viewvc?rev=1361424&view=rev
Log:
UCDetector clean-up
- Remove unused code
- Use final where appropriate
Modified:
tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterMessage.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java?rev=1361424&r1=1361423&r2=1361424&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java Fri Jul 13
22:31:38 2012
@@ -20,13 +20,10 @@ package org.apache.catalina.ha;
import java.util.Map;
import org.apache.catalina.Cluster;
-import org.apache.catalina.LifecycleException;
import org.apache.catalina.Manager;
import org.apache.catalina.Valve;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.Member;
-import org.apache.juli.logging.Log;
-
/**
@@ -41,25 +38,6 @@ public interface CatalinaCluster extends
// ----------------------------------------------------- Instance Variables
/**
- * Start the cluster, the owning container will invoke this
- * @throws Exception - if failure to start cluster
- */
- public void start() throws Exception;
-
- /**
- * Stops the cluster, the owning container will invoke this
- * @throws LifecycleException
- */
- public void stop() throws LifecycleException;
-
- /**
- * Returns the associates logger with this cluster.
- *
- * @return Log
- */
- public Log getLogger();
-
- /**
* Sends a message to all the members in the cluster
* @param msg ClusterMessage
*/
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterMessage.java?rev=1361424&r1=1361423&r2=1361424&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterMessage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterMessage.java Fri Jul 13
22:31:38 2012
@@ -29,7 +29,6 @@ public interface ClusterMessage extends
public Member getAddress();
public void setAddress(Member member);
public String getUniqueId();
- public void setUniqueId(String id);
public long getTimestamp();
public void setTimestamp(long timestamp);
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java?rev=1361424&r1=1361423&r2=1361424&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterMessageBase.java Fri Jul 13
22:31:38 2012
@@ -30,12 +30,11 @@ import org.apache.catalina.tribes.Member
* @author not attributable
* @version 1.0
*/
-public class ClusterMessageBase implements ClusterMessage {
+public abstract class ClusterMessageBase implements ClusterMessage {
private static final long serialVersionUID = 1L;
protected transient Member address;
- private String uniqueId;
private long timestamp;
public ClusterMessageBase() {
// NO-OP
@@ -53,11 +52,6 @@ public class ClusterMessageBase implemen
}
@Override
- public String getUniqueId() {
- return uniqueId;
- }
-
- @Override
public long getTimestamp() {
return timestamp;
}
@@ -74,11 +68,6 @@ public class ClusterMessageBase implemen
}
@Override
- public void setUniqueId(String uniqueId) {
- this.uniqueId = uniqueId;
- }
-
- @Override
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1361424&r1=1361423&r2=1361424&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Fri Jul 13
22:31:38 2012
@@ -41,7 +41,7 @@ public class ClusterRuleSet extends Rule
/**
* The matching pattern prefix to use for recognizing our elements.
*/
- protected String prefix = null;
+ protected final String prefix;
// ------------------------------------------------------------ Constructor
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java?rev=1361424&r1=1361423&r2=1361424&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
Fri Jul 13 22:31:38 2012
@@ -117,11 +117,6 @@ public class SingleSignOnMessage impleme
return result.toString();
}
- @Override
- public void setUniqueId(String uniqueId) {
- this.uniqueId = uniqueId;
- }
-
public int getAction() {
return action;
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java?rev=1361424&r1=1361423&r2=1361424&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java Fri
Jul 13 22:31:38 2012
@@ -63,11 +63,6 @@ public class UndeployMessage implements
return uniqueId;
}
- @Override
- public void setUniqueId(String uniqueId) {
- this.uniqueId = uniqueId;
- }
-
public String getContextName() {
return contextName;
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java?rev=1361424&r1=1361423&r2=1361424&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
Fri Jul 13 22:31:38 2012
@@ -158,14 +158,11 @@ public class SessionMessageImpl extends
public String getContextName() {
return mContextName;
}
+
@Override
public String getUniqueId() {
return uniqueId;
}
- @Override
- public void setUniqueId(String uniqueId) {
- this.uniqueId = uniqueId;
- }
@Override
public String toString() {
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1361424&r1=1361423&r2=1361424&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Fri Jul
13 22:31:38 2012
@@ -891,13 +891,6 @@ public class SimpleTcpCluster extends Li
return;
}
- // --------------------------------------------------------- Logger
-
- @Override
- public Log getLogger() {
- return log;
- }
-
public int getChannelStartOptions() {
return channelStartOptions;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
