tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r381491 - in /tomcat/container/tc5.5.x/modules: groupcom/build.xml ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Date Mon, 27 Feb 2006 23:40:53 GMT
Author: fhanik
Date: Mon Feb 27 15:40:50 2006
New Revision: 381491

URL: http://svn.apache.org/viewcvs?rev=381491&view=rev
Log:
Fixed compilation issues and renamed the jar

Modified:
    tomcat/container/tc5.5.x/modules/groupcom/build.xml
    tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java

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=381491&r1=381490&r2=381491&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/build.xml Mon Feb 27 15:40:50 2006
@@ -84,18 +84,18 @@
     	>
         <classpath refid="groupcom.classpath" />
     </javac>
-    <copy file="${basedir}/src/share/org/apache/catalina/groups/LocalStrings.properties"
-    	  tofile="${catalina.build}/classes/org/apache/catalina/groups/LocalStrings.properties"/>
-    <copy file="${basedir}/src/share/org/apache/catalina/groups/tcp/LocalStrings.properties"
-    	  tofile="${catalina.build}/classes/org/apache/catalina/groups/tcp/LocalStrings.properties"/>
-    <copy file="${basedir}/src/share/org/apache/catalina/groups/tcp/DataSenders.properties"
-    	  tofile="${catalina.build}/classes/org/apache/catalina/groups/tcp/DataSenders.properties"/>
-    <copy file="${basedir}/src/share/org/apache/catalina/groups/tcp/mbeans-descriptors.xml"
-    	  tofile="${catalina.build}/classes/org/apache/catalina/groups/tcp/mbeans-descriptors.xml"/>
-    <copy file="${basedir}/src/share/org/apache/catalina/groups/mcast/LocalStrings.properties"
-    	  tofile="${catalina.build}/classes/org/apache/catalina/groups/mcast/LocalStrings.properties"/>
-    <copy file="${basedir}/src/share/org/apache/catalina/groups/mcast/mbeans-descriptors.xml"
-     	  tofile="${catalina.build}/classes/org/apache/catalina/groups/mcast/mbeans-descriptors.xml"/>
+    <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/DataSenders.properties"
+    	  tofile="${catalina.build}/classes/org/apache/catalina/tribes/tcp/DataSenders.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"/>
    </target>
 
 
@@ -130,16 +130,16 @@
   <!-- ================ DIST: Create Distribution ========================= -->
   <target name="dist" depends="build-catalina-groupcom">
     
-    <jar destfile="${groupcom.dist}/catalina-groups.jar"
+    <jar destfile="${groupcom.dist}/catalina-tribes.jar"
          basedir="${catalina.build}/classes">
-       <include name="org/apache/catalina/groups/**" />
+       <include name="org/apache/catalina/tribes/**" />
        <exclude name="**/package.html" />
        <exclude name="**/LocalStrings_*" />
     </jar>
   </target>
 
   <target name="copy" depends="dist" >
-     <copy file="${groupcom.dist}/catalina-groups.jar" todir="${catalina.build}/server/lib"
/>
+     <copy file="${groupcom.dist}/catalina-tribes.jar" todir="${catalina.build}/server/lib"
/>
   </target>
   
   <!-- ======================== DIST: Clean Directory ===================== -->

Modified: tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=381491&r1=381490&r2=381491&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Mon Feb 27 15:40:50 2006
@@ -777,11 +777,11 @@
             msg.setAddress(getLocalMember());
             if (dest != null) {
                 if (!getLocalMember().equals(dest)) {
-                    channel.send(new Member[] {dest}, msg, 0);
+                    channel.send(new Member[] {dest}, msg);
                 } else
                     log.error("Unable to send message to local member " + msg);
             } else {
-                channel.send(null,msg, 0);
+                channel.send(null,msg);
             }
         } catch (Exception x) {
             log.error("Unable to send message through cluster sender.", x);



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


Mime
View raw message