Author: kfujino
Date: Fri Mar 28 08:05:11 2014
New Revision: 1582629
URL: http://svn.apache.org/r1582629
Log:
Remove the implementation of org.apache.catalina.LifecycleListener from
org.apache.catalina.ha.tcp.SimpleTcpCluster.
SimpleTcpCluster does not work as LifecycleListener, it works as nested
components of Host or Engine.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties?rev=1582629&r1=1582628&r2=1582629&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties Fri
Mar 28 08:05:11 2014
@@ -28,5 +28,4 @@ ReplicationValve.session.found=Context {
ReplicationValve.session.indicator=Context {0}: Primarity of session {0} in
request attribute {1} is {2}.
ReplicationValve.session.invalid=Context {0}: Requested session {1} is
invalid, removed or not replicated at this node.
ReplicationValve.stats=Average request time= {0} ms for Cluster overhead
time={1} ms for {2} requests {3} filter requests {4} send requests {5} cross
context requests (Request={6} ms Cluster={7} ms).
-SimpleTcpCluster.event.log=Cluster receive listener event {0} with data {1}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties?rev=1582629&r1=1582628&r2=1582629&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties Fri
Mar 28 08:05:11 2014
@@ -28,5 +28,4 @@ ReplicationValve.session.found = Context
ReplicationValve.session.indicator = Context {0}\: Primarity of session {0} in
request attribute {1} is {2}.
ReplicationValve.session.invalid = Context {0}\: Requested session {1} is
invalid, removed or not replicated at this node.
ReplicationValve.stats = Average request time\= {0} ms for Cluster overhead
time\={1} ms for {2} requests {3} filter requests {4} send requests {5} cross
context requests (Request\={6} ms Cluster\={7} ms).
-SimpleTcpCluster.event.log = Cluster receive listener event {0} with data {1}
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=1582629&r1=1582628&r2=1582629&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Fri Mar
28 08:05:11 2014
@@ -33,9 +33,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Manager;
import org.apache.catalina.Valve;
@@ -72,8 +70,7 @@ import org.apache.tomcat.util.res.String
* @author Peter Rossbach
*/
public class SimpleTcpCluster extends LifecycleMBeanBase
- implements CatalinaCluster, LifecycleListener, MembershipListener,
- ChannelListener{
+ implements CatalinaCluster, MembershipListener, ChannelListener{
public static final Log log = LogFactory.getLog(SimpleTcpCluster.class);
@@ -511,19 +508,6 @@ public class SimpleTcpCluster extends Li
}
- /**
- * Use as base to handle start/stop/periodic Events from host. Currently
- * only log the messages as trace level.
- *
- * @see
org.apache.catalina.LifecycleListener#lifecycleEvent(org.apache.catalina.LifecycleEvent)
- */
- @Override
- public void lifecycleEvent(LifecycleEvent lifecycleEvent) {
- if (log.isTraceEnabled())
- log.trace(sm.getString("SimpleTcpCluster.event.log",
lifecycleEvent.getType(), lifecycleEvent.getData()));
- }
-
-
// ------------------------------------------------------ public
@Override
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582629&r1=1582628&r2=1582629&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 28 08:05:11 2014
@@ -72,6 +72,18 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <scode>
+ Remove the implementation of
+ <code>org.apache.catalina.LifecycleListener</code> from
+ <code>org.apache.catalina.ha.tcp.SimpleTcpCluster</code>.
+ <code>SimpleTcpCluster</code> does not work as
+ <code>LifecycleListener</code>, it works as nested components of Host
or
+ Engine. (kfujino)
+ </scode>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
