Author: azeez
Date: Tue Jan 8 23:54:57 2008
New Revision: 610296
URL: http://svn.apache.org/viewvc?rev=610296&view=rev
Log:
some minor updates & fixes to testcases
Modified:
webservices/axis2/trunk/java/modules/clustering/pom.xml
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java
Modified: webservices/axis2/trunk/java/modules/clustering/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/pom.xml?rev=610296&r1=610295&r2=610296&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/clustering/pom.xml Tue Jan 8 23:54:57
2008
@@ -63,5 +63,17 @@
</excludes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java?rev=610296&r1=610295&r2=610296&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
Tue Jan 8 23:54:57 2008
@@ -177,7 +177,6 @@
TcpFailureDetector tcpFailureDetector = new TcpFailureDetector();
tcpFailureDetector.setPrevious(dfi);
channel.addInterceptor(tcpFailureDetector);
-// tcpFailureDetector.
channel.addChannelListener(channelListener);
TribesMembershipListener membershipListener = new
TribesMembershipListener();
@@ -202,13 +201,13 @@
log.info("Local Tribes Member " + TribesUtil.getLocalHost(channel));
TribesUtil.printMembers();
- // If configuration management is enabled, get the latest config from
a neighbour TODO: from the longest living neighbour
+ // If configuration management is enabled, get the latest config from
a neighbour
if (configurationManager != null) {
configurationManager.setSender(sender);
getInitializationMessage(sender, new GetConfigurationCommand());
}
- // If context replication is enabled, get the latest state from a
neighbour TODO: from the longest living neighbour
+ // If context replication is enabled, get the latest state from a
neighbour
if (contextManager != null) {
contextManager.setSender(sender);
channelListener.setContextManager(contextManager);
Modified:
webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java?rev=610296&r1=610295&r2=610296&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java
Tue Jan 8 23:54:57 2008
@@ -20,17 +20,16 @@
package org.apache.axis2.clustering;
import junit.framework.TestCase;
-import org.apache.axis2.clustering.ClusterManager;
-import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.clustering.context.DefaultContextManagerListener;
-import
org.apache.axis2.clustering.configuration.TestConfigurationManagerListener;
import org.apache.axis2.clustering.configuration.ConfigurationManagerListener;
import
org.apache.axis2.clustering.configuration.DefaultConfigurationManagerListener;
+import
org.apache.axis2.clustering.configuration.TestConfigurationManagerListener;
+import org.apache.axis2.clustering.context.DefaultContextManagerListener;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.transport.http.server.HttpUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -64,7 +63,7 @@
configurationContext1 =
ConfigurationContextFactory.createDefaultConfigurationContext();
configurationContext2 =
ConfigurationContextFactory.createDefaultConfigurationContext();
-
+
clusterManager1 = getClusterManager(configurationContext1);
clusterManager2 = getClusterManager(configurationContext2);
@@ -93,15 +92,17 @@
axisConfiguration2.addServiceGroup(serviceGroup2);
//Initiating ClusterManagers
+ System.setProperty(ClusteringConstants.LOCAL_IP_ADDRESS,
HttpUtils.getIpAddress());
try {
clusterManager1.init();
+ System.out.println("############ ClusterManager-1 successfully
initialized");
+ System.out.println("*** PLEASE IGNORE THE
java.net.ConnectException STACKTRACES. THIS IS EXPECTED ***");
clusterManager2.init();
+ System.out.println("############ ClusterManager-2 successfully
initialized");
} catch (ClusteringFault e) {
- String message = "Could not initialize ClusterManagers. Please
check the network connection";
- if (log.isErrorEnabled()) {
- log.error(message);
- }
-
+ String message =
+ "Could not initialize ClusterManagers. Please check the
network connection";
+ log.error(message, e);
skipChannelTests = true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
