Author: fhanik
Date: Mon Apr 3 13:17:44 2006
New Revision: 391136
URL: http://svn.apache.org/viewcvs?rev=391136&view=rev
Log:
Fixed compilation
Modified:
tomcat/container/tc5.5.x/modules/groupcom/build.xml
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StandardHostSF.java
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StoreRegistry.java
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/server-registry.xml
Modified: tomcat/container/tc5.5.x/modules/groupcom/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/build.xml?rev=391136&r1=391135&r2=391136&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/build.xml Mon Apr 3 13:17:44 2006
@@ -86,14 +86,14 @@
</javac>
<copy
file="${basedir}/src/share/org/apache/catalina/tribes/LocalStrings.properties"
tofile="${catalina.build}/classes/org/apache/catalina/tribes/LocalStrings.properties"/>
- <copy
file="${basedir}/src/share/org/apache/catalina/tribes/tcp/LocalStrings.properties"
-
tofile="${catalina.build}/classes/org/apache/catalina/tribes/tcp/LocalStrings.properties"/>
- <copy
file="${basedir}/src/share/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml"
-
tofile="${catalina.build}/classes/org/apache/catalina/tribes/tcp/mbeans-descriptors.xml"/>
- <copy
file="${basedir}/src/share/org/apache/catalina/tribes/mcast/LocalStrings.properties"
-
tofile="${catalina.build}/classes/org/apache/catalina/tribes/mcast/LocalStrings.properties"/>
- <copy
file="${basedir}/src/share/org/apache/catalina/tribes/mcast/mbeans-descriptors.xml"
-
tofile="${catalina.build}/classes/org/apache/catalina/tribes/mcast/mbeans-descriptors.xml"/>
+ <copy
file="${basedir}/src/share/org/apache/catalina/tribes/transport/LocalStrings.properties"
+
tofile="${catalina.build}/classes/org/apache/catalina/tribes/transport/LocalStrings.properties"/>
+ <copy
file="${basedir}/src/share/org/apache/catalina/tribes/transport/mbeans-descriptors.xml"
+
tofile="${catalina.build}/classes/org/apache/catalina/tribes/transport/mbeans-descriptors.xml"/>
+ <copy
file="${basedir}/src/share/org/apache/catalina/tribes/membership/LocalStrings.properties"
+
tofile="${catalina.build}/classes/org/apache/catalina/tribes/membership/LocalStrings.properties"/>
+ <copy
file="${basedir}/src/share/org/apache/catalina/tribes/membership/mbeans-descriptors.xml"
+
tofile="${catalina.build}/classes/org/apache/catalina/tribes/membership/mbeans-descriptors.xml"/>
</target>
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java?rev=391136&r1=391135&r2=391136&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/CatalinaCluster.java
Mon Apr 3 13:17:44 2006
@@ -22,11 +22,9 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Manager;
import org.apache.catalina.Valve;
-import org.apache.commons.logging.Log;
-import org.apache.catalina.tribes.io.ReplicationStream;
-import java.io.IOException;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.Member;
+import org.apache.commons.logging.Log;
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=391136&r1=391135&r2=391136&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/deploy/FarmWarDeployer.java
Mon Apr 3 13:17:44 2006
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
-
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -31,11 +30,10 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterDeployer;
+import org.apache.catalina.ha.ClusterListener;
import org.apache.catalina.ha.ClusterMessage;
import org.apache.catalina.tribes.Member;
import org.apache.commons.modeler.Registry;
-import java.io.Serializable;
-import org.apache.catalina.ha.ClusterListener;
/**
* <p>
Modified:
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java?rev=391136&r1=391135&r2=391136&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java
(original)
+++
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/CatalinaClusterSF.java
Mon Apr 3 13:17:44 2006
@@ -20,17 +20,18 @@
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Valve;
-import org.apache.catalina.cluster.CatalinaCluster;
-import org.apache.catalina.cluster.ClusterDeployer;
+import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.ClusterDeployer;
import org.apache.catalina.tribes.ChannelReceiver;
import org.apache.catalina.tribes.ChannelSender;
import org.apache.catalina.tribes.MembershipService;
import org.apache.catalina.tribes.MessageListener;
-import org.apache.catalina.cluster.tcp.SimpleTcpCluster;
+import org.apache.catalina.ha.tcp.SimpleTcpCluster;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.catalina.tribes.ManagedChannel;
import java.util.Iterator;
+import org.apache.catalina.ha.ClusterListener;
/**
* Generate Cluster Element with Membership,Sender,Receiver,Deployer and
@@ -101,7 +102,7 @@
LifecycleListener listeners[] =
((SimpleTcpCluster)cluster).findLifecycleListeners();
storeElementArray(aWriter, indent, listeners);
// Store nested <ClusterListener> elements
- MessageListener mlisteners[] =
((SimpleTcpCluster)cluster).findClusterListeners();
+ ClusterListener mlisteners[] =
((SimpleTcpCluster)cluster).findClusterListeners();
storeElementArray(aWriter, indent, mlisteners);
}
}
Modified:
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java?rev=391136&r1=391135&r2=391136&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
(original)
+++
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
Mon Apr 3 13:17:44 2006
@@ -24,7 +24,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.catalina.cluster.util.IDynamicProperty;
+import org.apache.catalina.ha.util.IDynamicProperty;
import org.apache.tomcat.util.IntrospectionUtils;
/**
Modified:
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StandardHostSF.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StandardHostSF.java?rev=391136&r1=391135&r2=391136&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StandardHostSF.java
(original)
+++
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StandardHostSF.java
Mon Apr 3 13:17:44 2006
@@ -27,7 +27,7 @@
import org.apache.catalina.Pipeline;
import org.apache.catalina.Realm;
import org.apache.catalina.Valve;
-import org.apache.catalina.cluster.ClusterValve;
+import org.apache.catalina.ha.ClusterValve;
import org.apache.catalina.core.StandardHost;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StoreRegistry.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StoreRegistry.java?rev=391136&r1=391135&r2=391136&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StoreRegistry.java
(original)
+++
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/StoreRegistry.java
Mon Apr 3 13:17:44 2006
@@ -25,8 +25,8 @@
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Valve;
-import org.apache.catalina.cluster.CatalinaCluster;
-import org.apache.catalina.cluster.ClusterDeployer;
+import org.apache.catalina.ha.CatalinaCluster;
+import org.apache.catalina.ha.ClusterDeployer;
import org.apache.catalina.tribes.ChannelReceiver;
import org.apache.catalina.tribes.ChannelSender;
import org.apache.catalina.tribes.MembershipService;
Modified:
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/server-registry.xml?rev=391136&r1=391135&r2=391136&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++
tomcat/container/tc5.5.x/modules/storeconfig-ha/src/share/org/apache/catalina/storeconfig/server-registry.xml
Mon Apr 3 13:17:44 2006
@@ -99,8 +99,8 @@
storeFactoryClass="org.apache.catalina.storeconfig.ManagerSF">
<TransientAttribute>entropy</TransientAttribute>
<TransientAttribute>distributable</TransientAttribute>
-
<TransientChild>org.apache.catalina.cluster.session.DeltaManager</TransientChild>
-
<TransientChild>org.apache.catalina.cluster.session.SimpleTcpReplicationManager</TransientChild>
+
<TransientChild>org.apache.catalina.ha.session.DeltaManager</TransientChild>
+
<TransientChild>org.apache.catalina.ha.session.SimpleTcpReplicationManager</TransientChild>
</Description>
<Description
tag="Manager"
@@ -131,7 +131,7 @@
standard="false"
default="false"
childs="true"
- tagClass="org.apache.catalina.cluster.CatalinaCluster"
+ tagClass="org.apache.catalina.ha.CatalinaCluster"
storeFactoryClass="org.apache.catalina.storeconfig.CatalinaClusterSF"
storeAppenderClass="org.apache.catalina.storeconfig.IDynamicPropertyStoreAppender">
</Description>
@@ -295,7 +295,7 @@
tag="Sender"
standard="false"
default="false"
-
tagClass="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
+ tagClass="org.apache.catalina.ha.tcp.ReplicationTransmitter"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase"
storeAppenderClass="org.apache.catalina.storeconfig.IDynamicPropertyStoreAppender">
</Description>
@@ -303,35 +303,35 @@
tag="Sender"
standard="false"
default="false"
- tagClass="org.apache.catalina.cluster.ClusterSender"
+ tagClass="org.apache.catalina.ha.ClusterSender"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="Receiver"
standard="false"
default="false"
- tagClass="org.apache.catalina.cluster.ClusterReceiver"
+ tagClass="org.apache.catalina.ha.ClusterReceiver"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="Membership"
standard="false"
default="false"
- tagClass="org.apache.catalina.cluster.MembershipService"
+ tagClass="org.apache.catalina.ha.MembershipService"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="Deployer"
standard="false"
default="false"
- tagClass="org.apache.catalina.cluster.ClusterDeployer"
+ tagClass="org.apache.catalina.ha.ClusterDeployer"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
tag="ClusterListener"
standard="false"
default="false"
- tagClass="org.apache.catalina.cluster.MessageListener"
+ tagClass="org.apache.catalina.ha.MessageListener"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
</Registry>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
