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 pr...@apache.org on 2007/06/27 18:46:04 UTC
svn commit: r551228 [2/23] - in /webservices/axis2/branches/java/jaxws21: ./
etc/ modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/schema/writer/ modules...
Modified: webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Wed Jun 27 09:45:37 2007
@@ -29,7 +29,7 @@
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,7 +38,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-public class RPCMessageReceiver extends AbstractInOutSyncMessageReceiver {
+public class RPCMessageReceiver extends AbstractInOutMessageReceiver {
private static Log log = LogFactory.getLog(RPCMessageReceiver.class);
/**
Modified: webservices/axis2/branches/java/jaxws21/modules/addressing/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/addressing/test-resources/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/addressing/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/addressing/test-resources/axis2.xml Wed Jun 27 09:45:37 2007
@@ -1,10 +1,10 @@
<axisconfig name="AxisJava2.0">
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">true</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">true</parameter>
<messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
+ <parameter name="PROTOCOL">HTTP/1.0</parameter>
</transportSender>
<module ref="addressing"/>
@@ -15,15 +15,15 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/ContextClusteringCommandFactory.java Wed Jun 27 09:45:37 2007
@@ -16,9 +16,19 @@
package org.apache.axis2.clustering.context;
import org.apache.axiom.om.util.UUIDGenerator;
-import org.apache.axis2.clustering.context.commands.*;
+import org.apache.axis2.clustering.context.commands.ContextClusteringCommandCollection;
+import org.apache.axis2.clustering.context.commands.UpdateConfigurationContextCommand;
+import org.apache.axis2.clustering.context.commands.UpdateContextCommand;
+import org.apache.axis2.clustering.context.commands.UpdateServiceContextCommand;
+import org.apache.axis2.clustering.context.commands.UpdateServiceGroupContextCommand;
+import org.apache.axis2.clustering.context.commands.DeleteServiceGroupContextCommand;
+import org.apache.axis2.clustering.context.commands.DeleteServiceContextCommand;
import org.apache.axis2.clustering.tribes.AckManager;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.AbstractContext;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.PropertyDifference;
+import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -98,7 +108,10 @@
AckManager.addInitialAcknowledgement(cmd);
}
}
- context.clearPropertyDifferences(); // Once we send the diffs, we should clear the diffs
+
+ synchronized (context) {
+ context.clearPropertyDifferences(); // Once we send the diffs, we should clear the diffs
+ }
return cmd;
}
@@ -114,44 +127,41 @@
Map excludedPropertyPatterns,
boolean includeAllProperties) {
if (!includeAllProperties) {
-
- // Sometimes, there can be failures, so if an exception occurs, we retry
- while (true) {
+ synchronized (context) {
Map diffs = context.getPropertyDifferences();
- try {
- for (Iterator iter = diffs.keySet().iterator(); iter.hasNext();) {
- String key = (String) iter.next();
- Object prop = context.getPropertyNonReplicable(key);
-
- // First check whether it is serializable
- if (prop instanceof Serializable) {
-
- // Next check whether it matches an excluded pattern
- if (!isExcluded(key,
- context.getClass().getName(),
- excludedPropertyPatterns)) {
- log.debug("sending property =" + key + "-" + prop);
- PropertyDifference diff = (PropertyDifference) diffs.get(key);
- diff.setValue(prop);
- updateCmd.addProperty(diff);
- }
+ for (Iterator iter = diffs.keySet().iterator(); iter.hasNext();) {
+ String key = (String) iter.next();
+ Object prop = context.getPropertyNonReplicable(key);
+
+ // First check whether it is serializable
+ if (prop instanceof Serializable) {
+
+ // Next check whether it matches an excluded pattern
+ if (!isExcluded(key,
+ context.getClass().getName(),
+ excludedPropertyPatterns)) {
+ log.debug("sending property =" + key + "-" + prop);
+ PropertyDifference diff = (PropertyDifference) diffs.get(key);
+ diff.setValue(prop);
+ updateCmd.addProperty(diff);
}
}
- break;
- } catch (Exception ignored) {
}
}
} else {
- for (Iterator iter = context.getPropertyNames(); iter.hasNext();) {
- String key = (String) iter.next();
- Object prop = context.getPropertyNonReplicable(key);
- if (prop instanceof Serializable) { // First check whether it is serializable
-
- // Next check whether it matches an excluded pattern
- if (!isExcluded(key, context.getClass().getName(), excludedPropertyPatterns)) {
- log.debug("sending property =" + key + "-" + prop);
- PropertyDifference diff = new PropertyDifference(key, prop, false);
- updateCmd.addProperty(diff);
+ synchronized (context) {
+ for (Iterator iter = context.getPropertyNames(); iter.hasNext();) {
+ String key = (String) iter.next();
+ Object prop = context.getPropertyNonReplicable(key);
+ if (prop instanceof Serializable) { // First check whether it is serializable
+
+ // Next check whether it matches an excluded pattern
+ if (!isExcluded(key, context.getClass().getName(), excludedPropertyPatterns))
+ {
+ log.debug("sending property =" + key + "-" + prop);
+ PropertyDifference diff = new PropertyDifference(key, prop, false);
+ updateCmd.addProperty(diff);
+ }
}
}
}
@@ -196,5 +206,27 @@
}
}
return false;
+ }
+
+ public static ContextClusteringCommand getRemoveCommand(AbstractContext abstractContext) {
+ if (abstractContext instanceof ServiceGroupContext) {
+ ServiceGroupContext sgCtx = (ServiceGroupContext) abstractContext;
+ DeleteServiceGroupContextCommand cmd = new DeleteServiceGroupContextCommand();
+ cmd.setUniqueId(UUIDGenerator.getUUID());
+ cmd.setServiceGroupName(sgCtx.getDescription().getServiceGroupName());
+ cmd.setServiceGroupContextId(sgCtx.getId());
+
+ return cmd;
+ } else if (abstractContext instanceof ServiceContext) {
+ ServiceContext serviceCtx = (ServiceContext) abstractContext;
+ DeleteServiceContextCommand cmd = new DeleteServiceContextCommand();
+ cmd.setUniqueId(UUIDGenerator.getUUID());
+ cmd.setServiceGroupName(serviceCtx.getGroupName());
+ cmd.setServiceGroupContextId(serviceCtx.getServiceGroupContext().getId());
+ cmd.setServiceName(serviceCtx.getAxisService().getName());
+
+ return cmd;
+ }
+ return null;
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/context/DefaultContextManager.java Wed Jun 27 09:45:37 2007
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.clustering.ClusteringFault;
+import org.apache.axis2.clustering.ClusteringConstants;
import org.apache.axis2.clustering.context.commands.ContextClusteringCommandCollection;
import org.apache.axis2.clustering.tribes.AckManager;
import org.apache.axis2.clustering.tribes.ChannelSender;
@@ -69,6 +70,12 @@
return cmd.getUniqueId();
}
+ public String removeContext(AbstractContext context) throws ClusteringFault {
+ ContextClusteringCommand cmd = ContextClusteringCommandFactory.getRemoveCommand(context);
+ processor.process(cmd);
+ return cmd.getUniqueId();
+ }
+
public boolean isContextClusterable(AbstractContext context) {
return (context instanceof ConfigurationContext) ||
(context instanceof ServiceContext) ||
@@ -147,7 +154,9 @@
}
} while (sender == null);
try {
- sender.sendToGroup(cmd);
+ long tts = sender.sendToGroup(cmd);
+ configContext.setNonReplicableProperty(ClusteringConstants.TIME_TO_SEND,
+ new Long(tts));
} catch (ClusteringFault clusteringFault) {
throw new RuntimeException(clusteringFault);
}
@@ -155,7 +164,9 @@
};
processorThread.start();
} else {
- sender.sendToGroup(cmd);
+ long tts = sender.sendToGroup(cmd);
+ configContext.setNonReplicableProperty(ClusteringConstants.TIME_TO_SEND,
+ new Long(tts));
}
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/AckManager.java Wed Jun 27 09:45:37 2007
@@ -21,6 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@ -41,9 +42,8 @@
String memberId) {
MessageACK ack = (MessageACK) messageAckTable.get(messageUniqueId);
if (ack != null) {
- List memberList = ack.getMemberList();
- if (!memberList.contains(memberId)) { // If the member has not already ACKed
- memberList.add(memberId);
+ if (!ack.hasACKed(memberId)) { // If the member has not already ACKed
+ ack.addACK(memberId);
}
}
}
@@ -53,7 +53,6 @@
boolean isAcknowledged = false;
MessageACK ack = (MessageACK) messageAckTable.get(messageUniqueId);
- List memberList = ack.getMemberList();
// Check that all members in the memberList are same as the total member list,
// which will indicate that all members have ACKed the message
@@ -64,15 +63,20 @@
for (int i = 0; i < members.length; i++) {
Member member = members[i];
String memberHost = TribesUtil.getHost(member);
- if (member.isReady() && !memberList.contains(memberHost)) {
+ if (member.isReady() && !ack.hasACKed(memberHost)) {
log.debug("[NO ACK] from member " + memberHost);
- log.debug("ACKed member list=" + memberList);
- // At this point, resend the original message back to the node which has not
- // sent an ACK
- sender.sendToMember(ack.getCommand(), member);
+ // If a new member joined the cluster recently,
+ // we need to retransmit the message to this member, if an ACK has not been
+ // received from this member. We retransmit only once.
+ if (member.getMemberAliveTime() < 5000 &&
+ !ack.isRestransmittedToMember(memberHost)) { // TODO: Check
+
+ sender.sendToMember(ack.getCommand(), member);
+ log.debug("Retransimitting msg " + ack.getCommand().getUniqueId() +
+ " to member " + memberHost);
+ }
- //TODO: Enhancement, Check whether this is a new member. If then send the msg
isAcknowledged = false;
break;
} else {
@@ -91,17 +95,30 @@
private static class MessageACK {
private ContextClusteringCommand command;
private List memberList = new Vector();
+ private List retransmittedList = new ArrayList();
public MessageACK(ContextClusteringCommand command) {
this.command = command;
}
+ public void addACK(String memberId) {
+ memberList.add(memberId);
+ }
+
public ContextClusteringCommand getCommand() {
return command;
}
- public List getMemberList() {
- return memberList;
+ public boolean hasACKed(String memberId) {
+ return memberList.contains(memberId);
+ }
+
+ public void addToRestransmittedList(String memberId) {
+ retransmittedList.add(memberId);
+ }
+
+ public boolean isRestransmittedToMember(String memberId) {
+ return retransmittedList.contains(memberId);
}
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java Wed Jun 27 09:45:37 2007
@@ -17,6 +17,7 @@
package org.apache.axis2.clustering.tribes;
import org.apache.axis2.clustering.ClusteringConstants;
+import org.apache.axis2.clustering.ClusteringFault;
import org.apache.axis2.clustering.configuration.ConfigurationClusteringCommand;
import org.apache.axis2.clustering.configuration.DefaultConfigurationManager;
import org.apache.axis2.clustering.context.ContextClusteringCommand;
@@ -30,29 +31,16 @@
import org.apache.catalina.tribes.Member;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import sun.misc.Queue;
import java.io.Serializable;
-
public class ChannelListener implements org.apache.catalina.tribes.ChannelListener {
private static final Log log = LogFactory.getLog(ChannelListener.class);
private DefaultContextManager contextManager;
private DefaultConfigurationManager configurationManager;
private TribesControlCommandProcessor controlCommandProcessor;
- private ChannelSender sender;
-
- /**
- * The messages received are enqued. Another thread, messageProcessor, will
- * process these messages in the order that they were received.
- */
- private final Queue cmdQueue = new Queue();
-
- /**
- * The thread which picks up messages from the cmdQueue and processes them.
- */
- private Thread messageProcessor;
+ private ChannelSender channelSender;
private ConfigurationContext configurationContext;
@@ -64,9 +52,8 @@
this.configurationManager = configurationManager;
this.contextManager = contextManager;
this.controlCommandProcessor = controlCommandProcessor;
- this.sender = sender;
+ this.channelSender = sender;
this.configurationContext = configurationContext;
- startMessageProcessor();
}
public void setContextManager(DefaultContextManager contextManager) {
@@ -95,95 +82,33 @@
return;
}
log.debug("RECEIVED MESSAGE " + msg + " from " + TribesUtil.getHost(sender));
-
- // Need to process ACKs as soon as they are received since otherwise,
- // unnecessary retransmissions will take place
- if(msg instanceof AckCommand){
- try {
- controlCommandProcessor.process((AckCommand) msg, sender);
- } catch (Exception e) {
- log.error(e);
- }
- return;
- }
-
- // Add the commands to be precessed to the cmdQueue
- synchronized (cmdQueue) {
- cmdQueue.enqueue(new MemberMessage(msg, sender));
- }
- if (!messageProcessor.isAlive()) {
- startMessageProcessor();
+ try {
+ processMessage(msg,sender);
+ } catch (Exception e) {
+ log.error(e);
}
}
- private void startMessageProcessor() {
- messageProcessor = new Thread(new MessageProcessor(), "ClusteringInComingMessageProcessor");
- messageProcessor.setDaemon(true);
- messageProcessor.setPriority(Thread.MAX_PRIORITY);
- messageProcessor.start();
- }
-
- /**
- * A container to hold a message and its sender
- */
- private class MemberMessage {
- private Serializable message;
- private Member sender;
-
- public MemberMessage(Serializable msg, Member sender) {
- this.message = msg;
- this.sender = sender;
- }
-
- public Serializable getMessage() {
- return message;
- }
-
- public Member getSender() {
- return sender;
- }
- }
+ private void processMessage(Serializable msg, Member sender) throws ClusteringFault {
+ if (msg instanceof ContextClusteringCommand && contextManager != null) {
+ ContextClusteringCommand ctxCmd = (ContextClusteringCommand) msg;
+ contextManager.process(ctxCmd);
+
+ // Sending ACKs for ContextClusteringCommandCollection or
+ // UpdateContextCommand is sufficient
+ if (msg instanceof ContextClusteringCommandCollection ||
+ msg instanceof UpdateContextCommand) {
+ AckCommand ackCmd = new AckCommand(ctxCmd.getUniqueId());
- /**
- * A processor which continuously polls for messages in the cmdQueue and processes them
- */
- private class MessageProcessor implements Runnable {
- public void run() {
- while (true) {
- MemberMessage memberMessage = null;
- try {
- if (!cmdQueue.isEmpty()) {
- memberMessage = (MemberMessage) cmdQueue.dequeue();
- } else {
- Thread.sleep(1);
- continue;
- }
-
- Serializable msg = memberMessage.getMessage();
- if (msg instanceof ContextClusteringCommand && contextManager != null) {
- ContextClusteringCommand ctxCmd = (ContextClusteringCommand) msg;
- contextManager.process(ctxCmd);
-
- // Sending ACKs for ContextClusteringCommandCollection or
- // UpdateContextCommand is sufficient
- if (msg instanceof ContextClusteringCommandCollection ||
- msg instanceof UpdateContextCommand) {
- AckCommand ackCmd = new AckCommand(ctxCmd.getUniqueId());
-
- // Send the ACK
- sender.sendToMember(ackCmd, memberMessage.getSender());
- }
- } else if (msg instanceof ConfigurationClusteringCommand &&
- configurationManager != null) {
- configurationManager.process((ConfigurationClusteringCommand) msg);
- } else if (msg instanceof ControlCommand && controlCommandProcessor != null) {
- controlCommandProcessor.process((ControlCommand) msg,
- memberMessage.getSender());
- }
- } catch (Throwable e) {
- log.error("Could not process message ", e);
- }
+ // Send the ACK
+ this.channelSender.sendToMember(ackCmd, sender);
}
+ } else if (msg instanceof ConfigurationClusteringCommand &&
+ configurationManager != null) {
+ configurationManager.process((ConfigurationClusteringCommand) msg);
+ } else if (msg instanceof ControlCommand && controlCommandProcessor != null) {
+ controlCommandProcessor.process((ControlCommand) msg,
+ sender);
}
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java Wed Jun 27 09:45:37 2007
@@ -28,17 +28,21 @@
private Log log = LogFactory.getLog(ChannelSender.class);
private Channel channel;
- public void sendToGroup(ClusteringCommand msg) throws ClusteringFault {
+ public long sendToGroup(ClusteringCommand msg) throws ClusteringFault {
if (channel == null) {
- return;
+ return 0;
}
+ long timeToSend = 0;
// Keep retrying, since at the point of trying to send the msg, a member may leave the group
// causing a view change. All nodes in a view should get the msg
+ //TODO: Sometimes Tribes ncorrectly detects that a member has left a group
while (true) {
if (channel.getMembers().length > 0) {
try {
- channel.send(channel.getMembers(), msg, 0);
+ long start = System.currentTimeMillis();
+ channel.send(channel.getMembers(), msg, Channel.SEND_OPTIONS_USE_ACK);
+ timeToSend = System.currentTimeMillis() - start;
log.debug("Sent " + msg + " to group");
break;
} catch (ChannelException e) {
@@ -50,6 +54,7 @@
break;
}
}
+ return timeToSend;
}
public void sendToSelf(ClusteringCommand msg) throws ClusteringFault {
@@ -59,23 +64,27 @@
try {
channel.send(new Member[]{channel.getLocalMember(true)},
msg,
- 0);
+ Channel.SEND_OPTIONS_USE_ACK);
log.debug("Sent " + msg + " to self");
} catch (ChannelException e) {
throw new ClusteringFault(e);
}
}
- public void sendToGroup(Throwable throwable) throws ClusteringFault {
+ public long sendToGroup(Throwable throwable) throws ClusteringFault {
if (channel == null) {
- return;
+ return 0;
}
+ long timeToSend = 0;
+
// Keep retrying, since at the point of trying to send the msg, a member may leave the group
while (true) {
if (channel.getMembers().length > 0) {
try {
- channel.send(channel.getMembers(), throwable, 0);
+ long start = System.currentTimeMillis();
+ channel.send(channel.getMembers(), throwable, Channel.SEND_OPTIONS_USE_ACK);
+ timeToSend = System.currentTimeMillis() - start;
log.debug("Sent " + throwable + " to group");
} catch (ChannelException e) {
String message = "Error sending exception message : " + throwable +
@@ -86,12 +95,16 @@
break;
}
}
+ return timeToSend;
}
- public void sendToMember(ClusteringCommand cmd, Member member) throws ClusteringFault {
+ public long sendToMember(ClusteringCommand cmd, Member member) throws ClusteringFault {
+ long timeToSend = 0;
try {
if (member.isReady()) {
- channel.send(new Member[]{member}, cmd, 0);
+ long start = System.currentTimeMillis();
+ channel.send(new Member[]{member}, cmd, Channel.SEND_OPTIONS_USE_ACK);
+ timeToSend = System.currentTimeMillis() - start;
log.debug("Sent " + cmd + " to " + TribesUtil.getHost(member));
}
} catch (ChannelException e) {
@@ -99,6 +112,7 @@
". Reason " + e.getMessage();
log.warn(message);
}
+ return timeToSend;
}
public Channel getChannel() {
Modified: webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java Wed Jun 27 09:45:37 2007
@@ -25,6 +25,7 @@
import org.apache.axis2.clustering.configuration.DefaultConfigurationManager;
import org.apache.axis2.clustering.context.ContextManager;
import org.apache.axis2.clustering.context.DefaultContextManager;
+import org.apache.axis2.clustering.context.ClusteringContextListener;
import org.apache.axis2.clustering.control.GetStateCommand;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.Parameter;
@@ -116,9 +117,10 @@
mcastProps.setProperty("tcpListenPort", "4000");
mcastProps.setProperty("tcpListenHost", "127.0.0.1");*/
-// TcpFailureDetector tcpFailureDetector = new TcpFailureDetector();
-// tcpFailureDetector.setPrevious(nbc);
-// channel.addInterceptor(tcpFailureDetector);
+ /*TcpFailureDetector tcpFailureDetector = new TcpFailureDetector();
+ tcpFailureDetector.setPrevious(nbc);
+ channel.addInterceptor(tcpFailureDetector);
+ tcpFailureDetector.*/
channel.addChannelListener(channelListener);
TribesMembershipListener membershipListener = new TribesMembershipListener();
@@ -152,13 +154,16 @@
int memberIndex = random.nextInt(members.length);
Member member = members[memberIndex];
if (!sentMembersList.contains(TribesUtil.getHost(member))) {
- sender.sendToMember(new GetStateCommand(), member);
+ long tts = sender.sendToMember(new GetStateCommand(), member);
+ configurationContext.
+ setNonReplicableProperty(ClusteringConstants.TIME_TO_SEND,
+ new Long(tts));
sentMembersList.add(TribesUtil.getHost(member));
log.debug("WAITING FOR STATE UPDATE...");
- Thread.sleep(1000);
+ Thread.sleep(tts + 5);
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error(e);
break;
}
numberOfTries ++;
@@ -166,6 +171,9 @@
configurationContext.
setNonReplicableProperty(ClusteringConstants.CLUSTER_INITIALIZED,
"true");
+ ClusteringContextListener contextListener = new ClusteringContextListener();
+ //TODO: May need to set the context listener somewhere to be useful
+ configurationContext.addContextListener(contextListener);
}
} catch (ChannelException e) {
String message = "Error starting Tribes channel";
@@ -238,12 +246,5 @@
if (channelListener != null) {
channelListener.setConfigurationContext(configurationContext);
}
- }
-
- public int getMemberCount() {
- if (channel != null) {
- return channel.getMembers().length;
- }
- return 0;
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/codegen-config.properties Wed Jun 27 09:45:37 2007
@@ -59,7 +59,7 @@
# Language types - these are the language types that the code generator understands. Again this is the name of the
# language that should be passed from the tool as well
#
-codegen.languages=java,c-sharp,c
+codegen.languages=java,c
# Emitter class is the major code generator class that should be changed according to the language.
# The emiiters need to implement the org.apache.axis2.wsdl.codegen.emitter.Emitter interface
# Note - The emitters should appear in the lexical order of the languages. So the language java in the above
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Wed Jun 27 09:45:37 2007
@@ -65,6 +65,7 @@
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
+import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -2126,6 +2127,11 @@
addAttribute(doc, "mep", Utils.getAxisSpecifMEPConstant(messageExchangePattern) + "",
methodElement);
addAttribute(doc, "mepURI", messageExchangePattern, methodElement);
+ Parameter wsdl2StyleParameter = axisOperation.getParameter(WSDL2Constants.OPERATION_STYLE);
+ if (wsdl2StyleParameter != null) {
+ // provide WSDL2 styles to allow templates to take advantage of them, if desired
+ addAttribute(doc, "wsdl2Styles", arrayToString((URI[])wsdl2StyleParameter.getValue()), methodElement);
+ }
// check for this operation to be handled directly by databinding code generation
Parameter dbmethname = axisOperation.getParameter(Constants.DATABINDING_GENERATED_RECEIVER);
@@ -2295,6 +2301,28 @@
}
return methodElement;
+ }
+
+ /**
+ * Returns a comma-separated list of the string representations of the array elements.
+ * @param array the array to be processed
+ * @return the empty string "" if array is null or empty, the array element if size is 1,
+ * or a comma-separated list when size > 1.
+ */
+ private String arrayToString(Object[] array) {
+ if (array == null || array.length == 0) {
+ return "";
+ }
+ int size = array.length;
+ if (size == 1) {
+ return String.valueOf(array[0]);
+ }
+ StringBuffer result = new StringBuffer(String.valueOf(array[0]));
+ for (int i=1; i<size; i++) {
+ result.append(",");
+ result.append(String.valueOf(array[i]));
+ }
+ return result.toString();
}
/**
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl Wed Jun 27 09:45:37 2007
@@ -12,7 +12,7 @@
<service>
<xsl:attribute name="name"><xsl:value-of select="@servicename"/></xsl:attribute>
- <parameter name="ServiceClass" locked="false">
+ <parameter name="ServiceClass">
<xsl:value-of select="@servicename"/>
</parameter>
<xsl:for-each select="method">
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl Wed Jun 27 09:45:37 2007
@@ -32,7 +32,7 @@
</xsl:for-each>
</messageReceivers>
- <parameter name="ServiceClass" locked="false">
+ <parameter name="ServiceClass">
<xsl:choose>
<xsl:when test="$package=''">
<xsl:value-of select="@name"/>
@@ -42,8 +42,8 @@
</xsl:otherwise>
</xsl:choose>
</parameter>
- <parameter name="useOriginalwsdl" locked="false">true</parameter>
- <parameter name="modifyUserWSDLPortAddress" locked="false">true</parameter>
+ <parameter name="useOriginalwsdl">true</parameter>
+ <parameter name="modifyUserWSDLPortAddress">true</parameter>
<xsl:for-each select="method">
<operation>
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Wed Jun 27 09:45:37 2007
@@ -122,11 +122,22 @@
}
+ /**
+ *Constructor that takes in a configContext
+ */
+
+ public <xsl:value-of select="@name"/>(org.apache.axis2.context.ConfigurationContext configurationContext,
+ java.lang.String targetEndpoint)
+ throws org.apache.axis2.AxisFault {
+ this(configurationContext,targetEndpoint,false);
+ }
+
+
/**
- Constructor that takes in a configContext
- */
+ * Constructor that takes in a configContext and useseperate listner
+ */
public <xsl:value-of select="@name"/>(org.apache.axis2.context.ConfigurationContext configurationContext,
- java.lang.String targetEndpoint)
+ java.lang.String targetEndpoint, boolean isUseSeperateListner)
throws org.apache.axis2.AxisFault {
//To populate AxisService
populateAxisService();
@@ -141,6 +152,7 @@
_serviceClient.getOptions().setTo(new org.apache.axis2.addressing.EndpointReference(
targetEndpoint));
+ _serviceClient.getOptions().setUseSeparateListener(isUseSeperateListner);
<xsl:if test="starts-with($soapVersion,'http://www.w3.org/2003/05/soap-envelope')">
//Set the soap version
_serviceClient.getOptions().setSoapVersionURI(org.apache.axiom.soap.SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
Modified: webservices/axis2/branches/java/jaxws21/modules/codegen/test-resources/xmls/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/codegen/test-resources/xmls/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/codegen/test-resources/xmls/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/codegen/test-resources/xmls/axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,12 +2,12 @@
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
- <parameter name="enableMTOM" locked="false">false</parameter>
+ <parameter name="enableMTOM">false</parameter>
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
+ <parameter name="userName">admin</parameter>
+ <parameter name="password">axis2</parameter>
- <parameter name="seralizeLocation" locked="false">.</parameter>
+ <parameter name="seralizeLocation">.</parameter>
<!-- ================================================= -->
<!-- Message Receivers -->
@@ -30,16 +30,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
Modified: webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test-resources/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/fastinfoset/test-resources/axis2.xml Wed Jun 27 09:45:37 2007
@@ -267,11 +267,11 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
<order phase="Transport"/>
</handler>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
<order phase="Transport"/>
</handler>
</phase>
@@ -279,15 +279,15 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -308,21 +308,21 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/conf/axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,45 +2,45 @@
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">false</parameter>
- <parameter name="enableSwA" locked="false">false</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">false</parameter>
+ <parameter name="enableMTOM">false</parameter>
+ <parameter name="enableSwA">false</parameter>
<!--Uncomment if you want to enable file caching for attachments -->
- <!--parameter name="cacheAttachments" locked="false">true</parameter>
- <parameter name="attachmentDIR" locked="false"></parameter>
- <parameter name="sizeThreshold" locked="false">4000</parameter-->
+ <!--parameter name="cacheAttachments">true</parameter>
+ <parameter name="attachmentDIR"></parameter>
+ <parameter name="sizeThreshold">4000</parameter-->
<!--This will give out the timout of the configuration contexts, in seconds-->
- <parameter name="ConfigContextTimeoutInterval" locked="false">30</parameter>
+ <parameter name="ConfigContextTimeoutInterval">30</parameter>
<!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
<!--that behaviour.-->
- <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
+ <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
<!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
<!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
<!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
<!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
- <parameter name="DrillDownToRootCauseForFaultReason" locked="false">false</parameter>
+ <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
+ <parameter name="userName">admin</parameter>
+ <parameter name="password">axis2</parameter>
<!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
<!--root which can configured using the following contextRoot parameter-->
- <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->
+ <!--<parameter name="contextRoot">axis2</parameter>-->
<!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distingiush those endpoints-->
<!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
<!--context path to proper Axis2 servlets-->
- <!--<parameter name="servicePath" locked="false">services</parameter>-->
- <!--<parameter name="restPath" locked="false">rest</parameter>-->
+ <!--<parameter name="servicePath">services</parameter>-->
+ <!--<parameter name="restPath">rest</parameter>-->
<!--Set the flag to true if you want to enable transport level session mangment-->
- <parameter name="manageTransportSession" locked="false">false</parameter>
+ <parameter name="manageTransportSession">false</parameter>
<!--Following two parameters will be used to handle REST in Axis2. The default settings will make Axis2 to have two-->
<!--different endpoints, one for REST (AxisRESTServlet) one for SOAP message handling (AxisServlet). But following-->
@@ -57,12 +57,12 @@
<!-- If you have a frontend host which exposes this webservice using a different public URL -->
<!-- use this parameter to override autodetected url -->
- <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
+ <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
<!-- The way of adding listener to the system-->
<!-- <listener class="org.apache.axis2.ObserverIMPL">-->
- <!-- <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+ <!-- <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
<!-- </listener>-->
<!-- ================================================= -->
@@ -83,7 +83,7 @@
<!-- ================================================= -->
<transportReceiver name="http"
class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
<!-- Here is the complete list of supported parameters (see example settings further below):
port: the port to listen on (default 6060)
hostname: if non-null, url prefix used in reply-to endpoint references (default null)
@@ -98,52 +98,52 @@
note that no such threads can exist with default unbounded request queue
threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default SECONDS) (default SECONDS)
-->
- <!-- <parameter name="hostname" locked="false">http://www.myApp.com/ws</parameter> -->
- <!-- <parameter name="originServer" locked="false">My-Server/1.1</parameter> -->
- <!-- <parameter name="requestTimeout" locked="false">10000</parameter> -->
- <!-- <parameter name="requestTcpNoDelay" locked="false">false</parameter> -->
- <!-- <parameter name="requestCoreThreadPoolSize" locked="false">50</parameter> -->
- <!-- <parameter name="RequestMaxThreadPoolSize" locked="false">100</parameter> -->
- <!-- <parameter name="threadKeepAliveTime" locked="false">240000</parameter> -->
- <!-- <parameter name="threadKeepAliveTimeUnit" locked="false">MILLISECONDS</parameter> -->
+ <!-- <parameter name="hostname" >http://www.myApp.com/ws</parameter> -->
+ <!-- <parameter name="originServer" >My-Server/1.1</parameter> -->
+ <!-- <parameter name="requestTimeout" >10000</parameter> -->
+ <!-- <parameter name="requestTcpNoDelay" >false</parameter> -->
+ <!-- <parameter name="requestCoreThreadPoolSize">50</parameter> -->
+ <!-- <parameter name="RequestMaxThreadPoolSize" >100</parameter> -->
+ <!-- <parameter name="threadKeepAliveTime" >240000</parameter> -->
+ <!-- <parameter name="threadKeepAliveTimeUnit" >MILLISECONDS</parameter> -->
</transportReceiver>
<!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
<transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
- <parameter name="myTopicConnectionFactory" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+ <parameter name="myTopicConnectionFactory">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
</parameter>
- <parameter name="myQueueConnectionFactory" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ <parameter name="myQueueConnectionFactory">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
</parameter>
- <parameter name="default" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ <parameter name="default">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
</parameter>
</transportReceiver>-->
<!--Uncomment if you want to have SMTP transport support-->
<!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
- <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
- <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
- <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
- <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
- <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
+ <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
+ <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
+ <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
<!--</transportReceiver>-->
<transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
<!--If you want to give your own host address for EPR generation-->
<!--uncommet following paramter , and set as you required.-->
- <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+ <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
</transportReceiver>
<!-- ================================================= -->
@@ -156,23 +156,23 @@
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding">chunked</parameter>
</transportSender>
<transportSender name="https"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding">chunked</parameter>
</transportSender>
<transportSender name="jms"
class="org.apache.axis2.transport.jms.JMSSender"/>
<!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
<transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user">axis2</parameter>
+ <parameter name="transport.mail.smtp.password">axis2</parameter>
+ <parameter name="transport.mail.smtp.port">25</parameter>
</transportSender>
-->
@@ -184,7 +184,7 @@
<!--Configuring module , providing parameters for modules whether they refer or not-->
<moduleConfig name="addressing">
- <parameter name="includeOptionalHeaders" locked="false">true</parameter>
+ <parameter name="includeOptionalHeaders">true</parameter>
</moduleConfig>
<!-- ================================================= -->
@@ -194,11 +194,11 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
<order phase="Transport"/>
</handler>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
<order phase="Transport"/>
</handler>
</phase>
@@ -206,11 +206,11 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<phase name="RMPhase"/>
<!-- System pre defined phases -->
@@ -231,18 +231,18 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<phase name="RMPhase"/>
<!-- user can add his own phases to this area -->
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/itest-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/itest-build.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/itest-build.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/itest-build.xml Wed Jun 27 09:45:37 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<project name="itest" default="build-repos" basedir=".">
<target name="rpc-wsdl-codegen">
<echo>Running codegen RPC WSDLs - take 1</echo>
@@ -109,8 +109,8 @@
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcUW"
target="jar.server"/>
</target>
-
- <target name="build-repos">
+
+ <target name="build-repos">
<mkdir dir="target/test-resources/samples/modules"/>
<mkdir dir="target/test-resources/samples/conf"/>
<mkdir dir="target/test-resources/repository-client/modules"/>
@@ -225,13 +225,42 @@
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/SwA-fileCache-enabledRepository/modules/addressing-${addressing_version}.mar"/>
+
+ <mkdir dir="target/sample/groovy"/>
+ <mkdir dir="target/sample/groovy/lib"/>
+ <mkdir dir="target/sample/groovy/META-INF"/>
+ <mkdir dir="target/sample/groovy/sample"/>
+ <mkdir dir="target/sample/groovy/sample/groovy"/>
+
+ <copy file="../samples/deprecated/groovy/src/sample/groovy/GroovyRcv.groovy"
+ tofile="target/sample/groovy/GroovyRcv.groovy"/>
+
+ <javac fork="true" destdir="target/classes" debug="on">
+ <classpath refid="maven.dependency.classpath"/>
+ <src path="../samples/deprecated/groovy/src/sample/groovy"/>
+ </javac>
+ <copy file="target/classes/sample/groovy/GroovyReceiver.class"
+ tofile="target/sample/groovy/sample/groovy/GroovyReceiver.class"/>
+ <delete file="target/classes/sample/groovy/GroovyReceiver.class"/>
+
+ <copy file="../samples/deprecated/groovy/src/sample/groovy/META-INF/services.xml"
+ tofile="target/sample/groovy/META-INF/services.xml"/>
+
+ <copy todir="target/sample/groovy/lib/" flatten="true">
+ <fileset dir="${maven.repo.local}/groovy/" includes="**/groovy-all-${groovy.all.version}.jar"/>
+ </copy>
+
<!-- Groovy repository -->
<mkdir dir="target/groovyRepo"/>
<mkdir dir="target/groovyRepo/conf"/>
<mkdir dir="target/groovyRepo/services"/>
<mkdir dir="target/groovyRepo/modules"/>
- <copy file="../samples/target/groovy/groovyService.aar"
- tofile="target/groovyRepo/services/groovyService.aar"/>
+
+ <jar destfile="target/groovyRepo/services/groovyService.aar">
+ <fileset dir="target/sample/groovy">
+ </fileset>
+ </jar>
+
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/groovyRepo/modules/addressing-${addressing_version}.mar"/>
<copy file="conf/axis2.xml"
@@ -278,7 +307,7 @@
<mkdir dir="target/perf/build/repo/modules"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
- tofile="target/perf/build/repo/modules/addressing-${addressing_version}.mar"/>
+ tofile="target/perf/build/repo/modules/addressing-${addressing_version}.mar"/>
</target>
<target name="build-soap12-services">
<ant antfile="build.xml" inheritall="true" inheritrefs="true"
@@ -289,5 +318,5 @@
dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
<ant antfile="build.xml" inheritall="true" inheritrefs="true"
dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
- </target>
-</project>
+ </target>
+</project>
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/pom.xml Wed Jun 27 09:45:37 2007
@@ -32,91 +32,199 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-clustering</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxbri</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws-api</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<version>${version}</version>
<artifactId>axis2-jaxws</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<version>${version}</version>
<artifactId>axis2-jibx</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-json</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-metadata</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mtompolicy</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj-api</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-spring</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-xmlbeans</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -154,8 +262,18 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apache-activemq</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
@@ -191,11 +309,11 @@
<groupId>javax.xml</groupId>
</exclusion>
</exclusions>
- </dependency>
- <dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.all.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.all.version}</version>
</dependency>
</dependencies>
<profiles>
@@ -280,8 +398,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.4</source>
+ <target>1.4</target>
</configuration>
</plugin>
<plugin>
@@ -302,7 +420,7 @@
<tasks>
<!-- Set a property that can be picked up from the ant build.xml's -->
<property name="maven.class.path" refid="maven.runtime.classpath"/>
- <property name="maven.test.path" refid="maven.compile.classpath"/>
+ <property name="maven.test.path" refid="maven.compile.classpath"/>
<echo>${maven.test.path}</echo>
<!-- copy the mars so that they are available on the test classpath -->
<copy file="../addressing/target/addressing-${version}.mar"
@@ -319,8 +437,22 @@
<!-- make the dirs -->
<mkdir dir="${wsdl.output.base.dir}"/>
+ <echo>Compiling ComplexDataTypes.wsdl</echo>
+ <mkdir dir="${wsdl.output.base.dir}/complexdatatype"/>
+
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.runtime.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg line="-o target/wsdl/complexdatatype -s -u -uw -uri test-resources/ComplexDataTypes/ComplexDataTypes.wsdl"/>
+ </java>
+ <javac fork="true" destdir="target/classes" debug="on">
+ <classpath refid="maven.runtime.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <src path="target/wsdl/complexdatatype"/>
+ </javac>
+
<echo>Compiling DocumentUnwrappingTest.wsdl</echo>
- <mkdir dir="${wsdl.output.base.dir}/documentunwrapping"/>
+ <mkdir dir="${wsdl.output.base.dir}/documentunwrapping"/>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.runtime.classpath"/>
@@ -370,7 +502,13 @@
<configuration>
<tasks>
<property name="addressing_version" value="${version}"/>
- <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
+ <property name="groovy.all.version" value="${groovy.all.version}"/>
+ <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+ <path id="maven.dependency.classpath">
+ <path refid="maven.compile.classpath"/>
+ <path refid="maven.runtime.classpath"/>
+ </path>
+ <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
dir="." target="build-repos"/>
</tasks>
</configuration>
@@ -384,10 +522,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
-
- <!-- The pertest forkMode is not ideal but seems to be necessary
- because the test server doesn't shut down properly :-(
+ <skip>false</skip>
+
+ <!-- The pertest forkMode is not ideal but seems to be necessary
+ because the test server doesn't shut down properly :-(
Should be removed if possible -->
<forkMode>pertest</forkMode>
<argLine>-Xms256m -Xmx512m</argLine>
@@ -419,11 +557,11 @@
</plugins>
</build>
<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>
</project>
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test-resources/ComplexDataTypes/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,5 +3,5 @@
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
</messageReceivers>
- <parameter name="ServiceClass" locked="false">org.tempuri.complex.ComplexDataTypes</parameter>
+ <parameter name="ServiceClass">org.tempuri.complex.ComplexDataTypes</parameter>
</service>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org