You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by az...@apache.org on 2007/07/12 21:15:32 UTC
svn commit: r555724 - in /webservices/axis2/trunk/java/modules:
clustering/src/org/apache/axis2/clustering/tribes/
kernel/src/org/apache/axis2/clustering/context/
kernel/src/org/apache/axis2/deployment/
Author: azeez
Date: Thu Jul 12 12:15:31 2007
New Revision: 555724
URL: http://svn.apache.org/viewvc?view=rev&rev=555724
Log:
1. If a service impl class is not found, why do we need to print an info level message? There is nothing abnormal about a service without a service impl class
2. Increasing the replication timeout interval
3. ChannelSender needs to break after send ing an Exception to the peer nodes
4. ChannelListener needs to do some special handling of exception messages.
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/context/Replicator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java?view=diff&rev=555724&r1=555723&r2=555724
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java Thu Jul 12 12:15:31 2007
@@ -112,6 +112,8 @@
} else if (msg instanceof ControlCommand && controlCommandProcessor != null) {
controlCommandProcessor.process((ControlCommand) msg,
sender);
+ } else if (msg instanceof Throwable){
+ System.err.println("#####----------- Recd exception " + msg);
}
}
}
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java?view=diff&rev=555724&r1=555723&r2=555724
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java Thu Jul 12 12:15:31 2007
@@ -89,6 +89,7 @@
channel.send(channel.getMembers(), throwable, Channel.SEND_OPTIONS_USE_ACK);
timeToSend = System.currentTimeMillis() - start;
log.debug("Sent " + throwable + " to group");
+ break;
} catch (ChannelException e) {
String message = "Error sending exception message : " + throwable +
". Reason " + e.getMessage();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/context/Replicator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/context/Replicator.java?view=diff&rev=555724&r1=555723&r2=555724
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/context/Replicator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/context/Replicator.java Thu Jul 12 12:15:31 2007
@@ -170,8 +170,8 @@
}
} catch (InterruptedException ignored) {
}
- if (System.currentTimeMillis() - start > 15000) {
- throw new ClusteringFault("ACKs not received from all members within 15 sec. " +
+ if (System.currentTimeMillis() - start > 45000) {
+ throw new ClusteringFault("ACKs not received from all members within 45 sec. " +
"Aborting wait.");
}
} while (!contextManager.isMessageAcknowledged(msgUUID));
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=555724&r1=555723&r2=555724
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Thu Jul 12 12:15:31 2007
@@ -110,8 +110,8 @@
}
service.setName(serviceNameatt.getAttributeValue());
//To be on the safe side
- if (service.getServiceDescription() == null) {
- service.setServiceDescription(serviceNameatt.getAttributeValue());
+ if (service.getDocumentation() == null) {
+ service.setDocumentation(serviceNameatt.getAttributeValue());
}
}
}
@@ -130,23 +130,23 @@
descriptionValue.build();
descriptionValue.serialize(writer);
writer.flush();
- service.setServiceDescription(writer.toString());
+ service.setDocumentation(writer.toString());
} else {
- service.setServiceDescription(descriptionElement.getText());
+ service.setDocumentation(descriptionElement.getText());
}
} else {
serviceNameatt =
service_element.getAttribute(new QName(ATTRIBUTE_NAME));
if (serviceNameatt != null) {
- if (!"".equals(serviceNameatt.getAttributeValue().trim()) && service.getServiceDescription() == null) {
- service.setServiceDescription(serviceNameatt.getAttributeValue());
+ if (!"".equals(serviceNameatt.getAttributeValue().trim()) && service.getDocumentation() == null) {
+ service.setDocumentation(serviceNameatt.getAttributeValue());
}
}
}
if (service.getParameter("ServiceClass") == null) {
- log.info("The Service " + service.getName() + " does not specify a Service Class");
+ log.debug("The Service " + service.getName() + " does not specify a Service Class");
}
// Process WS-Addressing flag attribute
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org