[wsas-java-dev] svn commit r3720 - in trunk/wsas/java/modules: core/conf core/src/org/wso2/wsas/util standalone-edition/conf

[svn at wso2.org]

Author: azeez
Date: Wed Jun 13 04:28:31 2007
New Revision: 3720

Modified:
   trunk/wsas/java/modules/core/conf/log4j.properties
   trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java
   trunk/wsas/java/modules/standalone-edition/conf/axis2.xml
Log:
Fixing wring package in axis2.xml
setting additivity of clustering package to false
Removing ReplicationHandler



Modified: trunk/wsas/java/modules/core/conf/log4j.properties
==============================================================================
--- trunk/wsas/java/modules/core/conf/log4j.properties	(original)
+++ trunk/wsas/java/modules/core/conf/log4j.properties	Wed Jun 13 04:28:31 2007
@@ -18,7 +18,7 @@
 # This is the log4j configuration file used by WSO2 WSAS
 #
 # IMPORTANT : Please do not remove or change the names of any
-# of the Appender defined here. The layout pattern & log file
+# of the Appenders defined here. The layout pattern & log file
 # can be changed using the WSO2 WSAS Management Console, and those
 # settings will override the settings in this file.
 #
@@ -26,8 +26,8 @@
 log4j.rootLogger=INFO, WSO2WSAS_CONSOLE, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY, WSO2WSAS_SYS_LOG
 
 log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
-log4j.logger.org.apache=INFO, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
 log4j.logger.org.apache.axis2.clustering=DEBUG, WSO2WSAS_CONSOLE
+log4j.logger.org.apache=INFO, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
 log4j.logger.org.apache.catalina=WARN
 log4j.logger.org.hibernate=ERROR, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
 log4j.logger.org.mortbay=ERROR, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
@@ -38,6 +38,7 @@
 
 log4j.logger.trace.messages=TRACE,WSO2WSAS_TRACE_LOGFILE
 
+log4j.additivity.org.apache.axis2.clustering=false
 
 # WSO2WSAS_CONSOLE is set to be a ConsoleAppender using a PatternLayout.
 log4j.appender.WSO2WSAS_CONSOLE=org.apache.log4j.ConsoleAppender

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java	Wed Jun 13 04:28:31 2007
@@ -18,7 +18,6 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.clustering.ClusterManager;
-import org.apache.axis2.clustering.handlers.ReplicationHandler;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
@@ -47,75 +46,6 @@
                 isClusterManagerInitialized = true;
             }
 
-            // Context Manager
-            if (clusterManager.getContextManager() != null) {
-                {
-                    for (Iterator iterator = axisConfig.getInFlowPhases().iterator();
-                         iterator.hasNext();) {
-                        Phase phase = (Phase) iterator.next();
-                        if (phase instanceof DispatchPhase) {
-                            PhaseRule rule = new PhaseRule("Dispatch");
-                            rule.setAfter("SOAPMessageBodyBasedDispatcher");
-                            ReplicationHandler handler = new ReplicationHandler();
-                            HandlerDescription handlerDesc = handler.getHandlerDesc();
-                            handlerDesc.setHandler(handler);
-                            handlerDesc.setName("ReplicationHandler");
-                            handlerDesc.setRules(rule);
-                            phase.addHandler(handler);
-                            break;
-                        }
-                    }
-                }
-
-                {
-                    for (Iterator iterator = axisConfig.getInFaultFlowPhases().iterator();
-                         iterator.hasNext();) {
-                        Phase phase = (Phase) iterator.next();
-                        if (phase instanceof DispatchPhase) {
-                            PhaseRule rule = new PhaseRule("Dispatch");
-                            rule.setAfter("SOAPMessageBodyBasedDispatcher");
-                            ReplicationHandler handler = new ReplicationHandler();
-                            HandlerDescription handlerDesc = handler.getHandlerDesc();
-                            handlerDesc.setHandler(handler);
-                            handlerDesc.setName("ReplicationHandler");
-                            handlerDesc.setRules(rule);
-                            phase.addHandler(handler);
-                            break;
-                        }
-                    }
-                }
-
-                {
-                    for (Iterator iterator = axisConfig.getOutFlowPhases().iterator();
-                         iterator.hasNext();) {
-                        Phase phase = (Phase) iterator.next();
-                        if (phase.getName().equals("MessageOut")) {
-                            ReplicationHandler handler = new ReplicationHandler();
-                            HandlerDescription handlerDesc = handler.getHandlerDesc();
-                            handlerDesc.setHandler(handler);
-                            handlerDesc.setName("ReplicationHandler");
-                            phase.addHandler(handler);
-                            break;
-                        }
-                    }
-                }
-
-                {
-                    for (Iterator iterator = axisConfig.getOutFaultFlowPhases().iterator();
-                         iterator.hasNext();) {
-                        Phase phase = (Phase) iterator.next();
-                        if (phase.getName().equals("MessageOut")) {
-                            ReplicationHandler handler = new ReplicationHandler();
-                            HandlerDescription handlerDesc = handler.getHandlerDesc();
-                            handlerDesc.setHandler(handler);
-                            handlerDesc.setName("ReplicationHandler");
-                            phase.addHandler(handler);
-                            break;
-                        }
-                    }
-                }
-            }
-
             // Configuration Manager
             if (clusterManager.getConfigurationManager() != null) {
                 Map msgReceiverMap = new HashMap();

Modified: trunk/wsas/java/modules/standalone-edition/conf/axis2.xml
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/conf/axis2.xml	(original)
+++ trunk/wsas/java/modules/standalone-edition/conf/axis2.xml	Wed Jun 13 04:28:31 2007
@@ -313,7 +313,7 @@
     <!-- Configure and uncomment following for preparing Axis2 to a clustered environment -->
     <!-- ================================================= -->
     <!--
-    <cluster class="org.apache.axis2.clusteringing.tribes.TribesClusterManager">
+    <cluster class="org.apache.axis2.clustering.tribes.TribesClusterManager">
         <parameter name="AvoidInitiation">true</parameter>
         <parameter name="domain">wso2wsas.domain</parameter>
         <configurationManager
@@ -322,8 +322,8 @@
             <parameter name="NotificationWaitTime">2000</parameter>
             <listener class="org.wso2.wsas.clustering.configuration.WSASConfigurationManagerListener"/>
         </configurationManager>
-        <contextManager class="org.apache.axis2.clusteringing.context.DefaultContextManager">
-            <listener class="org.apache.axis2.clusteringing.context.DefaultContextManagerListener"/>
+        <contextManager class="org.apache.axis2.clustering.context.DefaultContextManager">
+            <listener class="org.apache.axis2.clustering.context.DefaultContextManagerListener"/>
             <replication>
                 <defaults>
                     <exclude name="local_*"/>