November 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5161 - in stack/native/trunk/src: main/java/org/jboss/ws/core/client and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-11-30 16:50:09 -0500 (Fri, 30 Nov 2007) New Revision: 5161 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceManager.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannel.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelRequest.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java stack/native/trunk/src/test/resources/jaxws/wsrm/emulator/reqres/config/req-res-service-config.xml Log: adding support for sequence acknowledgement Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -355,7 +355,9 @@ // Get the return object Object retObj = null; boolean isWsrmMessage = msgContext.get(RMConstant.REQUEST_CONTEXT) != null; - if ((oneway == false && handlerPass) || isWsrmMessage) + Boolean wsrmOneWay = (Boolean)((Map<String, Object>)msgContext.get(RMConstant.REQUEST_CONTEXT)).get(RMConstant.ONE_WAY_OPERATION); + wsrmOneWay = wsrmOneWay == null ? Boolean.FALSE : wsrmOneWay.booleanValue(); + if ((oneway == false && handlerPass) || (wsrmOneWay == false)) { // Verify if (binding instanceof CommonSOAPBinding) Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -196,7 +196,7 @@ { if (RMTransportHelper.isRMMessage(callProps)) { - RMMetadata rmMetadata = new RMMetadata(targetAddress, oneway, marshaller, unmarshaller, callProps, metadata, clientConfig); + RMMetadata rmMetadata = new RMMetadata(targetAddress, marshaller, unmarshaller, callProps, metadata, clientConfig); return RM_CHANNEL.send(reqMessage, rmMetadata); } else Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -23,7 +23,6 @@ // $Id$ -import java.net.URI; import java.rmi.RemoteException; import java.util.HashMap; import java.util.HashSet; @@ -73,7 +72,6 @@ import org.jboss.ws.extensions.wsrm.RMSequenceImpl; import org.jboss.ws.extensions.wsrm.api.RMAddressingType; import org.jboss.ws.extensions.wsrm.api.RMException; -import org.jboss.ws.extensions.wsrm.api.RMSequenceType; import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.extensions.wsrm.spi.RMConstants; import org.jboss.ws.extensions.wsrm.spi.RMProvider; @@ -270,7 +268,7 @@ public Object invoke(QName opName, Object[] args, Map<String, Object> resContext) throws RemoteException { this.wsrmLock.lock(); - + try { // Associate a message context with the current thread @@ -339,23 +337,26 @@ if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false) { Map<String, Object> wsrmResCtx = (Map<String, Object>) msgContext.get(RMConstant.RESPONSE_CONTEXT); - RMConstants wsrmConstants = RMProvider.get().getConstants(); - Map<QName, RMSerializable> mapping = (Map<QName, RMSerializable>)wsrmResCtx.get(RMConstant.PROTOCOL_MESSAGES_MAPPING); - QName seqAck = wsrmConstants.getSequenceAcknowledgementQName(); - if (mapping.keySet().contains(seqAck)) + if (wsrmResCtx != null) { - RMHelper.handleSequenceAcknowledgementHeader((RMSequenceAcknowledgement)mapping.get(seqAck), this.wsrmSequence); + RMConstants wsrmConstants = RMProvider.get().getConstants(); + Map<QName, RMSerializable> mapping = (Map<QName, RMSerializable>)wsrmResCtx.get(RMConstant.PROTOCOL_MESSAGES_MAPPING); + QName seq = wsrmConstants.getSequenceQName(); + if (mapping.keySet().contains(seq)) + { + RMHelper.handleSequenceHeader((RMSequence)mapping.get(seq), this.wsrmSequence); + } + QName seqAck = wsrmConstants.getSequenceAcknowledgementQName(); + if (mapping.keySet().contains(seqAck)) + { + RMHelper.handleSequenceAcknowledgementHeader((RMSequenceAcknowledgement)mapping.get(seqAck), this.wsrmSequence); + } + QName ackReq = wsrmConstants.getAckRequestedQName(); + if (mapping.keySet().contains(ackReq)) + { + RMHelper.handleAckRequestedHeader((RMAckRequested)mapping.get(ackReq), this.wsrmSequence); + } } - QName seq = wsrmConstants.getSequenceQName(); - if (mapping.keySet().contains(seq)) - { - RMHelper.handleSequenceHeader((RMSequence)mapping.get(seq), this.wsrmSequence); - } - QName ackReq = wsrmConstants.getAckRequestedQName(); - if (mapping.keySet().contains(ackReq)) - { - RMHelper.handleAckRequestedHeader((RMAckRequested)mapping.get(ackReq), this.wsrmSequence); - } } } } @@ -526,22 +527,20 @@ // WS-RM support // /////////////////// @SuppressWarnings("unchecked") - public org.jboss.ws.extensions.wsrm.api.RMSequence createSequence(RMAddressingType addrType, RMSequenceType seqType) throws RMException + public org.jboss.ws.extensions.wsrm.api.RMSequence createSequence(RMAddressingType addrType) throws RMException { this.getWSRMLock().lock(); try { if (this.wsrmSequence != null) throw new IllegalStateException("Sequence already registered with proxy instance"); - if (seqType == null) - throw new IllegalArgumentException("Sequence type cannot be null"); if (addrType == null) throw new IllegalArgumentException("Addressing type cannot be null"); try { // set up addressing data - RMSequenceImpl candidateSequence = new RMSequenceImpl(addrType, seqType, getEndpointMetaData().getConfig().getRMMetaData()); + RMSequenceImpl candidateSequence = new RMSequenceImpl(addrType, getEndpointMetaData().getConfig().getRMMetaData()); String address = getEndpointMetaData().getEndpointAddress(); String action = RMConstant.CREATE_SEQUENCE_WSA_ACTION; AddressingProperties addressingProps = null; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -22,6 +22,7 @@ package org.jboss.ws.extensions.wsrm; import java.util.HashMap; +import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -167,11 +168,31 @@ // try to serialize terminateSequenceResponse to message RMTerminateSequenceResponse terminateSequenceResponse = rmFactory.newTerminateSequenceResponse(); terminateSequenceResponse.setIdentifier(sequenceImpl.getOutboundId()); + terminateSequenceResponse.serializeTo(soapMessage); data.put(msgQName, terminateSequenceResponse); log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); } - // TODO: implement SequenceAcknowledgement handler part + msgQName = rmConstants.getSequenceAcknowledgementQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize SequenceAcknowledgement to message + RMSequenceAcknowledgement sequenceAcknowledgement = rmFactory.newSequenceAcknowledgement(); + sequenceAcknowledgement.setIdentifier(sequenceImpl.getInboundId()); + Iterator<Long> receivedInboudMessages = sequenceImpl.getReceivedInboundMessages().iterator(); + while (receivedInboudMessages.hasNext()) + { + long messageNo = receivedInboudMessages.next(); + RMSequenceAcknowledgement.RMAcknowledgementRange range = sequenceAcknowledgement.newAcknowledgementRange(); + range.setLower(messageNo); + range.setUpper(messageNo); + sequenceAcknowledgement.addAcknowledgementRange(range); + } + sequenceAcknowledgement.serializeTo(soapMessage); + data.put(msgQName, sequenceAcknowledgement); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + // TODO: implement SequenceFault serialization return true; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -45,7 +45,7 @@ RMConstants constants = RMProvider.get().getConstants(); temp.add(constants.getSequenceQName()); temp.add(constants.getSequenceFaultQName()); - temp.add(constants.getAcknowledgementRangeQName()); + temp.add(constants.getSequenceAcknowledgementQName()); temp.add(constants.getAckRequestedQName()); temp.add(constants.getCreateSequenceQName()); temp.add(constants.getCreateSequenceResponseQName()); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -23,6 +23,7 @@ import java.net.URI; import java.net.URISyntaxException; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -32,10 +33,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.addressing.AddressingBuilder; import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.JAXWSAConstants; @@ -43,11 +43,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.extensions.addressing.AddressingClientUtil; +import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.api.RMAddressingType; import org.jboss.ws.extensions.wsrm.api.RMException; import org.jboss.ws.extensions.wsrm.api.RMSequence; -import org.jboss.ws.extensions.wsrm.api.RMSequenceType; -import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.spi.RMConstants; import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.extensions.wsrm.spi.protocol.RMIncompleteSequenceBehavior; @@ -68,7 +67,6 @@ private static final RMConstants wsrmConstants = RMProvider.get().getConstants(); private final RMConfig wsrmConfig; - private final RMSequenceType sequenceType; private final RMAddressingType addrType; private final Set<Long> acknowledgedOutboundMessages = new TreeSet<Long>(); private final Set<Long> receivedInboundMessages = new TreeSet<Long>(); @@ -85,7 +83,7 @@ private boolean isFinal; private boolean inboundMessageAckRequested; private AtomicLong messageNumber = new AtomicLong(); - private final Lock objectLock = new ReentrantLock(); + private final Object lock = new Object(); private AtomicInteger countOfUnassignedMessagesAvailable = new AtomicInteger(); public void unassignedMessageReceived() @@ -96,14 +94,13 @@ logger.debug("Unassigned message available in callback handler"); } - public RMSequenceImpl(RMAddressingType addrType, RMSequenceType sequenceType, RMConfig wsrmConfig) + public RMSequenceImpl(RMAddressingType addrType, RMConfig wsrmConfig) { super(); - if ((addrType == null) || (sequenceType == null) || (wsrmConfig == null)) + if ((addrType == null) || (wsrmConfig == null)) throw new IllegalArgumentException(); this.addrType = addrType; - this.sequenceType = sequenceType; this.wsrmConfig = wsrmConfig; try { @@ -115,135 +112,132 @@ } } + public final Set<Long> getReceivedInboundMessages() + { + synchronized (lock) + { + return Collections.unmodifiableSet(this.receivedInboundMessages); + } + } + + public final BindingProvider getBindingProvider() + { + synchronized (lock) + { + return (BindingProvider)this.client; + } + } + public final void setFinal() { - this.objectLock.lock(); - try + synchronized (lock) { this.isFinal = true; logger.debug("Sequence " + this.outgoingSequenceId + " state changed to final"); } - finally + } + + public final void ackRequested(boolean requested) + { + synchronized (lock) { - this.objectLock.unlock(); + this.inboundMessageAckRequested = requested; + logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages); } } - public final void ackRequested() + public final boolean isAckRequested() { - this.objectLock.lock(); - try + synchronized (lock) { - this.inboundMessageAckRequested = true; - logger.debug("Sequence " + this.incomingSequenceId + " ack requested. Messages in the queue: " + this.receivedInboundMessages); + return this.inboundMessageAckRequested; } - finally - { - this.objectLock.unlock(); - } } public final void addReceivedInboundMessage(long messageId) { - this.objectLock.lock(); - try + synchronized (lock) { this.receivedInboundMessages.add(messageId); logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", received message no. " + messageId); } - finally - { - this.objectLock.unlock(); - } } public final void addReceivedMessage(long messageId) { - this.objectLock.lock(); - try + synchronized (lock) { this.acknowledgedOutboundMessages.add(messageId); - logger.debug("Message no. " + messageId + " of sequence: " + this.outgoingSequenceId + " acknowledged by server"); + logger.debug("Outbound Sequence: " + this.outgoingSequenceId + ", message no. " + messageId + " acknowledged by server"); } - finally - { - this.objectLock.unlock(); - } } public final void setOutboundId(String outboundId) { - this.objectLock.lock(); - try + synchronized (lock) { this.outgoingSequenceId = outboundId; } - finally - { - this.objectLock.unlock(); - } } public final void setInboundId(String inboundId) { - this.objectLock.lock(); - try + synchronized (lock) { this.incomingSequenceId = inboundId; } - finally - { - this.objectLock.unlock(); - } } public final void setClient(ClientImpl client) { - this.objectLock.lock(); - try + synchronized (lock) { this.client = client; RMSequenceManager.getInstance().register(this); } - finally - { - this.objectLock.unlock(); - } } public final void setDuration(long duration) { - if (duration > 0) + synchronized (lock) { - this.creationTime = System.currentTimeMillis(); - this.duration = duration; + if (duration > 0) + { + this.creationTime = System.currentTimeMillis(); + this.duration = duration; + } } } public final long getDuration() { - return -1L; + synchronized (lock) + { + return this.duration; + } } public final URI getBackPort() { + // no need for synchronization return (this.addrType == RMAddressingType.ADDRESSABLE) ? this.backPort : null; } public final long newMessageNumber() { + // no need for synchronization return this.messageNumber.incrementAndGet(); } public final long getLastMessageNumber() { + // no need for synchronization return this.messageNumber.get(); } public final void discard() throws RMException { - this.objectLock.lock(); - try + synchronized (lock) { this.client.getWSRMLock().lock(); try @@ -257,23 +251,17 @@ this.client.getWSRMLock().unlock(); } } - finally - { - this.objectLock.unlock(); - } } public final void close() throws RMException { - this.objectLock.lock(); - try + synchronized (lock) { if (this.terminated) return; this.terminated = true; - client.getWSRMLock().lock(); try { sendCloseMessage(); @@ -281,20 +269,17 @@ } finally { + client.getWSRMLock().lock(); this.client.setWSRMSequence(null); // TODO: do not remove this this.client.getWSRMLock().unlock(); } - } - finally - { - this.objectLock.unlock(); } } /** * Sets up terminated flag to true. */ - public final void sendMessage(String action, QName operationQName) throws RMException + private void sendMessage(String action, QName operationQName) throws RMException { try { @@ -311,18 +296,23 @@ props = AddressingClientUtil.createAnonymousProps(action, address); } // prepare WS-RM request context - Map rmRequestContext = new HashMap(); + Map requestContext = client.getBindingProvider().getRequestContext(); + Map rmRequestContext = (Map)requestContext.get(RMConstant.REQUEST_CONTEXT); + if (rmRequestContext == null) + { + rmRequestContext = new HashMap(); + } List outMsgs = new LinkedList(); outMsgs.add(operationQName); rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs); rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, this); // set up method invocation context - Map requestContext = client.getBindingProvider().getRequestContext(); requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, props); requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext); + requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext); // call stub method this.client.invoke(operationQName, new Object[] {}, client.getBindingProvider().getResponseContext()); - RMSequenceManager.getInstance().unregister(this); + //RMSequenceManager.getInstance().unregister(this); // TODO: each sequence will be unregistered by sequence manager } catch (Exception e) { @@ -330,35 +320,49 @@ } } - private void sendCloseMessage() + public final void sendCloseMessage() { + /* + synchronized (lock) + { + while (this.isAckRequested()) + { + try + { + logger.debug("Waiting till all inbound sequence acknowledgements will be sent"); + lock.wait(100); + } + catch (InterruptedException ie) + { + logger.warn(ie.getMessage(), ie); + } + } + }*/ + Map<String, Object> wsrmReqCtx = new HashMap<String, Object>(); + wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, false); + this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx); sendMessage(RMConstant.CLOSE_SEQUENCE_WSA_ACTION, wsrmConstants.getCloseSequenceQName()); } - private void sendTerminateMessage() + public final void sendTerminateMessage() { sendMessage(RMConstant.TERMINATE_SEQUENCE_WSA_ACTION, wsrmConstants.getTerminateSequenceQName()); } - private void sendSequenceAcknowledgementMessage() + public final void sendSequenceAcknowledgementMessage() { sendMessage(RMConstant.SEQUENCE_ACKNOWLEDGEMENT_WSA_ACTION, wsrmConstants.getSequenceAcknowledgementQName()); } public final void setBehavior(RMIncompleteSequenceBehavior behavior) { - this.objectLock.lock(); - try + synchronized (lock) { if (behavior != null) { this.behavior = behavior; } } - finally - { - this.objectLock.unlock(); - } } public final boolean isCompleted() @@ -383,27 +387,17 @@ public final boolean isClosed() { - this.objectLock.lock(); - try + synchronized (lock) { return this.terminated; } - finally - { - this.objectLock.unlock(); - } } public final boolean isDiscarded() { - this.objectLock.lock(); - try + synchronized (lock) { return this.discarded; } - finally - { - this.objectLock.unlock(); - } } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceManager.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceManager.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceManager.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -21,8 +21,10 @@ */ package org.jboss.ws.extensions.wsrm; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -93,9 +95,20 @@ { while (this.destroyed == false) { - for (int i = 0; i < sequences.size(); i++) + for (RMSequenceImpl sequence : sequences) { - logger.debug("processing sequence " + sequences.get(i).getOutboundId()); + logger.debug("Processing outbound sequence " + sequence.getOutboundId()); + if (sequence.isAckRequested()) + { + /* + logger.debug("Sending ack for inbound sequence " + sequence.getInboundId()); + Map<String, Object> wsrmReqCtx = new HashMap<String, Object>(); + wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, true); + sequence.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx); + sequence.sendSequenceAcknowledgementMessage(); + sequence.ackRequested(false); + */ + } } try Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -36,5 +36,5 @@ * @return created sequence * @throws RMException */ - RMSequence createSequence(RMAddressingType addrType, RMSequenceType seqType) throws RMException; + RMSequence createSequence(RMAddressingType addrType); } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -95,7 +95,7 @@ { for (long i = range.getLower(); i <= range.getUpper(); i++) { - sequence.addReceivedInboundMessage(i); + sequence.addReceivedMessage(i); } } if (seqAckHeader.isFinal()) @@ -119,7 +119,7 @@ throw new RMException("Expected inbound sequenceId:" + sequence.getInboundId() + " , but was: " + inboundSeqId); } - sequence.ackRequested(); + sequence.ackRequested(true); } public static void handleSequenceHeader(RMSequence seqHeader, RMSequenceImpl sequence) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannel.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannel.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannel.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -93,12 +93,12 @@ return rmMessage; } - private MessageAbstraction createResponse(RMMessage rmResponse, RMMetadata rmMetadata) throws Throwable + private MessageAbstraction createResponse(RMMessage rmRequest, RMMessage rmResponse, RMMetadata rmMetadata) throws Throwable { Map<String, Object> invocationContext = rmMetadata.getContext(INVOCATION_CONTEXT); - boolean oneWay = (Boolean)rmMetadata.getContext(INVOCATION_CONTEXT).get(ONE_WAY_OPERATION); + boolean oneWay = RMTransportHelper.isOneWayOperation(rmRequest); MessageAbstraction response = null; - //if (!oneWay) + if (!oneWay) { byte[] payload = rmResponse.getPayload(); InputStream is = payload == null ? null : new ByteArrayInputStream(rmResponse.getPayload()); @@ -117,7 +117,7 @@ { RMMessage rmRequest = createRMMessage(request, rmMetadata); RMMessage rmResponse = sendToChannel(rmRequest); - return createResponse(rmResponse, rmMetadata); + return createResponse(rmRequest, rmResponse, rmMetadata); } private RMMessage sendToChannel(RMMessage request) throws Throwable Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelRequest.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelRequest.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelRequest.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -83,7 +83,7 @@ callbackHandler.addUnassignedMessageListener(sequence); } } - boolean oneWay = /*RMTransportHelper.isOneWayOperation(rmRequest) && */(backPort != null); // TODO: backport support + boolean oneWay = (backPort != null); // TODO: backport support Client client = new Client(locator, JBOSSWS_SUBSYSTEM, rmRequest.getMetadata().getContext(REMOTING_CONFIGURATION_CONTEXT)); client.connect(); @@ -119,7 +119,7 @@ if (backPort != null) // TODO: backport support { - if (messageId != null) + if ((null != messageId) && (false == RMTransportHelper.isOneWayOperation(rmRequest))) { // register callbacks only for outbound messages with messageId return new RMChannelResponse(callbackHandler, messageId); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -12,7 +12,6 @@ public RMMetadata( String targetAddress, - boolean oneWay, Marshaller marshaller, UnMarshaller unmarshaller, Map<String, Object> invocationContext, @@ -23,7 +22,6 @@ throw new IllegalArgumentException("Target address cannot be null"); invocationContext.put(RMConstant.TARGET_ADDRESS, targetAddress); - invocationContext.put(RMConstant.ONE_WAY_OPERATION, oneWay); setContext(RMConstant.INVOCATION_CONTEXT, invocationContext); if (marshaller == null || unmarshaller == null) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -5,11 +5,15 @@ import java.net.URI; import java.util.Map; +import org.jboss.logging.Logger; import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.wsrm.RMSequenceImpl; public final class RMTransportHelper { + + private static Logger logger = Logger.getLogger(RMTransportHelper.class); + private RMTransportHelper() { // no instances @@ -43,7 +47,15 @@ public static boolean isOneWayOperation(RMMessage rmRequest) { - return (Boolean)rmRequest.getMetadata().getContext(RMConstant.INVOCATION_CONTEXT).get(ONE_WAY_OPERATION); + RMMetadata meta = rmRequest.getMetadata(); + if (meta == null) throw new RuntimeException("Unable to obtain wsrm metadata"); + Map<String, Object> invCtx = meta.getContext(RMConstant.INVOCATION_CONTEXT); + if (invCtx == null) throw new RuntimeException("Unable to obtain invocation context"); + Map<String, Object> wsrmReqCtx = (Map<String, Object>)invCtx.get(RMConstant.REQUEST_CONTEXT); + Boolean isOneWay = (Boolean)wsrmReqCtx.get(ONE_WAY_OPERATION); + logger.debug("oneWayMessage == " + (isOneWay == null ? false : isOneWay.booleanValue())); + logger.debug("messages == " + wsrmReqCtx.get(PROTOCOL_MESSAGES)); + return isOneWay == null ? false : isOneWay.booleanValue(); } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -124,6 +124,12 @@ createSequenceMD.setOneWay(false); endpointMD.addOperation(createSequenceMD); + // register sequenceAcknowledgement method + QName sequenceAcknowledgementQName = rmProvider.getConstants().getSequenceAcknowledgementQName(); + OperationMetaData sequenceAcknowledgementMD = new OperationMetaData(endpointMD, sequenceAcknowledgementQName, "sequenceAcknowledgement"); + sequenceAcknowledgementMD.setOneWay(true); + endpointMD.addOperation(sequenceAcknowledgementMD); + // register closeSequence method QName closeSequenceQName = rmProvider.getConstants().getCloseSequenceQName(); OperationMetaData closeSequenceMD = new OperationMetaData(endpointMD, closeSequenceQName, "closeSequence"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java 2007-11-30 21:50:09 UTC (rev 5161) @@ -100,7 +100,11 @@ ctx.log(configFile + SEPARATOR + view.getId()); Map<String, String> resProperties = view.getResponse().getProperties(); Map<String, String> reqProperties = view.getRequest().getProperties(); - String responseMessage = Util.getResourceAsString(ctx, view.getResponse().getResource()); + String responseMessage = null; + if (view.getResponse().getResource() != null) + { + responseMessage = Util.getResourceAsString(ctx, view.getResponse().getResource()); + } String responseTo = null; if (resProperties.size() > 0) @@ -112,7 +116,10 @@ } Map<String, String> replaceMap = Util.prepareReplaceMap(initializedReqProperties, resProperties); - responseMessage = Util.replaceAll(responseMessage, replaceMap); + if (responseMessage != null) + { + responseMessage = Util.replaceAll(responseMessage, replaceMap); + } responseTo = replaceMap.get(RESPONSE_TO); if (ADDRESSING_ANONYMOUS_URI.equals(responseTo)) { @@ -123,23 +130,32 @@ if (responseTo == null) { ctx.log("Sending response through ServletResponse"); - resp.setContentType(view.getResponse().getContentType()); + if (view.getResponse().getContentType() != null) + { + resp.setContentType(view.getResponse().getContentType()); + } resp.setStatus(Integer.valueOf(view.getResponse().getStatusCode())); - PrintWriter writer = resp.getWriter(); - writer.print(responseMessage); - writer.flush(); - writer.close(); + if (responseMessage != null) + { + PrintWriter writer = resp.getWriter(); + writer.print(responseMessage); + writer.flush(); + writer.close(); + } } else { - ctx.log("Sending response through new socket connection"); - URL url = new URL(responseTo); - Socket socket = new Socket(url.getHost(), url.getPort()); - OutputStream out = socket.getOutputStream(); - out.write(Util.createHTTPHeaders(url, responseMessage.length(), view.getResponse().getContentType())); - out.write(responseMessage.getBytes()); - out.flush(); - out.close(); + if (responseMessage != null) + { + ctx.log("Sending response through new socket connection"); + URL url = new URL(responseTo); + Socket socket = new Socket(url.getHost(), url.getPort()); + OutputStream out = socket.getOutputStream(); + out.write(Util.createHTTPHeaders(url, responseMessage.length(), view.getResponse().getContentType())); + out.write(responseMessage.getBytes()); + out.flush(); + out.close(); + } } } Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/emulator/reqres/config/req-res-service-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/emulator/reqres/config/req-res-service-config.xml 2007-11-30 17:28:08 UTC (rev 5160) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/emulator/reqres/config/req-res-service-config.xml 2007-11-30 21:50:09 UTC (rev 5161) @@ -29,7 +29,7 @@ </response> </view> - <view id="sequence.acknowledgement"> + <view id="server.sequence.acknowledgement"> <request httpMethod="POST" pathInfo="/ReqResService"> <contains> <node name="|{${soap}}Envelope|{${soap}}Header|{${wsrm}}Sequence"/> @@ -50,6 +50,15 @@ </response> </view> + <view id="client.sequence.acknowledgement"> + <request httpMethod="POST" pathInfo="/ReqResService"> + <contains> + <node name="|{${soap}}Envelope|{${soap}}Header|{${wsrm}}SequenceAcknowledgement"/> + </contains> + </request> + <response statusCode="200"/> + </view> + <view id="close.sequence"> <request httpMethod="POST" pathInfo="/ReqResService"> <contains>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5160 - in common/branches/jbossws-common-1.0.2.CP: src/main/java/org/jboss/wsf/test and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-11-30 12:28:08 -0500 (Fri, 30 Nov 2007) New Revision: 5160 Modified: common/branches/jbossws-common-1.0.2.CP/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java common/branches/jbossws-common-1.0.2.CP/version.properties Log: Accept JBoss EAP 4.3 as JBoss 4.2 Modified: common/branches/jbossws-common-1.0.2.CP/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/branches/jbossws-common-1.0.2.CP/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-11-30 17:19:50 UTC (rev 5159) +++ common/branches/jbossws-common-1.0.2.CP/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-11-30 17:28:08 UTC (rev 5160) @@ -181,8 +181,10 @@ jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion"); if (jbossVersion.startsWith("5.0")) jbossVersion = "jboss50"; - else if (jbossVersion.startsWith("4.2")) + else if (jbossVersion.startsWith("4.2")) jbossVersion = "jboss42"; + else if (jbossVersion.startsWith("4.3")) + jbossVersion = "jboss42"; else if (jbossVersion.startsWith("4.0")) jbossVersion = "jboss40"; else throw new RuntimeException("Unsupported jboss version: " + jbossVersion); Modified: common/branches/jbossws-common-1.0.2.CP/version.properties =================================================================== --- common/branches/jbossws-common-1.0.2.CP/version.properties 2007-11-30 17:19:50 UTC (rev 5159) +++ common/branches/jbossws-common-1.0.2.CP/version.properties 2007-11-30 17:28:08 UTC (rev 5160) @@ -5,7 +5,7 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.0.1.GA +version.id=1.0.2.CP repository.id=snapshot implementation.url=http://www.jboss.org/products/jbossws

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5159 - stack/cxf/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-11-30 12:19:50 -0500 (Fri, 30 Nov 2007) New Revision: 5159 Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt Log: Update exclude list Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-30 17:15:06 UTC (rev 5158) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-30 17:19:50 UTC (rev 5159) @@ -20,36 +20,36 @@ org/jboss/test/ws/jaxws/samples/exception/** # [JBWS-1751] Investigate CXF samples handlerchain -#org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/handlerchain/** # [JBWS-1752] Investigate CXF samples httpbinding -#org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/httpbinding/** # [JBWS-1683] Fix JAXR samples for XFire -#org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jaxr/** # [JBWS-1753] Investigate CXF samples logicalhandler -#org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** # [JBWS-1755] Investigate CXF samples provider -#org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/provider/** # [JBWS-1756] Fix @WebServiceRef with CXF -#org/jboss/test/ws/jaxws/samples/retail/** -#org/jboss/test/ws/jaxws/samples/serviceref/** -#org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/serviceref/** +org/jboss/test/ws/jaxws/samples/webserviceref/** # [JBWS-1757] Investigate CXF samples soapbinding -#org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/soapbinding/** # [JBWS-1758] Investigate CXF samples webmethod -#org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webmethod/** # [JBWS-1759] Investigate CXF samples webservice -#org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webservice/** # [JBWS-1760] Investigate CXF samples xop -#org/jboss/test/ws/jaxws/samples/xop/** +org/jboss/test/ws/jaxws/samples/xop/** # [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) org/jboss/test/ws/jaxws/smoke/tools/**

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5158 - common/branches.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-11-30 12:15:06 -0500 (Fri, 30 Nov 2007) New Revision: 5158 Added: common/branches/jbossws-common-1.0.2.CP/ Log: Create CP branch. Copied: common/branches/jbossws-common-1.0.2.CP (from rev 5157, common/tags/jbossws-common-1.0.2.GA)

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5157 - in stack/cxf/trunk: src/main/resources and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-11-30 12:05:54 -0500 (Fri, 30 Nov 2007) New Revision: 5157 Added: stack/cxf/trunk/src/main/resources/cxf-incubator.jar/ stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/ stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/ stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/cxf.extension stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml Modified: stack/cxf/trunk/.classpath stack/cxf/trunk/build.xml stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt Log: JBWS-1677 - Redirect CXF message logging to jboss log Modified: stack/cxf/trunk/.classpath =================================================================== --- stack/cxf/trunk/.classpath 2007-11-30 16:55:20 UTC (rev 5156) +++ stack/cxf/trunk/.classpath 2007-11-30 17:05:54 UTC (rev 5157) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test-framework/java"/> + <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> @@ -9,10 +11,8 @@ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry kind="lib" path="thirdparty/cxf-2.1-incubator-SNAPSHOT.jar" sourcepath="apache-cxf"/> <classpathentry kind="lib" path="thirdparty/geronimo-javamail_1.4_spec-1.0-M1.jar"/> <classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata_2.0_spec-1.1.1.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxws-api-2.1-1.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> @@ -35,5 +35,7 @@ <classpathentry kind="lib" path="thirdparty/xbean-2.2.0.jar"/> <classpathentry kind="lib" path="thirdparty/xml-resolver-1.2.jar"/> <classpathentry kind="lib" path="thirdparty/XmlSchema-1.3.2.jar"/> + <classpathentry kind="lib" path="thirdparty/cxf-2.0.3-incubator.jar" sourcepath="apache-cxf"/> + <classpathentry kind="lib" path="thirdparty/jaxws-api-2.0.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2007-11-30 16:55:20 UTC (rev 5156) +++ stack/cxf/trunk/build.xml 2007-11-30 17:05:54 UTC (rev 5157) @@ -121,6 +121,14 @@ </webinf> </war> +  + <copy file="${thirdparty.dir}/cxf-${cxf.version}.jar" todir="${cxf.output.lib.dir}" overwrite="true"/> + <jar destfile="${cxf.output.lib.dir}/cxf-${cxf.version}.jar" update="true"> + <fileset dir="${cxf.resources.dir}/cxf-incubator.jar"> + <include name="META-INF/cxf/cxf.extension"/> + </fileset> + </jar> +  <zip zipfile="${cxf.output.lib.dir}/jbossws-cxf-src.zip" > <fileset dir="${cxf.java.dir}"/> @@ -140,15 +148,14 @@ </footer> </concat> -  +  <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf50.sar" manifest="${cxf.output.etc.dir}/default.mf"> - <fileset dir="${cxf.output.lib.dir}"> + <include name="cxf-${cxf.version}.jar"/> <include name="jbossws-context.war"/> + <include name="jbossws-cxf.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="cxf-${cxf.version}.jar"/> <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> <include name="jaxws-api-${cxf.jaxws.api}.jar"/> @@ -162,19 +169,16 @@ <include name="xbean-${cxf.xbean}.jar"/> <include name="xml-resolver-${cxf.xml.resolver}.jar"/> <include name="XmlSchema-${cxf.xmlschema}.jar"/> - <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> <include name="wstx.jar"/> </fileset> - <fileset dir="${cxf.output.lib.dir}"> - <include name="jbossws-cxf.jar"/> - </fileset> <metainf dir="${cxf.output.lib.dir}/jbossws-cxf50"> <include name="jbossws-beans.xml"/> </metainf> + <metainf dir="${cxf.resources.dir}/jbossws-cxf.sar/META-INF"/> </jar> </target> @@ -198,9 +202,8 @@  <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf42.sar" manifest="${cxf.output.etc.dir}/default.mf"> <fileset dir="${cxf.output.lib.dir}"> + <include name="cxf-${cxf.version}.jar"/> <include name="jbossws-context.war"/> - </fileset> - <fileset dir="${cxf.output.lib.dir}"> <include name="jbossws-cxf.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> @@ -218,7 +221,6 @@ <include name="xbean-${cxf.xbean}.jar"/> <include name="xml-resolver-${cxf.xml.resolver}.jar"/> <include name="XmlSchema-${cxf.xmlschema}.jar"/> - <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="stax-api.jar"/> @@ -231,6 +233,7 @@ <metainf dir="${cxf.output.dir}/resources/jbossws-jboss42.sar/META-INF"> <include name="jboss-service.xml"/> </metainf> + <metainf dir="${cxf.resources.dir}/jbossws-cxf.sar/META-INF"/> </jar> </target> Added: stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/cxf.extension (rev 0) +++ stack/cxf/trunk/src/main/resources/cxf-incubator.jar/META-INF/cxf/cxf.extension 2007-11-30 17:05:54 UTC (rev 5157) @@ -0,0 +1,14 @@ +META-INF/cxf/cxf-extension-jaxws.xml +META-INF/cxf/cxf-extension-rm.xml +META-INF/cxf/cxf-extension-addr.xml +META-INF/cxf/cxf-extension-http-jetty.xml +META-INF/cxf/cxf-extension-object-binding.xml +META-INF/cxf/cxf-extension-http.xml +META-INF/cxf/cxf-extension-http-binding.xml +META-INF/cxf/cxf-extension-xml.xml +META-INF/cxf/cxf-extension-policy.xml +META-INF/cxf/cxf-extension-jms.xml +META-INF/cxf/cxf-extension-local.xml +META-INF/cxf/cxf-extension-management.xml +META-INF/cxf/cxf-extension-soap.xml +META-INF/cxf/cxf-extension-jbossws.xml \ No newline at end of file Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml 2007-11-30 17:05:54 UTC (rev 5157) @@ -0,0 +1,18 @@ +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" + xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> + + <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> + + <cxf:bus> + <cxf:inInterceptors> + <ref bean="logInbound"/> + </cxf:inInterceptors> + <cxf:outInterceptors> + <ref bean="logOutbound"/> + </cxf:outInterceptors> + <cxf:inFaultInterceptors> + <ref bean="logOutbound"/> + </cxf:inFaultInterceptors> + </cxf:bus> +</beans> \ No newline at end of file Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-30 16:55:20 UTC (rev 5156) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-30 17:05:54 UTC (rev 5157) @@ -16,43 +16,40 @@ org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.* org/jboss/test/ws/jaxws/samples/swaref/** -# [JBWS-1750] Investigate CXF exception handling +# [CXF-1244] Application Exception not initialized properly org/jboss/test/ws/jaxws/samples/exception/** # [JBWS-1751] Investigate CXF samples handlerchain -org/jboss/test/ws/jaxws/samples/handlerchain/** +#org/jboss/test/ws/jaxws/samples/handlerchain/** # [JBWS-1752] Investigate CXF samples httpbinding -org/jboss/test/ws/jaxws/samples/httpbinding/** +#org/jboss/test/ws/jaxws/samples/httpbinding/** # [JBWS-1683] Fix JAXR samples for XFire -org/jboss/test/ws/jaxws/samples/jaxr/** +#org/jboss/test/ws/jaxws/samples/jaxr/** # [JBWS-1753] Investigate CXF samples logicalhandler -org/jboss/test/ws/jaxws/samples/logicalhandler/** +#org/jboss/test/ws/jaxws/samples/logicalhandler/** -# [JBWS-1754] Investigate CXF samples oneway -org/jboss/test/ws/jaxws/samples/oneway/** - # [JBWS-1755] Investigate CXF samples provider -org/jboss/test/ws/jaxws/samples/provider/** +#org/jboss/test/ws/jaxws/samples/provider/** # [JBWS-1756] Fix @WebServiceRef with CXF -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/serviceref/** -org/jboss/test/ws/jaxws/samples/webserviceref/** +#org/jboss/test/ws/jaxws/samples/retail/** +#org/jboss/test/ws/jaxws/samples/serviceref/** +#org/jboss/test/ws/jaxws/samples/webserviceref/** # [JBWS-1757] Investigate CXF samples soapbinding -org/jboss/test/ws/jaxws/samples/soapbinding/** +#org/jboss/test/ws/jaxws/samples/soapbinding/** # [JBWS-1758] Investigate CXF samples webmethod -org/jboss/test/ws/jaxws/samples/webmethod/** +#org/jboss/test/ws/jaxws/samples/webmethod/** # [JBWS-1759] Investigate CXF samples webservice -org/jboss/test/ws/jaxws/samples/webservice/** +#org/jboss/test/ws/jaxws/samples/webservice/** # [JBWS-1760] Investigate CXF samples xop -org/jboss/test/ws/jaxws/samples/xop/** +#org/jboss/test/ws/jaxws/samples/xop/** # [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) org/jboss/test/ws/jaxws/smoke/tools/**

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5156 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-11-30 11:55:20 -0500 (Fri, 30 Nov 2007) New Revision: 5156 Added: stack/native/branches/jbossws-native-2.0.1.CP01/ Log: Branch to test before release. Copied: stack/native/branches/jbossws-native-2.0.1.CP01 (from rev 5155, stack/native/branches/jbossws-native-2.0.1.CP)

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5155 - in legacy/branches/jbossws-1.2.1.GA_CP: jbossws-tests/src/java/org/jboss/test/ws/tools and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-11-30 06:09:27 -0500 (Fri, 30 Nov 2007) New Revision: 5155 Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml Removed: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java Log: [JBPAPP-473] WSDL To Java - All generated types have first character upper case, extends clause in base types do not take this into account. Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-11-30 11:01:50 UTC (rev 5154) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -714,7 +714,7 @@ } if (baseName == null && baseType != null) - baseName = baseType.getName(); + baseName = ToolsUtils.firstLetterUpperCase(baseType.getName()); return baseName; } Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881 (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2007-11-01 16:39:13 UTC (rev 4972) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws1881; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.test.ws.JBossWSTest; - -/** - * Test case to test the following fix: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-1881 - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 1, 2007 - */ -public class JBWS1881TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1881/" + scenario; - String toolsDir = "tools/jbws1881/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1881/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1881"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1881; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.test.ws.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-1881 + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 1, 2007 + */ +public class JBWS1881TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1881/" + scenario; + String toolsDir = "tools/jbws1881/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1881/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1881"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881 (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881) Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java 2007-11-01 16:39:13 UTC (rev 4972) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1881; - - -public class Base -{ - -protected java.lang.String id; -public Base(){} - -public Base(java.lang.String id){ -this.id=id; -} -public java.lang.String getId() { return id ;} - -public void setId(java.lang.String id){ this.id=id; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Base.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1881; + + +public class Base +{ + +protected java.lang.String id; +public Base(){} + +public Base(java.lang.String id){ +this.id=id; +} +public java.lang.String getId() { return id ;} + +public void setId(java.lang.String id){ this.id=id; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java 2007-11-01 16:39:13 UTC (rev 4972) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1881; - - -public class Person - extends Base{ - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String surname){ -this.surname=surname; -} -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/Person.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1881; + + +public class Person + extends Base{ + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String surname){ +this.surname=surname; +} +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2007-11-01 16:39:13 UTC (rev 4972) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2007-11-30 11:09:27 UTC (rev 5155) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1881' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1881/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1881' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1881/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1881/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='base'> - <sequence> - <element name='id' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='Person'> - <complexContent> - <extension base='tns:base'> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name='TelephoneNumber'> - <complexContent> - <extension base='tns:base'> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> - -</definitions> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook.wsdl 2007-11-30 11:09:27 UTC (rev 5155) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1881' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1881/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1881' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1881/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1881/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='base'> + <sequence> + <element name='id' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='Person'> + <complexContent> + <extension base='tns:base'> + <sequence> + <element name='surname' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + + <complexType name='TelephoneNumber'> + <complexContent> + <extension base='tns:base'> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + </extension> + </complexContent> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> + +</definitions> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2007-11-01 16:39:13 UTC (rev 4972) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1881; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1881.TelephoneNumber lookup(org.jboss.test.ws.jbws1881.Person lookup) throws java.rmi.RemoteException; -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/PhoneBook_PortType.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1881; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1881.TelephoneNumber lookup(org.jboss.test.ws.jbws1881.Person lookup) throws java.rmi.RemoteException; +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java 2007-11-01 16:39:13 UTC (rev 4972) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 01 15:45:09 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1881; - - -public class TelephoneNumber - extends Base{ - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String number){ -this.number=number; -} -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/TelephoneNumber.java 2007-11-30 11:09:27 UTC (rev 5155) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 01 15:45:09 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1881; + + +public class TelephoneNumber + extends Base{ + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String number){ +this.number=number; +} +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2007-11-01 16:39:13 UTC (rev 4972) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2007-11-30 11:09:27 UTC (rev 5155) @@ -1,67 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1881</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1881/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1881</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1881</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1881.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>id</java-variable-name> - <xml-element-name>id</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1881.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>id</java-variable-name> - <xml-element-name>id</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1881.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1881'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1881.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1881'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1881'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1881.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1881.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2007-11-30 11:09:27 UTC (rev 5155) @@ -0,0 +1,67 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1881</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1881/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1881</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1881</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1881.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>id</java-variable-name> + <xml-element-name>id</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1881.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>id</java-variable-name> + <xml-element-name>id</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1881.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1881'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1881.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1881'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1881'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1881.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1881.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1881'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml 2007-11-01 16:39:13 UTC (rev 4972) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml 2007-11-30 11:09:27 UTC (rev 5155) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1881/doclit/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml (from rev 4972, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1881/doclit/wstools-config.xml 2007-11-30 11:09:27 UTC (rev 5155) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1881/doclit/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5154 - in stack/native/trunk/src: main/java/org/jboss/ws/extensions/wsrm and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-11-30 06:01:50 -0500 (Fri, 30 Nov 2007) New Revision: 5154 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMCreateSequenceResponseSerializer.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMCreateSequenceSerializer.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMSequenceAcknowledgementSerializer.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMCreateSequenceImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMCreateSequenceResponseImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMSequenceAcknowledgementImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMCreateSequenceImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMCreateSequenceResponseImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMSequenceAcknowledgementImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMCreateSequence.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMCreateSequenceResponse.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMSequenceAcknowledgement.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization/RMDeSerializationTestCase.java Log: handling of Sequence, AckRequested, SequenceAcknowledgement + minor refactoring Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -73,11 +73,15 @@ import org.jboss.ws.extensions.wsrm.RMSequenceImpl; import org.jboss.ws.extensions.wsrm.api.RMAddressingType; import org.jboss.ws.extensions.wsrm.api.RMException; -import org.jboss.ws.extensions.wsrm.api.RMSequence; import org.jboss.ws.extensions.wsrm.api.RMSequenceType; import org.jboss.ws.extensions.wsrm.common.RMHelper; +import org.jboss.ws.extensions.wsrm.spi.RMConstants; import org.jboss.ws.extensions.wsrm.spi.RMProvider; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMAckRequested; import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequenceResponse; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequenceAcknowledgement; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMSerializable; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; @@ -326,8 +330,41 @@ } finally { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + this.wsrmLock.lock(); + try + { + if (this.wsrmSequence != null) + { + if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false) + { + Map<String, Object> wsrmResCtx = (Map<String, Object>) msgContext.get(RMConstant.RESPONSE_CONTEXT); + RMConstants wsrmConstants = RMProvider.get().getConstants(); + Map<QName, RMSerializable> mapping = (Map<QName, RMSerializable>)wsrmResCtx.get(RMConstant.PROTOCOL_MESSAGES_MAPPING); + QName seqAck = wsrmConstants.getSequenceAcknowledgementQName(); + if (mapping.keySet().contains(seqAck)) + { + RMHelper.handleSequenceAcknowledgementHeader((RMSequenceAcknowledgement)mapping.get(seqAck), this.wsrmSequence); + } + QName seq = wsrmConstants.getSequenceQName(); + if (mapping.keySet().contains(seq)) + { + RMHelper.handleSequenceHeader((RMSequence)mapping.get(seq), this.wsrmSequence); + } + QName ackReq = wsrmConstants.getAckRequestedQName(); + if (mapping.keySet().contains(ackReq)) + { + RMHelper.handleAckRequestedHeader((RMAckRequested)mapping.get(ackReq), this.wsrmSequence); + } + } + } + } + finally + { + this.wsrmLock.unlock(); + } + // Copy the inbound msg properties to the binding's response context - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); for (String key : msgContext.keySet()) { Object value = msgContext.get(key); @@ -489,7 +526,7 @@ // WS-RM support // /////////////////// @SuppressWarnings("unchecked") - public RMSequence createSequence(RMAddressingType addrType, RMSequenceType seqType) throws RMException + public org.jboss.ws.extensions.wsrm.api.RMSequence createSequence(RMAddressingType addrType, RMSequenceType seqType) throws RMException { this.getWSRMLock().lock(); try Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -182,7 +182,7 @@ log.debug("handling inbound message"); SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - Map rmResponseContext = new HashMap(); + Map<String, Object> rmResponseContext = new HashMap(); List<QName> messages = new LinkedList<QName>(); rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, messages); Map<QName, RMSerializable> data = new HashMap<QName, RMSerializable>(); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -27,6 +27,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -68,6 +70,8 @@ private final RMConfig wsrmConfig; private final RMSequenceType sequenceType; private final RMAddressingType addrType; + private final Set<Long> acknowledgedOutboundMessages = new TreeSet<Long>(); + private final Set<Long> receivedInboundMessages = new TreeSet<Long>(); private RMIncompleteSequenceBehavior behavior = RMIncompleteSequenceBehavior.NO_DISCARD; private String incomingSequenceId; private String outgoingSequenceId; @@ -76,8 +80,10 @@ private URI backPort; private ClientImpl client; // object states variables - private boolean terminated = false; - private boolean discarded = false; + private boolean terminated; + private boolean discarded; + private boolean isFinal; + private boolean inboundMessageAckRequested; private AtomicLong messageNumber = new AtomicLong(); private final Lock objectLock = new ReentrantLock(); private AtomicInteger countOfUnassignedMessagesAvailable = new AtomicInteger(); @@ -109,6 +115,62 @@ } } + public final void setFinal() + { + this.objectLock.lock(); + try + { + this.isFinal = true; + logger.debug("Sequence " + this.outgoingSequenceId + " state changed to final"); + } + finally + { + this.objectLock.unlock(); + } + } + + public final void ackRequested() + { + this.objectLock.lock(); + try + { + this.inboundMessageAckRequested = true; + logger.debug("Sequence " + this.incomingSequenceId + " ack requested. Messages in the queue: " + this.receivedInboundMessages); + } + finally + { + this.objectLock.unlock(); + } + } + + public final void addReceivedInboundMessage(long messageId) + { + this.objectLock.lock(); + try + { + this.receivedInboundMessages.add(messageId); + logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", received message no. " + messageId); + } + finally + { + this.objectLock.unlock(); + } + } + + public final void addReceivedMessage(long messageId) + { + this.objectLock.lock(); + try + { + this.acknowledgedOutboundMessages.add(messageId); + logger.debug("Message no. " + messageId + " of sequence: " + this.outgoingSequenceId + " acknowledged by server"); + } + finally + { + this.objectLock.unlock(); + } + } + public final void setOutboundId(String outboundId) { this.objectLock.lock(); @@ -122,6 +184,19 @@ } } + public final void setInboundId(String inboundId) + { + this.objectLock.lock(); + try + { + this.incomingSequenceId = inboundId; + } + finally + { + this.objectLock.unlock(); + } + } + public final void setClient(ClientImpl client) { this.objectLock.lock(); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -22,12 +22,19 @@ package org.jboss.ws.extensions.wsrm.common; import java.util.Date; +import java.util.List; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; +import org.jboss.logging.Logger; +import org.jboss.ws.extensions.wsrm.RMClientHandler; +import org.jboss.ws.extensions.wsrm.RMSequenceImpl; import org.jboss.ws.extensions.wsrm.api.RMException; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMAckRequested; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequenceAcknowledgement; /** * RM utility library @@ -39,6 +46,8 @@ public final class RMHelper { + private static final Logger logger = Logger.getLogger(RMHelper.class); + private RMHelper() { // no instances allowed @@ -76,4 +85,59 @@ return d.getTimeInMillis(new Date()); } + public static void handleSequenceAcknowledgementHeader(RMSequenceAcknowledgement seqAckHeader, RMSequenceImpl sequence) + { + String seqId = seqAckHeader.getIdentifier(); + if (sequence.getOutboundId().equals(seqId)) + { + List<RMSequenceAcknowledgement.RMAcknowledgementRange> ranges = seqAckHeader.getAcknowledgementRanges(); + for (RMSequenceAcknowledgement.RMAcknowledgementRange range : ranges) + { + for (long i = range.getLower(); i <= range.getUpper(); i++) + { + sequence.addReceivedInboundMessage(i); + } + } + if (seqAckHeader.isFinal()) + { + sequence.setFinal(); + } + } + else + { + logger.warn("Expected outbound sequenceId:" + sequence.getOutboundId() + " , but was: " + seqId); + throw new RMException("Expected outbound sequenceId:" + sequence.getOutboundId() + " , but was: " + seqId); + } + } + + public static void handleAckRequestedHeader(RMAckRequested ackReqHeader, RMSequenceImpl sequence) + { + String inboundSeqId = ackReqHeader.getIdentifier(); + if (false == sequence.getInboundId().equals(inboundSeqId)) + { + logger.warn("Expected inbound sequenceId:" + sequence.getInboundId() + " , but was: " + inboundSeqId); + throw new RMException("Expected inbound sequenceId:" + sequence.getInboundId() + " , but was: " + inboundSeqId); + } + + sequence.ackRequested(); + } + + public static void handleSequenceHeader(RMSequence seqHeader, RMSequenceImpl sequence) + { + String inboundSeqId = seqHeader.getIdentifier(); + if (null == sequence.getInboundId()) + { + sequence.setInboundId(inboundSeqId); + } + else + { + if (false == sequence.getInboundId().equals(inboundSeqId)) + { + logger.warn("Expected inbound sequenceId:" + sequence.getInboundId() + " , but was: " + inboundSeqId); + throw new RMException("Expected inbound sequenceId:" + sequence.getInboundId() + " , but was: " + inboundSeqId); + } + } + sequence.addReceivedInboundMessage(seqHeader.getMessageNumber()); + } + } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMCreateSequenceResponseSerializer.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMCreateSequenceResponseSerializer.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMCreateSequenceResponseSerializer.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -112,7 +112,7 @@ SOAPElement acceptElement = getOptionalElement(createSequenceResponseElement, acceptQName, createSequenceResponseQName); if (acceptElement != null) { - RMCreateSequenceResponse.Accept accept = o.newAccept(); + RMCreateSequenceResponse.RMAccept accept = o.newAccept(); // read required wsrm:AcksTo element QName acksToQName = wsrmConstants.getAcksToQName(); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMCreateSequenceSerializer.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMCreateSequenceSerializer.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMCreateSequenceSerializer.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -107,7 +107,7 @@ SOAPElement offerElement = getOptionalElement(createSequenceElement, offerQName, createSequenceQName); if (offerElement != null) { - RMCreateSequence.Offer offer = o.newOffer(); + RMCreateSequence.RMOffer offer = o.newOffer(); // read required wsrm:Identifier element QName identifierQName = wsrmConstants.getIdentifierQName(); @@ -194,7 +194,7 @@ if (o.getOffer() != null) { - RMCreateSequence.Offer offer = o.getOffer(); + RMCreateSequence.RMOffer offer = o.getOffer(); // write optional wsrm:Offer element QName offerQName = wsrmConstants.getOfferQName(); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMSequenceAcknowledgementSerializer.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMSequenceAcknowledgementSerializer.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/serialization/RMSequenceAcknowledgementSerializer.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -121,7 +121,7 @@ for (SOAPElement ackRangeElement : ackRangeElements) { - RMSequenceAcknowledgement.AcknowledgementRange ackRange = o.newAcknowledgementRange(); + RMSequenceAcknowledgement.RMAcknowledgementRange ackRange = o.newAcknowledgementRange(); // read required wsrm:Upper attribute String upper = getRequiredTextContent(ackRangeElement, upperQName, ackRangeQName); @@ -198,7 +198,7 @@ } } - List<RMSequenceAcknowledgement.AcknowledgementRange> ackRanges = o.getAcknowledgementRanges(); + List<RMSequenceAcknowledgement.RMAcknowledgementRange> ackRanges = o.getAcknowledgementRanges(); if (ackRanges.size() != 0) { QName acknowledgementRangeQName = wsrmConstants.getAcknowledgementRangeQName(); @@ -206,7 +206,7 @@ QName lowerQName = wsrmConstants.getLowerQName(); // write optional wsrm:AcknowledgementRange elements - for (RMSequenceAcknowledgement.AcknowledgementRange ackRange : ackRanges) + for (RMSequenceAcknowledgement.RMAcknowledgementRange ackRange : ackRanges) { SOAPElement acknowledgementRangeElement = sequenceAckElement.addChildElement(acknowledgementRangeQName); // write required wsrm:Lower attribute Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMCreateSequenceImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMCreateSequenceImpl.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMCreateSequenceImpl.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -41,7 +41,7 @@ // internal fields private String acksTo; private Duration expires; - private Offer offer; + private RMOffer offer; RMCreateSequenceImpl() { @@ -67,7 +67,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence#getOffer() */ - public Offer getOffer() + public RMOffer getOffer() { return this.offer; } @@ -75,7 +75,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence#newOffer() */ - public Offer newOffer() + public RMOffer newOffer() { return new OfferImpl(); } @@ -109,7 +109,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence#setOffer(org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer) */ - public void setOffer(Offer offer) + public void setOffer(RMOffer offer) { if (offer == null) throw new IllegalArgumentException("Offer cannot be null"); @@ -190,7 +190,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer */ - private static class OfferImpl implements RMCreateSequence.Offer + private static class OfferImpl implements RMCreateSequence.RMOffer { private String duration; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMCreateSequenceResponseImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMCreateSequenceResponseImpl.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMCreateSequenceResponseImpl.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -41,7 +41,7 @@ // internal fields private String identifier; private Duration expires; - private Accept accept; + private RMAccept accept; RMCreateSequenceResponseImpl() { @@ -51,7 +51,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse#getAccept() */ - public Accept getAccept() + public RMAccept getAccept() { return this.accept; } @@ -83,7 +83,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse#newAccept() */ - public Accept newAccept() + public RMAccept newAccept() { return new AcceptImpl(); } @@ -91,7 +91,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse#setAccept(org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse.Accept) */ - public void setAccept(Accept accept) + public void setAccept(RMAccept accept) { if (accept == null) throw new IllegalArgumentException("Accept cannot be null"); @@ -204,7 +204,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse.Accept */ - private static class AcceptImpl implements RMCreateSequenceResponse.Accept + private static class AcceptImpl implements RMCreateSequenceResponse.RMAccept { private String acksTo; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMSequenceAcknowledgementImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMSequenceAcknowledgementImpl.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200502/RMSequenceAcknowledgementImpl.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -41,7 +41,7 @@ private static final RMProvider PROVIDER = RMProviderImpl.getInstance(); // internal fields private final List<Long> nacks = new LinkedList<Long>(); - private final List<AcknowledgementRange> acknowledgementRanges = new LinkedList<AcknowledgementRange>(); + private final List<RMAcknowledgementRange> acknowledgementRanges = new LinkedList<RMAcknowledgementRange>(); private String identifier; RMSequenceAcknowledgementImpl() @@ -52,7 +52,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#addAcknowledgementRange(org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement.AcknowledgementRange) */ - public void addAcknowledgementRange(AcknowledgementRange newAcknowledgementRange) + public void addAcknowledgementRange(RMAcknowledgementRange newAcknowledgementRange) { if ((newAcknowledgementRange == null) || (!(newAcknowledgementRange instanceof AcknowledgementRangeImpl))) throw new IllegalArgumentException(); @@ -60,7 +60,7 @@ throw new IllegalStateException("There are already some nacks specified"); if ((newAcknowledgementRange.getLower() == 0) || (newAcknowledgementRange.getUpper() == 0)) throw new IllegalArgumentException("Both, lower and upper values must be specified"); - for (AcknowledgementRange alreadyAccepted : acknowledgementRanges) + for (RMAcknowledgementRange alreadyAccepted : acknowledgementRanges) checkOverlap(alreadyAccepted, newAcknowledgementRange); this.acknowledgementRanges.add(newAcknowledgementRange); @@ -82,7 +82,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#getAcknowledgementRanges() */ - public List<AcknowledgementRange> getAcknowledgementRanges() + public List<RMAcknowledgementRange> getAcknowledgementRanges() { return Collections.unmodifiableList(acknowledgementRanges); } @@ -122,7 +122,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#newAcknowledgementRange() */ - public AcknowledgementRange newAcknowledgementRange() + public RMAcknowledgementRange newAcknowledgementRange() { return new AcknowledgementRangeImpl(); } @@ -220,7 +220,7 @@ throw new RMException("AcknowledgementRange or Nack must be set"); } - private static void checkOverlap(AcknowledgementRange currentRange, AcknowledgementRange newRange) + private static void checkOverlap(RMAcknowledgementRange currentRange, RMAcknowledgementRange newRange) { if ((currentRange.getLower() <= newRange.getLower()) && (newRange.getLower() <= currentRange.getUpper())) throw new IllegalArgumentException( @@ -230,7 +230,7 @@ "Overlap detected: " + currentRange + " vs. " + newRange); } - private static class AcknowledgementRangeImpl implements RMSequenceAcknowledgement.AcknowledgementRange + private static class AcknowledgementRangeImpl implements RMSequenceAcknowledgement.RMAcknowledgementRange { private long lower; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMCreateSequenceImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMCreateSequenceImpl.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMCreateSequenceImpl.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -41,7 +41,7 @@ // internal fields private String acksTo; private Duration expires; - private Offer offer; + private RMOffer offer; RMCreateSequenceImpl() { @@ -67,7 +67,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence#getOffer() */ - public Offer getOffer() + public RMOffer getOffer() { return this.offer; } @@ -75,7 +75,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence#newOffer() */ - public Offer newOffer() + public RMOffer newOffer() { return new OfferImpl(); } @@ -109,7 +109,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence#setOffer(org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer) */ - public void setOffer(Offer offer) + public void setOffer(RMOffer offer) { if (offer == null) throw new IllegalArgumentException("Offer cannot be null"); @@ -190,7 +190,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence.Offer */ - private static class OfferImpl implements RMCreateSequence.Offer + private static class OfferImpl implements RMCreateSequence.RMOffer { private String endpoint; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMCreateSequenceResponseImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMCreateSequenceResponseImpl.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMCreateSequenceResponseImpl.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -41,7 +41,7 @@ // internal fields private String identifier; private Duration expires; - private Accept accept; + private RMAccept accept; private RMIncompleteSequenceBehavior incompleteSequenceBehavior; RMCreateSequenceResponseImpl() @@ -52,7 +52,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse#getAccept() */ - public Accept getAccept() + public RMAccept getAccept() { return this.accept; } @@ -84,7 +84,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse#newAccept() */ - public Accept newAccept() + public RMAccept newAccept() { return new AcceptImpl(); } @@ -92,7 +92,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse#setAccept(org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse.Accept) */ - public void setAccept(Accept accept) + public void setAccept(RMAccept accept) { if (accept == null) throw new IllegalArgumentException("Accept cannot be null"); @@ -218,7 +218,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse.Accept */ - private static class AcceptImpl implements RMCreateSequenceResponse.Accept + private static class AcceptImpl implements RMCreateSequenceResponse.RMAccept { private String acksTo; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMSequenceAcknowledgementImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMSequenceAcknowledgementImpl.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spec200702/RMSequenceAcknowledgementImpl.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -41,7 +41,7 @@ private static final RMProvider PROVIDER = RMProviderImpl.getInstance(); // internal fields private final List<Long> nacks = new LinkedList<Long>(); - private final List<AcknowledgementRange> acknowledgementRanges = new LinkedList<AcknowledgementRange>(); + private final List<RMAcknowledgementRange> acknowledgementRanges = new LinkedList<RMAcknowledgementRange>(); private String identifier; private boolean isFinal; private boolean isNone; @@ -54,7 +54,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#addAcknowledgementRange(org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement.AcknowledgementRange) */ - public void addAcknowledgementRange(AcknowledgementRange newAcknowledgementRange) + public void addAcknowledgementRange(RMAcknowledgementRange newAcknowledgementRange) { if ((newAcknowledgementRange == null) || (!(newAcknowledgementRange instanceof AcknowledgementRangeImpl))) throw new IllegalArgumentException(); @@ -64,7 +64,7 @@ throw new IllegalStateException("There is already none specified"); if ((newAcknowledgementRange.getLower() == 0) || (newAcknowledgementRange.getUpper() == 0)) throw new IllegalArgumentException("Both, lower and upper values must be specified"); - for (AcknowledgementRange alreadyAccepted : acknowledgementRanges) + for (RMAcknowledgementRange alreadyAccepted : acknowledgementRanges) checkOverlap(alreadyAccepted, newAcknowledgementRange); this.acknowledgementRanges.add(newAcknowledgementRange); @@ -90,7 +90,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#getAcknowledgementRanges() */ - public List<AcknowledgementRange> getAcknowledgementRanges() + public List<RMAcknowledgementRange> getAcknowledgementRanges() { return Collections.unmodifiableList(acknowledgementRanges); } @@ -130,7 +130,7 @@ /* * @see org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement#newAcknowledgementRange() */ - public AcknowledgementRange newAcknowledgementRange() + public RMAcknowledgementRange newAcknowledgementRange() { return new AcknowledgementRangeImpl(); } @@ -242,7 +242,7 @@ throw new RMException("AcknowledgementRange or Nack or None must be set"); } - private static void checkOverlap(AcknowledgementRange currentRange, AcknowledgementRange newRange) + private static void checkOverlap(RMAcknowledgementRange currentRange, RMAcknowledgementRange newRange) { if ((currentRange.getLower() <= newRange.getLower()) && (newRange.getLower() <= currentRange.getUpper())) throw new IllegalArgumentException( @@ -252,7 +252,7 @@ "Overlap detected: " + currentRange + " vs. " + newRange); } - private static class AcknowledgementRangeImpl implements RMSequenceAcknowledgement.AcknowledgementRange + private static class AcknowledgementRangeImpl implements RMSequenceAcknowledgement.RMAcknowledgementRange { private long lower; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMCreateSequence.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMCreateSequence.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMCreateSequence.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -90,25 +90,25 @@ * Factory method * @return new instance of Offer */ - Offer newOffer(); + RMOffer newOffer(); /** * Setter * @param offer */ - void setOffer(Offer offer); + void setOffer(RMOffer offer); /** * Getter * @return offer */ - Offer getOffer(); + RMOffer getOffer(); /** * This element, if present, enables an RM Source to offer a corresponding Sequence for the reliable * exchange of messages Transmitted from RM Destination to RM Source. */ - interface Offer + interface RMOffer { /** * The RM Source MUST set the value of this element to an absolute URI (conformant with Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMCreateSequenceResponse.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMCreateSequenceResponse.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMCreateSequenceResponse.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -99,19 +99,19 @@ * Factory method * @return new instance of accept */ - Accept newAccept(); + RMAccept newAccept(); /** * Setter * @param accept */ - void setAccept(Accept accept); + void setAccept(RMAccept accept); /** * Getter * @return accept */ - Accept getAccept(); + RMAccept getAccept(); /** * <p>This element, if present, enables an RM Destination to accept the offer of a corresponding @@ -121,7 +121,7 @@ * <b>CreateSequence</b> that did contain a child Offer, then the RM Source MAY immediately reclaim * any resources associated with the unused offered Sequence.</p> */ - interface Accept + interface RMAccept { /** * <p>The RM Destination MUST include this element, of type <b>wsa:EndpointReferenceType</b> (as Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMSequenceAcknowledgement.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMSequenceAcknowledgement.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/spi/protocol/RMSequenceAcknowledgement.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -118,19 +118,19 @@ * Factory method * @return new instance of AcknowledgementRange */ - AcknowledgementRange newAcknowledgementRange(); + RMAcknowledgementRange newAcknowledgementRange(); /** * Setter * @param acknowledgementRange */ - void addAcknowledgementRange(AcknowledgementRange acknowledgementRange); + void addAcknowledgementRange(RMAcknowledgementRange acknowledgementRange); /** * Getter * @return list of acknowledged ranges */ - List<AcknowledgementRange> getAcknowledgementRanges(); + List<RMAcknowledgementRange> getAcknowledgementRanges(); /** * The RM Destination MAY include one or more instances of this element within a @@ -139,7 +139,7 @@ * Destination MUST NOT include this element if a sibling <b>Nack</b> or <b>None</b> element is also present as * a child of <b>SequenceAcknowledgement</b>. */ - interface AcknowledgementRange + interface RMAcknowledgementRange { /** * The RM Destination MUST set the value of this attribute equal to the message number of the Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization/RMDeSerializationTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization/RMDeSerializationTestCase.java 2007-11-30 08:23:20 UTC (rev 5153) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/deserialization/RMDeSerializationTestCase.java 2007-11-30 11:01:50 UTC (rev 5154) @@ -284,12 +284,12 @@ assertTrue(sequenceAcknowledgement.isFinal()); assertFalse(sequenceAcknowledgement.isNone()); assertEquals(sequenceAcknowledgement.getNacks().size(), 0); - List<RMSequenceAcknowledgement.AcknowledgementRange> ranges = sequenceAcknowledgement.getAcknowledgementRanges(); + List<RMSequenceAcknowledgement.RMAcknowledgementRange> ranges = sequenceAcknowledgement.getAcknowledgementRanges(); assertEquals(ranges.size(), 2); - RMSequenceAcknowledgement.AcknowledgementRange firstRange = ranges.get(0); + RMSequenceAcknowledgement.RMAcknowledgementRange firstRange = ranges.get(0); assertEquals(firstRange.getLower(), 1); assertEquals(firstRange.getLower(), 1); - RMSequenceAcknowledgement.AcknowledgementRange secondRange = ranges.get(1); + RMSequenceAcknowledgement.RMAcknowledgementRange secondRange = ranges.get(1); assertEquals(secondRange.getLower(), 3); assertEquals(secondRange.getLower(), 3); } @@ -300,11 +300,11 @@ // construct message sequenceAcknowledgementMessage.setIdentifier("http://Business456.com/RM/ABC"); sequenceAcknowledgementMessage.setFinal(); - RMSequenceAcknowledgement.AcknowledgementRange firstRange = sequenceAcknowledgementMessage.newAcknowledgementRange(); + RMSequenceAcknowledgement.RMAcknowledgementRange firstRange = sequenceAcknowledgementMessage.newAcknowledgementRange(); firstRange.setLower(1); firstRange.setUpper(1); sequenceAcknowledgementMessage.addAcknowledgementRange(firstRange); - RMSequenceAcknowledgement.AcknowledgementRange secondRange = sequenceAcknowledgementMessage.newAcknowledgementRange(); + RMSequenceAcknowledgement.RMAcknowledgementRange secondRange = sequenceAcknowledgementMessage.newAcknowledgementRange(); secondRange.setLower(3); secondRange.setUpper(3); sequenceAcknowledgementMessage.addAcknowledgementRange(secondRange); @@ -365,7 +365,7 @@ // perform assertion assertEquals(createSequenceMessage.getAcksTo(), "http://Business456.com/serviceA/789"); assertEquals(createSequenceMessage.getExpires(), RMHelper.stringToDuration("PT0S")); - RMCreateSequence.Offer offer = createSequenceMessage.getOffer(); + RMCreateSequence.RMOffer offer = createSequenceMessage.getOffer(); assertEquals(offer.getIdentifier(), "http://Business456.com/RM/ABC"); assertEquals(offer.getEndpoint(), "http://Business456.com/serviceA/ASDF"); assertEquals(offer.getExpires(), "PT1S"); @@ -378,7 +378,7 @@ // construct message createSequenceMessage.setAcksTo("http://Business456.com/serviceA/789"); createSequenceMessage.setExpires(RMHelper.stringToDuration("PT0S")); - RMCreateSequence.Offer offer = createSequenceMessage.newOffer(); + RMCreateSequence.RMOffer offer = createSequenceMessage.newOffer(); offer.setIdentifier("http://Business456.com/RM/ABC"); offer.setEndpoint("http://Business456.com/serviceA/ASDF"); offer.setExpires("PT1S"); @@ -396,7 +396,7 @@ assertEquals(createSequenceResponseMessage.getIdentifier(), "http://Business456.com/RM/ABC"); assertEquals(createSequenceResponseMessage.getExpires(), RMHelper.stringToDuration("PT0S")); assertEquals(createSequenceResponseMessage.getIncompleteSequenceBehavior(), RMIncompleteSequenceBehavior.DISCARD_FOLLOWING_FIRST_GAP); - RMCreateSequenceResponse.Accept accept = createSequenceResponseMessage.getAccept(); + RMCreateSequenceResponse.RMAccept accept = createSequenceResponseMessage.getAccept(); assertEquals(accept.getAcksTo(), "http://Business456.com/serviceA/ASDF"); } @@ -407,7 +407,7 @@ createSequenceResponse.setIdentifier("http://Business456.com/RM/ABC"); createSequenceResponse.setExpires(RMHelper.stringToDuration("PT0S")); createSequenceResponse.setIncompleteSequenceBehavior(RMIncompleteSequenceBehavior.DISCARD_FOLLOWING_FIRST_GAP); - RMCreateSequenceResponse.Accept accept = createSequenceResponse.newAccept(); + RMCreateSequenceResponse.RMAccept accept = createSequenceResponse.newAccept(); accept.setAcksTo("http://Business456.com/serviceA/ASDF"); createSequenceResponse.setAccept(accept); // perform assertion

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5153 - in stack/cxf/trunk: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-11-30 03:23:20 -0500 (Fri, 30 Nov 2007) New Revision: 5153 Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/version.properties Log: cxf.version=2.0.3-incubator Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-11-29 22:45:11 UTC (rev 5152) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-11-30 08:23:20 UTC (rev 5153) @@ -140,7 +140,7 @@ <echo message="cxf.update.required=${cxf.update.required}"/> </target> - <target name="cxf-update" depends="cxf-update-required" if="cxf.update.required"> + <target name="cxf-update" depends="cxf-update-required" if="cxf.update.required" unless="cxf.checkout.required"> <echo message="svn update -r${cxf.svn.rev} ${cxf.svn.url}"/> <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true"> <arg value="update"/> @@ -149,7 +149,7 @@ </target>  - <target name="cxf-svn-info" depends="cxf-update,cxf-checkout"> + <target name="cxf-svn-info" depends="cxf-checkout,cxf-update"> <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml"> <arg line="info"/> <arg line="--xml"/> Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2007-11-29 22:45:11 UTC (rev 5152) +++ stack/cxf/trunk/version.properties 2007-11-30 08:23:20 UTC (rev 5153) @@ -19,10 +19,11 @@ cxf.svn.rev=HEAD # Apache CXF versions -cxf.version=2.1-incubator-SNAPSHOT +# cxf.version=2.1-incubator-SNAPSHOT +cxf.version=2.0.3-incubator cxf.geronimo.javamail=1.4_spec-1.0-M1 cxf.geronimo.ws.metadata=2.0_spec-1.1.1 -cxf.jaxws.api=2.1-1 +cxf.jaxws.api=2.0 cxf.jdom=1.0 cxf.neethi=2.0.2 cxf.saaj=1.3

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r5152 - in legacy/branches/jbossws-1.2.1.GA_CP: jbossws-core/src/java/org/jboss/ws/tools/helpers and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-11-29 17:45:11 -0500 (Thu, 29 Nov 2007) New Revision: 5152 Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml Removed: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: [JBPAPP-386] WSDL to Java - Incorrect case of generated type for anonymous type. Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-11-29 17:47:29 UTC (rev 5151) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -555,7 +555,7 @@ XSElementDeclaration element = (XSElementDeclaration)term; XSTypeDefinition type = element.getTypeDefinition(); - String tempContainingElement = containingElement + element.getName(); + String tempContainingElement = containingElement + ToolsUtils.firstLetterUpperCase(element.getName()); QName xmlType = null; if (type.getAnonymous() == false) @@ -710,7 +710,7 @@ if (unwrapper.xmlType != null) xmlType = unwrapper.xmlType; - containingElement = containingElement + unwrapper.unwrappedElement.getName(); + containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName()); if (unwrapper.array) arraySuffix = "[]"; Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-11-29 17:47:29 UTC (rev 5151) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -298,7 +298,7 @@ xt = element.getTypeDefinition(); primitive = unwrapper.primitive; partName = element.getName(); - containingElement = containingElement + unwrapper.unwrappedElement.getName(); + containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName()); array = unwrapper.array; if (xt.getAnonymous()) { @@ -632,7 +632,8 @@ QName xmlType; if (type.getAnonymous()) { - xmlType = new QName(type.getNamespace(), containingElement + element.getName()); + String tempName = ToolsUtils.firstLetterUpperCase(containingElement) + ToolsUtils.firstLetterUpperCase(element.getName()); + xmlType = new QName(type.getNamespace(), tempName); } else { @@ -715,7 +716,8 @@ // Anonymous if (localName == null) { - javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true); + String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name); + javaType = getJavaTypeAsString(null, new QName(tempName), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) temp.append(">").append(containingType); Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873 (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws1873; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.test.ws.JBossWSTest; - -/** - * Test case to test the following fix: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-1873 - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 29, 2007 - */ -public class JBWS1873TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1873/" + scenario; - String toolsDir = "tools/jbws1873/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1873/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1873; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.test.ws.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-1873 + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 29, 2007 + */ +public class JBWS1873TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1873/" + scenario; + String toolsDir = "tools/jbws1873/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1873/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873 (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873) Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit) Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1873; - - -public class LookupRequest -{ - -protected java.lang.String surname; -public LookupRequest(){} - -public LookupRequest(java.lang.String surname){ -this.surname=surname; -} -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupRequest.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1873; + + +public class LookupRequest +{ + +protected java.lang.String surname; +public LookupRequest(){} + +public LookupRequest(java.lang.String surname){ +this.surname=surname; +} +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1873; - - -public class LookupResponseResponse -{ - -protected java.lang.String number; -public LookupResponseResponse(){} - -public LookupResponseResponse(java.lang.String number){ -this.number=number; -} -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1873; + + +public class LookupResponseResponse +{ + +protected java.lang.String number; +public LookupResponseResponse(){} + +public LookupResponseResponse(java.lang.String number){ +this.number=number; +} +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1873; - - -public class Person -{ - -protected org.jboss.test.ws.jbws1873.LookupRequest request; -public Person(){} - -public Person(org.jboss.test.ws.jbws1873.LookupRequest request){ -this.request=request; -} -public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;} - -public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/Person.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1873; + + +public class Person +{ + +protected org.jboss.test.ws.jbws1873.LookupRequest request; +public Person(){} + +public Person(org.jboss.test.ws.jbws1873.LookupRequest request){ +this.request=request; +} +public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;} + +public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1873' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1873/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1873' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1873/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name="request" minOccurs="0"> - <complexType> - <all> - <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/> - </all> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name="response" minOccurs="0"> - <complexType> - <all> - <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/> - </all> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> - -</definitions> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1873' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1873/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1873' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1873/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name="request" minOccurs="0"> + <complexType> + <all> + <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/> + </all> + </complexType> + </element> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name="response" minOccurs="0"> + <complexType> + <all> + <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/> + </all> + </complexType> + </element> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> + +</definitions> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1873; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException; -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1873; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException; +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1873; - - -public class TelephoneNumber -{ - -protected org.jboss.test.ws.jbws1873.LookupResponseResponse response; -public TelephoneNumber(){} - -public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ -this.response=response; -} -public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;} - -public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; } - -} Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1873; + + +public class TelephoneNumber +{ + +protected org.jboss.test.ws.jbws1873.LookupResponseResponse response; +public TelephoneNumber(){} + +public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ +this.response=response; +} +public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;} + +public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; } + +} Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,78 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1873</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1873</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>request</java-variable-name> - <xml-element-name>request</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>response</java-variable-name> - <xml-element-name>response</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1873.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>request</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1873.LookupResponseResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>response</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,78 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1873</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1873</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>request</java-variable-name> + <xml-element-name>request</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>Person>request</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>response</java-variable-name> + <xml-element-name>response</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:>TelephoneNumber>response</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1873.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1873.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>request</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1873.LookupResponseResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>response</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-30 10:28:22 UTC (rev 4933) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml 2007-11-29 22:45:11 UTC (rev 5152) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl" - parameter-style="wrapped"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml (from rev 4933, legacy/branches/jbossws-1.2.1.GA_JBWS-1875/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml) =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/tools/jbws1873/doclit/wstools-config.xml 2007-11-29 22:45:11 UTC (rev 5152) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl" + parameter-style="wrapped"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

17 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2007