You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/11/25 18:30:49 UTC
svn commit: r884210 - in
/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha:
./ session/ tcp/ util/
Author: gawor
Date: Wed Nov 25 17:30:48 2009
New Revision: 884210
URL: http://svn.apache.org/viewvc?rev=884210&view=rev
Log:
Make sure to use its own StringManager to load resource bundles
Added:
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/util/StringManager.java (contents, props changed)
- copied, changed from r883984, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/res/StringManager.java
Modified:
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterListener.java
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaManager.java
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaRequest.java
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaSession.java
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/SerializablePrincipal.java
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/ReplicationValve.java
geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterListener.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterListener.java?rev=884210&r1=884209&r2=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterListener.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/ClusterListener.java Wed Nov 25 17:30:48 2009
@@ -24,7 +24,7 @@
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.util.StringManager;
+import org.apache.catalina.ha.util.StringManager;
/**
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaManager.java?rev=884210&r1=884209&r2=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaManager.java Wed Nov 25 17:30:48 2009
@@ -43,7 +43,7 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.io.ReplicationStream;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
+import org.apache.catalina.ha.util.StringManager;
import org.apache.catalina.ha.ClusterManager;
/**
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaRequest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaRequest.java?rev=884210&r1=884209&r2=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaRequest.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaRequest.java Wed Nov 25 17:30:48 2009
@@ -32,7 +32,7 @@
import java.util.LinkedList;
import org.apache.catalina.realm.GenericPrincipal;
-import org.apache.catalina.util.StringManager;
+import org.apache.catalina.ha.util.StringManager;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaSession.java?rev=884210&r1=884209&r2=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/DeltaSession.java Wed Nov 25 17:30:48 2009
@@ -43,7 +43,7 @@
import org.apache.catalina.tribes.io.ReplicationStream;
import org.apache.catalina.tribes.tipis.ReplicatedMapEntry;
import org.apache.catalina.util.Enumerator;
-import org.apache.catalina.util.StringManager;
+import org.apache.catalina.ha.util.StringManager;
import org.apache.catalina.session.StandardManager;
import org.apache.catalina.session.ManagerBase;
import java.util.concurrent.atomic.AtomicInteger;
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=884210&r1=884209&r2=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Wed Nov 25 17:30:48 2009
@@ -40,7 +40,7 @@
import org.apache.catalina.connector.Response;
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
+import org.apache.catalina.ha.util.StringManager;
import org.apache.catalina.valves.ValveBase;
/**
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/SerializablePrincipal.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/SerializablePrincipal.java?rev=884210&r1=884209&r2=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/SerializablePrincipal.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/SerializablePrincipal.java Wed Nov 25 17:30:48 2009
@@ -31,7 +31,7 @@
import org.apache.catalina.Realm;
import org.apache.catalina.realm.GenericPrincipal;
-import org.apache.catalina.util.StringManager;
+import org.apache.catalina.ha.util.StringManager;
/**
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=884210&r1=884209&r2=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/ReplicationValve.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/ReplicationValve.java Wed Nov 25 17:30:48 2009
@@ -38,7 +38,7 @@
import org.apache.catalina.ha.session.DeltaSession;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.util.StringManager;
+import org.apache.catalina.ha.util.StringManager;
import org.apache.catalina.valves.ValveBase;
/**
Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=884210&r1=884209&r2=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Wed Nov 25 17:30:48 2009
@@ -48,7 +48,7 @@
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.util.LifecycleSupport;
-import org.apache.catalina.util.StringManager;
+import org.apache.catalina.ha.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
Copied: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/util/StringManager.java (from r883984, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/res/StringManager.java)
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/util/StringManager.java?p2=geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/util/StringManager.java&p1=geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/res/StringManager.java&r1=883984&r2=884210&rev=884210&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/util/StringManager.java Wed Nov 25 17:30:48 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.res;
+package org.apache.catalina.ha.util;
import java.text.MessageFormat;
import java.util.Hashtable;
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/util/StringManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/util/StringManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/util/StringManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 25 17:30:48 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/res/StringManager.java:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/res/StringManager.java:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335