June 2009 - jbossws-commits - Jboss List Archives

JBossWS SVN: r10200 - framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-06-17 02:20:01 -0400 (Wed, 17 Jun 2009) New Revision: 10200 Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-testsuite.xml Log: [JBPAPP-1902] Removing WS-RM initial prototype. Will not be supported in EAP5 Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-testsuite.xml 2009-06-17 06:14:53 UTC (rev 10199) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-testsuite.xml 2009-06-17 06:20:01 UTC (rev 10200) @@ -194,9 +194,6 @@ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> <pathelement location="${tools.jar}"/> -  - <pathelement location="${jboss.server.deploy}/jbossweb.sar/jbossweb.jar"/> - <pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/> </path> </target> @@ -272,9 +269,6 @@ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> <pathelement location="${tools.jar}"/> -  - <pathelement location="${jboss.server.deploy}/jbossweb.sar/jbossweb.jar"/> - <pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/> </path> </target> @@ -350,9 +344,6 @@ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> <pathelement location="${tools.jar}"/> -  - <pathelement location="${jboss.server.deploy}/jbossweb.sar/jbossweb.jar"/> - <pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/> </path> </target>

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10199 - in stack/native/branches/jbossws-native-3.1.2/modules: core/src/main/java/org/jboss/ws/core/client and 19 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-06-17 02:14:53 -0400 (Wed, 17 Jun 2009) New Revision: 10199 Removed: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wsrm/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/wsrm/ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml Log: [JBPAPP-1902] Removing WS-RM initial prototype. Will not be supported in EAP5 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -53,7 +53,6 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -356,15 +355,8 @@ // Get the return object Object retObj = null; - boolean isWsrmMessage = msgContext.get(RMConstant.REQUEST_CONTEXT) != null; - boolean wsrmOneWay = false; - if (isWsrmMessage) + if (oneway == false && handlerPass) { - Boolean temp = (Boolean)((Map<String, Object>)msgContext.get(RMConstant.REQUEST_CONTEXT)).get(RMConstant.ONE_WAY_OPERATION); - wsrmOneWay = (temp == null) ? Boolean.FALSE : temp.booleanValue(); - } - if ((oneway == false && handlerPass) || (isWsrmMessage && (wsrmOneWay == false))) - { // Verify if (binding instanceof CommonSOAPBinding) ((CommonSOAPBinding)binding).checkMustUnderstand(opMetaData); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -70,8 +70,6 @@ import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; @@ -170,15 +168,6 @@ { boolean serialize = true; - if (opMetaData.getEndpointMetaData().getConfig().getRMMetaData() != null) - { - // RM hack to JAX-RPC serialization - if (RMHelper.isRMOperation(opMetaData.getQName())) - { - serialize = false; - } - } - if (serialize) { QName opQName = opMetaData.getQName(); @@ -318,14 +307,11 @@ } } - if (RMHelper.isRMOperation(opMetaData.getQName()) == false) // RM hack - { - if (payloadParent == null) - throw new SOAPException("Cannot find RPC element in"); + if (payloadParent == null) + throw new SOAPException("Cannot find RPC element in"); - QName elName = payloadParent.getElementQName(); - elName = namespaceRegistry.registerQName(elName); - } + QName elName = payloadParent.getElementQName(); + elName = namespaceRegistry.registerQName(elName); } int numParameters = 0; @@ -364,20 +350,17 @@ } } - if (RMHelper.isRMOperation(opMetaData.getQName()) == false) + // Verify the numer of parameters matches the actual message payload + int numChildElements = 0; + Iterator itElements = payloadParent.getChildElements(); + while (itElements.hasNext()) { - // Verify the numer of parameters matches the actual message payload - int numChildElements = 0; - Iterator itElements = payloadParent.getChildElements(); - while (itElements.hasNext()) - { - Node node = (Node)itElements.next(); - if (node instanceof SOAPElement) - numChildElements++; - } - if (numChildElements != numParameters) - throw new WSException("Invalid number of payload elements: " + numChildElements); + Node node = (Node)itElements.next(); + if (node instanceof SOAPElement) + numChildElements++; } + if (numChildElements != numParameters) + throw new WSException("Invalid number of payload elements: " + numChildElements); } // Generic message endpoint @@ -424,8 +407,7 @@ // R2714 For one-way operations, an INSTANCE MUST NOT return a HTTP response that contains a SOAP envelope. // Specifically, the HTTP response entity-body must be empty. - boolean isWsrmMessage = msgContext.get(RMConstant.RESPONSE_CONTEXT) != null; - if (opMetaData.isOneWay() && (false == isWsrmMessage)) + if (opMetaData.isOneWay()) { resMessage.getSOAPPart().setContent(null); return resMessage; @@ -444,19 +426,16 @@ { QName opQName = opMetaData.getResponseName(); - if (false == RMHelper.isRMOperation(opQName)) // RM hack - { - Name opName = new NameImpl(namespaceRegistry.registerQName(opQName)); - soapBodyElement = new SOAPBodyElementRpc(opName); - soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement); + Name opName = new NameImpl(namespaceRegistry.registerQName(opQName)); + soapBodyElement = new SOAPBodyElementRpc(opName); + soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement); - // Add soap encodingStyle - if (opMetaData.getUse() == Use.ENCODED) - { - String envURI = soapEnvelope.getNamespaceURI(); - String envPrefix = soapEnvelope.getPrefix(); - soapBodyElement.setAttributeNS(envURI, envPrefix + ":encodingStyle", Constants.URI_SOAP11_ENC); - } + // Add soap encodingStyle + if (opMetaData.getUse() == Use.ENCODED) + { + String envURI = soapEnvelope.getNamespaceURI(); + String envPrefix = soapEnvelope.getPrefix(); + soapBodyElement.setAttributeNS(envURI, envPrefix + ":encodingStyle", Constants.URI_SOAP11_ENC); } } Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -51,9 +51,6 @@ import org.jboss.ws.core.StubExt; import org.jboss.ws.core.WSTimeoutException; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.wsrm.transport.RMChannel; -import org.jboss.ws.extensions.wsrm.transport.RMMetadata; -import org.jboss.ws.extensions.wsrm.transport.RMTransportHelper; import org.jboss.ws.feature.FastInfosetFeature; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.EndpointProperty; @@ -107,8 +104,6 @@ private boolean closed; private Integer chunkedLength; - private static final RMChannel RM_CHANNEL = RMChannel.getInstance(); - public HTTPRemotingConnection() { // HTTPClientInvoker connect sends gratuitous POST @@ -213,48 +208,40 @@ try { - if (RMTransportHelper.isRMMessage(callProps)) - { - RMMetadata rmMetadata = new RMMetadata(getRemotingVersion(), targetAddress, marshaller, unmarshaller, callProps, metadata, clientConfig); - return RM_CHANNEL.send(reqMessage, rmMetadata); - } - else - { - Client client = new Client(locator, "jbossws", clientConfig); - client.connect(); + Client client = new Client(locator, "jbossws", clientConfig); + client.connect(); - client.setMarshaller(marshaller); + client.setMarshaller(marshaller); - client.setUnMarshaller(unmarshaller); + client.setUnMarshaller(unmarshaller); - if (log.isDebugEnabled()) - log.debug("Remoting metadata: " + metadata); + if (log.isDebugEnabled()) + log.debug("Remoting metadata: " + metadata); - // debug the outgoing message - MessageTrace.traceMessage("Outgoing Request Message", reqMessage); + // debug the outgoing message + MessageTrace.traceMessage("Outgoing Request Message", reqMessage); - MessageAbstraction resMessage = null; + MessageAbstraction resMessage = null; - if (oneway == true) - { - client.invokeOneway(reqMessage, metadata, false); - } - else - { - resMessage = (MessageAbstraction)client.invoke(reqMessage, metadata); - } + if (oneway == true) + { + client.invokeOneway(reqMessage, metadata, false); + } + else + { + resMessage = (MessageAbstraction)client.invoke(reqMessage, metadata); + } - // Disconnect the remoting client - client.disconnect(); + // Disconnect the remoting client + client.disconnect(); - callProps.clear(); - callProps.putAll(metadata); + callProps.clear(); + callProps.putAll(metadata); - // trace the incomming response message - MessageTrace.traceMessage("Incoming Response Message", resMessage); + // trace the incomming response message + MessageTrace.traceMessage("Incoming Response Message", resMessage); - return resMessage; - } + return resMessage; } catch (Throwable th) { Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -21,11 +21,9 @@ */ package org.jboss.ws.core.jaxws.client; -import java.net.URI; import java.rmi.RemoteException; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -36,9 +34,6 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.EndpointReference; import javax.xml.ws.WebServiceException; -import javax.xml.ws.addressing.AddressingBuilder; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.handler.MessageContext; @@ -50,7 +45,6 @@ import javax.xml.ws.soap.SOAPFaultException; import org.jboss.remoting.transport.http.HTTPMetadataConstants; -import org.jboss.util.NotImplementedException; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.CommonMessageContext; @@ -61,19 +55,6 @@ import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.addressing.AddressingClientUtil; -import org.jboss.ws.extensions.wsrm.RMAddressingConstants; -import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.RMClientSequence; -import org.jboss.ws.extensions.wsrm.api.RMException; -import org.jboss.ws.extensions.wsrm.common.RMHelper; -import org.jboss.ws.extensions.wsrm.protocol.RMConstants; -import org.jboss.ws.extensions.wsrm.protocol.RMProvider; -import org.jboss.ws.extensions.wsrm.protocol.spi.RMAckRequested; -import org.jboss.ws.extensions.wsrm.protocol.spi.RMCreateSequenceResponse; -import org.jboss.ws.extensions.wsrm.protocol.spi.RMSequence; -import org.jboss.ws.extensions.wsrm.protocol.spi.RMSequenceAcknowledgement; -import org.jboss.ws.extensions.wsrm.protocol.spi.RMSerializable; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointConfigMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -86,7 +67,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 04-Jul-2006 */ -public class ClientImpl extends CommonClient implements org.jboss.ws.extensions.wsrm.api.RMProvider, BindingProvider +public class ClientImpl extends CommonClient implements BindingProvider { // the associated endpoint meta data @@ -99,19 +80,6 @@ private Map<HandlerType, HandlerChainExecutor> executorMap = new HashMap<HandlerType, HandlerChainExecutor>(); private static HandlerType[] HANDLER_TYPES = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST }; - // WS-RM sequence associated with the proxy - private RMClientSequence wsrmSequence; - - public final void setWSRMSequence(RMClientSequence wsrmSequence) - { - this.wsrmSequence = wsrmSequence; - } - - public final RMClientSequence getWSRMSequence() - { - return this.wsrmSequence; - } - public ClientImpl(EndpointMetaData epMetaData, HandlerResolver handlerResolver) { super(epMetaData); @@ -256,33 +224,6 @@ // request context is copied to the message context with a scope of HANDLER. Map<String, Object> reqContext = getBindingProvider().getRequestContext(); - if (this.wsrmSequence != null) - { - if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false) - { - if (this.wsrmSequence.getBackPort() != null) - { - // rewrite ReplyTo to use client addressable back port - Map<String, Object> requestContext = getBindingProvider().getRequestContext(); - AddressingProperties addressingProps = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); - addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(this.wsrmSequence.getBackPort())); - } - Map<String, Object> rmRequestContext = new HashMap<String, Object>(); - List<QName> outMsgs = new LinkedList<QName>(); - wsrmSequence.newMessageNumber(); - outMsgs.add(RMProvider.get().getConstants().getSequenceQName()); - outMsgs.add(RMProvider.get().getConstants().getAckRequestedQName()); - if (wsrmSequence.isAckRequested()) - { - // piggy backing - outMsgs.add(RMProvider.get().getConstants().getSequenceAcknowledgementQName()); - } - rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs); - rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, wsrmSequence); - reqContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext); - } - } - msgContext.putAll(reqContext); try @@ -307,33 +248,6 @@ { msgContext = MessageContextAssociation.peekMessageContext(); - if (this.wsrmSequence != null) - { - if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false) - { - Map<String, Object> wsrmResCtx = (Map<String, Object>)msgContext.get(RMConstant.RESPONSE_CONTEXT); - if (wsrmResCtx != null) - { - 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); - } - } - } - } // Copy the inbound msg properties to the binding's response context for (String key : msgContext.keySet()) @@ -519,70 +433,4 @@ return Boolean.TRUE.equals(bool); } - /////////////////// - // WS-RM support // - /////////////////// - @SuppressWarnings("unchecked") - public void createSequence() throws RMException - { - if (this.wsrmSequence != null) - throw new IllegalStateException("Sequence already registered with proxy instance"); - - try - { - // set up addressing data - RMClientSequence candidateSequence = new RMClientSequence(this.epConfigMetaData.getConfig().getRMMetaData()); - String address = getEndpointMetaData().getEndpointAddress(); - String action = RMAddressingConstants.CREATE_SEQUENCE_WSA_ACTION; - AddressingProperties addressingProps = null; - URI backPort = candidateSequence.getBackPort(); - if (backPort != null) - { - addressingProps = AddressingClientUtil.createDefaultProps(action, address); - addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(backPort)); - } - else - { - addressingProps = AddressingClientUtil.createAnonymousProps(action, address); - } - Map requestContext = getBindingProvider().getRequestContext(); - requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps); - // set up wsrm request context - QName createSequenceQN = RMProvider.get().getConstants().getCreateSequenceQName(); - Map rmRequestContext = new HashMap(); - List outMsgs = new LinkedList(); - outMsgs.add(createSequenceQN); - rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs); - rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, candidateSequence); - requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext); - // invoke stub method - invoke(createSequenceQN, new Object[] {}, getBindingProvider().getResponseContext()); - // read WSRM sequence id from response context - Map rmResponseContext = (Map)getBindingProvider().getResponseContext().get(RMConstant.RESPONSE_CONTEXT); - RMCreateSequenceResponse createSequenceResponse = ((RMCreateSequenceResponse)((Map)rmResponseContext.get(RMConstant.PROTOCOL_MESSAGES_MAPPING)).get(RMProvider - .get().getConstants().getCreateSequenceResponseQName())); - String outboundId = createSequenceResponse.getIdentifier(); - candidateSequence.setClient(this); - candidateSequence.setOutboundId(outboundId); - candidateSequence.setBehavior(createSequenceResponse.getIncompleteSequenceBehavior()); - candidateSequence.setDuration(RMHelper.durationToLong(createSequenceResponse.getExpires())); - this.wsrmSequence = candidateSequence; - } - catch (Exception e) - { - throw new RMException("Unable to create WSRM sequence", e); - } - } - - public void closeSequence() - { - try - { - this.wsrmSequence.close(); - } - finally - { - this.wsrmSequence = null; - } - } } Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -46,7 +46,6 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.StubExt; -import org.jboss.ws.extensions.wsrm.api.RMProvider; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.wsf.common.JavaUtils; @@ -90,7 +89,6 @@ this.executor = executor; this.stubMethods = new ArrayList(Arrays.asList(BindingProvider.class.getMethods())); this.stubMethods.addAll(Arrays.asList(StubExt.class.getMethods())); - this.stubMethods.addAll(Arrays.asList(RMProvider.class.getMethods())); this.objectMethods = Arrays.asList(Object.class.getMethods()); } @@ -161,12 +159,6 @@ private Object invoke(QName opName, Object[] args, Class retType, Map<String, Object> resContext) throws RemoteException { - boolean rmDetected = this.client.getEndpointConfigMetaData().getConfig().getRMMetaData() != null; - boolean rmActivated = client.getWSRMSequence() != null; - if (rmDetected && !rmActivated) - { - client.createSequence(); - } Object retObj = client.invoke(opName, args, resContext); if (retObj != null) { Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -61,7 +61,6 @@ import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; -import org.jboss.ws.extensions.wsrm.api.RMProvider; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; @@ -397,7 +396,7 @@ T proxy; try { - proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, RMProvider.class, BindingProvider.class, StubExt.class }, handler); + proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, BindingProvider.class, StubExt.class }, handler); } catch (RuntimeException rte) { Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -60,7 +60,6 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -262,8 +261,7 @@ msgContext.setMessageAbstraction(resMessage); } - boolean isWsrmMessage = msgContext.get(RMConstant.RESPONSE_CONTEXT) != null; - if ((oneway == false) || (isWsrmMessage)) // RM hack + if (oneway == false) { // call the response handler chain, removing the fault type entry will not call handleFault for that chain handlersPass = callResponseHandlerChain(sepMetaData, handlerType[2]); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -97,8 +97,7 @@ if (soapBodyElement == null) { - boolean wsrmDisabled = epMetaData.getConfig().getRMMetaData() == null; - if ((epMetaData.getStyle() == Style.RPC) && (wsrmDisabled)) // RM hack + if (epMetaData.getStyle() == Style.RPC) throw new SOAPException("Empty SOAP body with no child element not supported for RPC"); // [JBWS-1125] Support empty soap body elements Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -36,7 +36,6 @@ import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.soap.Style; -import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -305,12 +304,6 @@ // Eager initialization epMetaData.eagerInitialize(); - // wsrm initialization - if (epMetaData.getConfig().getRMMetaData() != null) - { - RMHelper.setupRMOperations(epMetaData); - } - if(log.isDebugEnabled()) log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData()); } Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; @@ -40,7 +39,6 @@ public abstract class CommonConfig { private String configName; - private RMConfig wsrmCfg; private List<URI> features = new ArrayList<URI>(); private List<EndpointProperty> properties = new ArrayList<EndpointProperty>(); @@ -74,16 +72,6 @@ features.remove(nameToURI(type)); } - public void setRMMetaData(RMConfig wsrmCfg) - { - this.wsrmCfg = wsrmCfg; - } - - public RMConfig getRMMetaData() - { - return this.wsrmCfg; - } - public void addProperty(String name, String value) { EndpointProperty p = new EndpointProperty(); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -21,8 +21,6 @@ */ package org.jboss.ws.metadata.config.binding; -import javax.xml.namespace.QName; - import org.jboss.logging.Logger; import org.jboss.ws.metadata.config.EndpointProperty; import org.jboss.ws.metadata.config.jaxws.ClientConfigJAXWS; @@ -34,11 +32,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; -import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig; -import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig; -import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig; -import org.jboss.ws.extensions.wsrm.config.RMConfig; -import org.jboss.ws.extensions.wsrm.config.RMPortConfig; /** * ObjectModelFactory for JAXWS configurations. @@ -127,114 +120,10 @@ commonConfig.setPostHandlerChains(postHandlerChains); return postHandlerChains; } - if ("reliable-messaging".equals(localName)) - { - RMConfig wsrmCfg = new RMConfig(); - commonConfig.setRMMetaData(wsrmCfg); - return wsrmCfg; - } return null; } - public Object newChild(RMConfig wsrmConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - int countOfAttributes = attrs.getLength(); - - if (localName.equals("delivery-assurance")) - { - RMDeliveryAssuranceConfig deliveryAssurance = getDeliveryAssurance(attrs); - wsrmConfig.setDeliveryAssurance(deliveryAssurance); - return deliveryAssurance; - } - if (localName.equals("message-retransmission")) - { - int interval = 0, attempts = 0, timeout=0; - for (int i = 0; i < countOfAttributes; i++) - { - String attrLocalName = attrs.getLocalName(i); - if (attrLocalName.equals("interval")) - interval = Integer.valueOf(attrs.getValue(i)); - if (attrLocalName.equals("attempts")) - attempts = Integer.valueOf(attrs.getValue(i)); - if (attrLocalName.equals("timeout")) - timeout = Integer.valueOf(attrs.getValue(i)); - } - - RMMessageRetransmissionConfig retransmissionConfig = new RMMessageRetransmissionConfig(); - retransmissionConfig.setCountOfAttempts(attempts); - retransmissionConfig.setRetransmissionInterval(interval); - retransmissionConfig.setMessageTimeout(timeout); - wsrmConfig.setMessageRetransmission(retransmissionConfig); - return retransmissionConfig; - } - if (localName.equals("backports-server")) - { - String host = null, port = null; - for (int i = 0; i < countOfAttributes && (host == null || port == null); i++) - { - String attrLocalName = attrs.getLocalName(i); - if (attrLocalName.equals("host")) - host = attrs.getValue(i); - if (attrLocalName.equals("port")) - port = attrs.getValue(i); - } - - RMBackPortsServerConfig backportsServer = new RMBackPortsServerConfig(); - backportsServer.setHost(host); - backportsServer.setPort(port); - wsrmConfig.setBackPortsServer(backportsServer); - return backportsServer; - } - if (localName.equals("port")) - { - String portName = null; - for (int i = 0; i < countOfAttributes; i++) - { - if (attrs.getLocalName(i).equals("name")) - { - portName = attrs.getValue(i); - break; - } - } - RMPortConfig port = new RMPortConfig(); - port.setPortName(QName.valueOf(portName)); - wsrmConfig.getPorts().add(port); - return port; - } - - return null; - } - - public Object newChild(RMPortConfig port, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - if (localName.equals("delivery-assurance")) - { - RMDeliveryAssuranceConfig deliveryAssurance = getDeliveryAssurance(attrs); - port.setDeliveryAssurance(deliveryAssurance); - return deliveryAssurance; - } - - return null; - } - - private RMDeliveryAssuranceConfig getDeliveryAssurance(Attributes attrs) - { - String inOrder = null, quality = null; - for (int i = 0; i < attrs.getLength() && (inOrder == null || quality == null); i++) - { - String attrLocalName = attrs.getLocalName(i); - if (attrLocalName.equals("inOrder")) - inOrder = attrs.getValue(i); - if (attrLocalName.equals("quality")) - quality = attrs.getValue(i); - } - RMDeliveryAssuranceConfig deliveryAssurance = new RMDeliveryAssuranceConfig(); - deliveryAssurance.setQuality(quality); - deliveryAssurance.setInOrder(inOrder); - return deliveryAssurance; - } - /** * Called when parsing of a new element started. */ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -62,8 +62,6 @@ import org.jboss.ws.core.jaxws.client.DispatchBinding; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; -import org.jboss.ws.extensions.wsrm.config.RMConfig; -import org.jboss.ws.extensions.wsrm.config.RMPortConfig; import org.jboss.ws.metadata.accessor.AccessorFactory; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator; @@ -866,62 +864,12 @@ log.debug("Create new config [name=" + configName + ",file=" + configFile + "]"); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - List<RMPortConfig> rmPortMetaData = null; - if (base != null) - { - rmPortMetaData = backupRMMD(base.getConfig()); - } CommonConfig config = factory.getConfig(getRootFile(), configName, configFile); - propagateRMMD(rmPortMetaData, config); toInitialise.setConfig(config); toInitialise.configHandlerMetaData(); } - private List<RMPortConfig> backupRMMD(CommonConfig config) - { - if ((config != null) && (config.getRMMetaData() != null)) - return config.getRMMetaData().getPorts(); - - return null; - } - - private void propagateRMMD(List<RMPortConfig> backedUpMD, CommonConfig config) - { - if ((backedUpMD != null) && (backedUpMD.size() > 0)) - { - if (config.getRMMetaData() == null) - { - config.setRMMetaData(new RMConfig()); - config.getRMMetaData().getPorts().addAll(backedUpMD); - } - else - { - // RM policy specified in config file will be always used - List<RMPortConfig> ports = config.getRMMetaData().getPorts(); - for (RMPortConfig portMD : backedUpMD) - { - QName portName = portMD.getPortName(); - if (!contains(ports, portName)) - { - ports.add(portMD); - } - } - } - } - } - - private boolean contains(List<RMPortConfig> ports, QName portName) - { - for (RMPortConfig pMD : ports) - { - if (pMD.getPortName().equals(portName)) - return true; - } - - return false; - } - public List<Class> getRegisteredTypes() { return Collections.unmodifiableList(registeredTypes); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -36,7 +36,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; -import org.jboss.ws.extensions.wsrm.protocol.RMProvider; import org.jboss.wsf.common.JavaUtils; import org.w3c.dom.Element; @@ -184,7 +183,7 @@ } } - if ((tmpMethod == null) && (epMetaData.getConfig().getRMMetaData() == null)) // RM hack + if (tmpMethod == null) throw new WSException("Cannot find java method: " + javaName); } return tmpMethod; @@ -479,8 +478,7 @@ } // Report unsynchronized java method - boolean isRMMethod = RMProvider.get().getConstants().getNamespaceURI().equals(qname.getNamespaceURI()); - if ((javaMethod == null) && (isRMMethod == false)) // RM hack + if (javaMethod == null) { StringBuilder errMsg = new StringBuilder("Cannot synchronize to any of these methods:"); for (Method method : unsynchronizedMethods) Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -79,14 +79,12 @@ import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser; import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer; -import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.feature.FastInfosetFeature; import org.jboss.ws.feature.JsonEncodingFeature; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; import org.jboss.wsf.common.IOUtils; import org.jboss.wsf.spi.SPIProvider; @@ -325,11 +323,7 @@ } } - Map<String, Object> rmResCtx = (Map<String, Object>)msgContext.get(RMConstant.RESPONSE_CONTEXT); - boolean isWsrmMessage = rmResCtx != null; - boolean isWsrmOneWay = isWsrmMessage && (Boolean)rmResCtx.get(RMConstant.ONE_WAY_OPERATION); - if ((outStream != null) && (isWsrmOneWay == false)) // RM hack - sendResponse(endpoint, outStream, isFault); + sendResponse(endpoint, outStream, isFault); } catch (Exception ex) { Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-17 06:14:53 UTC (rev 10199) @@ -79,10 +79,6 @@ <property name="requires">UnifiedMetaDataModel</property> </bean> - <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> - <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> - </bean> - <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> <property name="provides">UnifiedMetaDataModel</property> @@ -114,7 +110,6 @@ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - <inject bean="WSNativeRMDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> <inject bean="WSNativeEagerInitializeDeploymentAspect"/> <inject bean="WSJAXBIntroDeploymentAspect"/> @@ -134,7 +129,6 @@ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - <inject bean="WSNativeRMDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> <inject bean="WSJAXBIntroDeploymentAspect"/> </set> @@ -153,7 +147,6 @@ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - <inject bean="WSNativeRMDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> <inject bean="WSJAXBIntroDeploymentAspect"/> </set> Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2009-06-17 06:14:53 UTC (rev 10199) @@ -43,7 +43,6 @@ <xsd:complexType name="commonConfigType"> <xsd:sequence> <xsd:element name="config-name" type="xsd:string"/> - <xsd:element name="reliable-messaging" type="tns:rmConfigType" minOccurs="0"/> <xsd:element name="pre-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> <xsd:element name="post-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> @@ -58,128 +57,4 @@ </xsd:sequence> </xsd:complexType> -  - <xsd:complexType name="rmConfigType"> - <xsd:sequence> - <xsd:element name="delivery-assurance" type="tns:deliveryAssuranceType" minOccurs="0"> - <xsd:annotation> - <xsd:documentation> - Global WS-RM delivery assurance configuration that applies to all WSDL ports. - If there is the WS-Policy with attached WS-RM assertion in WSDL - associated with some port or its associated binding it - will always override this global configuration. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="backports-server" type="tns:backportsServerType" minOccurs="0"> - <xsd:annotation> - <xsd:documentation> - Backports server configuration to be used for addressable clients. - If element is not present in client configuration then client is anonymous. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="message-retransmission" type="tns:messageRetransmissionType" minOccurs="0"> - <xsd:annotation> - <xsd:documentation> - Message retransmission allow users to configure the QoS of WS-RM. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="port" type="tns:portType" minOccurs="0" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation> - WSDL port specific WS-RM delivery assurance configuration. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="messageRetransmissionType"> - <xsd:attribute name="interval" type="xsd:int" use="required"> - <xsd:annotation> - <xsd:documentation> - Message retransmission interval (in seconds) - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="attempts" type="xsd:int" use="required"> - <xsd:annotation> - <xsd:documentation> - Maximum count of message retransmission attempts. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="timeout" type="xsd:int" use="required"> - <xsd:annotation> - <xsd:documentation> - Maximum count of seconds to wait for response. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - </xsd:complexType> - <xsd:complexType name="backportsServerType"> - <xsd:attribute name="host" type="xsd:string" use="optional"> - <xsd:annotation> - <xsd:documentation> - Host name to be used for backports server. If not specified default one will be detected. - Make sure you have DNS correctly configured so runtime is able to detect your real hostname. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attribute name="port" type="xsd:int" use="required"> - <xsd:annotation> - <xsd:documentation> - Port number to be used for backports server. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - </xsd:complexType> - <xsd:complexType name="deliveryAssuranceType"> - <xsd:attribute name="quality" use="required"> - <xsd:annotation> - <xsd:documentation> - Quality of service to be ensured. - </xsd:documentation> - </xsd:annotation> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="AtLeastOnce"/> - <xsd:enumeration value="AtMostOnce"/> - <xsd:enumeration value="ExactlyOnce"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - <xsd:attribute name="inOrder" type="xsd:boolean" use="required"> - <xsd:annotation> - <xsd:documentation> - In order quality of service to be ensured. Set this attribute to 'true' to ensure in order message delivery. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - </xsd:complexType> - <xsd:complexType name="portType"> - <xsd:sequence> - <xsd:element name="delivery-assurance" type="tns:deliveryAssuranceType"> - <xsd:annotation> - <xsd:documentation> - This WSDL port specific WS-RM delivery assurance configuration - applies to all its operations. - This configuration always overrides the global configuration. - If there is a WS-Policy with attached WS-RM assertion in WSDL - associated with this port or its associated binding it - will be always overriden this port specific configuration. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"> - <xsd:annotation> - <xsd:documentation> - WSDL port name specified in the form {namespace}localPart. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - </xsd:complexType> - </xsd:schema> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-17 06:14:53 UTC (rev 10199) @@ -750,57 +750,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF"> - <include name="wsrm-jaxws-endpoint-config.xml"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/wsdl" prefix="WEB-INF/wsdl"/> - <zipfileset file="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml" prefix="META-INF"/> - </war> - - <war warfile="${tests.output.dir}/test-libs/jaxws-secured-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.class"/> - <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF"> - <include name="wsrm-jaxws-endpoint-config.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/wsdl" prefix="WEB-INF/wsdl"/> - <zipfileset file="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml" prefix="META-INF"/> - </war> - - <jar jarfile="${tests.output.dir}/test-libs/jaxws-wsrm-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/META-INF"> - <include name="wsrm-jaxws-client-config.xml"/> - </metainf> - </jar> - - <jar jarfile="${tests.output.dir}/test-libs/jaxws-secured-wsrm-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/META-INF"> - <include name="wsrm-jaxws-client-config.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity/META-INF"> - <include name="jboss-wsse-client.xml"/> - </metainf> - </jar> -  </target> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-17 06:14:53 UTC (rev 10199) @@ -222,21 +222,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> - <zipfileset file="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml" prefix="META-INF"/> - </war> - - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/META-INF"> - <include name="wsrm-jaxws-client-config.xml"/> - </metainf> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2009-06-17 06:14:53 UTC (rev 10199) @@ -26,11 +26,6 @@ import javax.xml.namespace.QName; -import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig; -import org.jboss.ws.extensions.wsrm.config.RMConfig; -import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig; -import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig; -import org.jboss.ws.extensions.wsrm.config.RMPortConfig; import org.jboss.ws.metadata.config.EndpointProperty; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; @@ -126,34 +121,4 @@ assertEquals("Wrong property valule", value, "5000"); } - public void testWSRMConfiguration() throws Exception - { - File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml"); - assertTrue(confFile.exists()); - - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL()); - EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard WSRM Endpoint"); - RMConfig wsrmConfig = epConfig.getRMMetaData(); - assertNotNull(wsrmConfig); - RMDeliveryAssuranceConfig deliveryAssurance = wsrmConfig.getDeliveryAssurance(); - assertEquals(deliveryAssurance.getInOrder(), "true"); - assertEquals(deliveryAssurance.getQuality(), "AtLeastOnce"); - List<RMPortConfig> ports = wsrmConfig.getPorts(); - RMPortConfig port1 = ports.get(0); - assertEquals(port1.getPortName(), new QName("http://custom/namespace/", "Port1")); - assertEquals(port1.getDeliveryAssurance().getInOrder(), "false"); - assertEquals(port1.getDeliveryAssurance().getQuality(), "AtMostOnce"); - RMPortConfig port2 = ports.get(1); - assertEquals(port2.getPortName(), new QName("http://custom/namespace/", "Port2")); - assertEquals(port2.getDeliveryAssurance().getInOrder(), "true"); - assertEquals(port2.getDeliveryAssurance().getQuality(), "ExactlyOnce"); - RMBackPortsServerConfig backportsServer = wsrmConfig.getBackPortsServer(); - assertEquals(backportsServer.getHost(), "realhostname.realdomain"); - assertEquals(backportsServer.getPort(), "9999"); - RMMessageRetransmissionConfig messageRetransmission = wsrmConfig.getMessageRetransmission(); - assertEquals(messageRetransmission.getCountOfAttempts(), 50); - assertEquals(messageRetransmission.getRetransmissionInterval(), 10); - assertEquals(messageRetransmission.getMessageTimeout(), 3); - } } Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2009-06-16 12:41:21 UTC (rev 10198) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2009-06-17 06:14:53 UTC (rev 10199) @@ -39,21 +39,4 @@ </endpoint-config> - <endpoint-config> - - <config-name>Standard WSRM Endpoint</config-name> - <reliable-messaging> - <delivery-assurance inOrder="true" quality="AtLeastOnce"/> - <backports-server host="realhostname.realdomain" port="9999"/> - <message-retransmission attempts="50" interval="10" timeout="3"/> - <port name="{http://custom/namespace/}Port1"> - <delivery-assurance inOrder="false" quality="AtMostOnce"/> - </port> - <port name="{http://custom/namespace/}Port2"> - <delivery-assurance inOrder="true" quality="ExactlyOnce"/> - </port> - </reliable-messaging> - - </endpoint-config> - </jaxws-config>

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10198 - in stack/native/branches/jbossws-native-3.1.2/modules: core/src/main/java/org/jboss/ws/extensions/wsrm and 12 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-06-16 08:41:21 -0400 (Tue, 16 Jun 2009) New Revision: 10198 Removed: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/policy/ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/policy/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wspolicy/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wssecurityAnnotatedpolicy/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wssecuritypolicy/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/wspolicy/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/tools/jbws1645/ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java Log: [JBPAPP-1902] Removing ws-policy Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2009-06-16 12:41:21 UTC (rev 10198) @@ -23,7 +23,9 @@ import java.io.IOException; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import javax.jws.soap.SOAPBinding; import javax.xml.namespace.QName; @@ -31,9 +33,9 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.soap.Style; -import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -56,7 +58,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; -import org.jboss.ws.annotation.EndpointConfig; /** * A client side meta data builder. @@ -85,13 +86,6 @@ buildMetaDataInternal(serviceMetaData, wsdlDefinitions); - //Setup policies for each endpoint - for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) - { - PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getClientSidePolicyMetaDataBuilder(); - policyBuilder.processPolicyExtensions(epMetaData, wsdlDefinitions); - } - // Read the WSDL and initialize the schema model // This should only be needed for debuging purposes of the UMDM JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2009-06-16 12:41:21 UTC (rev 10198) @@ -36,8 +36,6 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.annotation.Documentation; -import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; -import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; @@ -52,7 +50,6 @@ import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.wsdl.JAXBWSDLGenerator; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.tools.wsdl.WSDLGenerator; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.ws.tools.wsdl.WSDLWriterResolver; @@ -154,13 +151,6 @@ createJAXBContext(sepMetaData); populateXmlTypes(sepMetaData); - //Process an optional @PolicyAttachment annotation - if (sepClass.isAnnotationPresent(PolicyAttachment.class)) - { - PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode); - policyBuilder.processPolicyAnnotations(sepMetaData, sepClass); - } - // The server must always generate WSDL if (generateWsdl || !toolMode) processOrGenerateWSDL(seiClass, serviceMetaData, result.wsdlLocation, sepMetaData); @@ -374,19 +364,11 @@ private void processOrGenerateWSDL(Class wsClass, ServiceMetaData serviceMetaData, URL wsdlLocation, EndpointMetaData epMetaData) { - PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode); try { WSDLGenerator generator = new JAXBWSDLGenerator(jaxbCtx); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); if (wsdlLocation != null) { - //we can no longer use the user provided wsdl without parsing it right now, since we - //need to look for policies and eventually choose the supported policy alternatives - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlLocation); - policyBuilder.processPolicyExtensions(epMetaData, wsdlDefinitions); - //now we have the UMDM containing policy data; anyway we can't write a new wsdl file with - //the supported alternatives and so on, since we need to publish the file the user provided serviceMetaData.setWsdlLocation(wsdlLocation); } else Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2009-06-16 12:41:21 UTC (rev 10198) @@ -318,7 +318,6 @@ { UnknownExtensibilityElement uee = (UnknownExtensibilityElement)extElement; boolean understood = false; - understood = understood || processPolicyElements(uee, dest); understood = understood || processUseAddressing(uee, dest); //add processing of further extensibility element types below @@ -331,41 +330,6 @@ } /** - * Process the provided extensibility element looking for policies or policy references. - * Returns true if the provided element is policy related, false otherwise. - * - * @param extElement - * @param dest - * @return - */ - private boolean processPolicyElements(UnknownExtensibilityElement extElement, Extendable dest) - { - boolean result = false; - Element srcElement = extElement.getElement(); - if (Constants.URI_WS_POLICY.equals(srcElement.getNamespaceURI())) - { - //copy missing namespaces from the source element to our element - Element element = (Element)srcElement.cloneNode(true); - copyMissingNamespaceDeclarations(element, srcElement); - if (element.getLocalName().equals("Policy")) - { - WSDLExtensibilityElement el = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICY, element); - el.setRequired("true".equalsIgnoreCase(element.getAttribute("required"))); - dest.addExtensibilityElement(el); - result = true; - } - else if (element.getLocalName().equals("PolicyReference")) - { - WSDLExtensibilityElement el = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICYREFERENCE, element); - el.setRequired("true".equalsIgnoreCase(element.getAttribute("required"))); - dest.addExtensibilityElement(el); - result = true; - } - } - return result; - } - - /** * Process the provided extensibility element looking for UsingAddressing. * Returns true if the provided element is UsingAddressing, false otherwise. * @@ -713,13 +677,6 @@ { WSDLInterface destInterface = new WSDLInterface(destWsdl, qname); - //policy extensions - QName policyURIsProp = (QName)srcPortType.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSP_POLICYURIS); - if (policyURIsProp != null && !"".equalsIgnoreCase(policyURIsProp.getLocalPart())) - { - destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policyURIsProp.getLocalPart())); - } - // documentation Element documentationElement = srcPortType.getDocumentationElement(); if (documentationElement != null && documentationElement.getTextContent() != null) Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2009-06-16 12:41:21 UTC (rev 10198) @@ -45,13 +45,11 @@ import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLImport; import org.jboss.ws.metadata.wsdl.WSDLInterface; -import org.jboss.ws.metadata.wsdl.WSDLInterfaceFault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceMessageReference; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; -import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem; import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; @@ -184,21 +182,11 @@ { for (WSDLExtensibilityElement ext : extendable.getAllExtensibilityElements()) { - appendPolicyElements(builder, ext); appendJAXWSCustomizationElements(builder, ext); //add processing of further extensibility element types below } } - private void appendPolicyElements(StringBuilder builder, WSDLExtensibilityElement extElem) - { - if (Constants.WSDL_ELEMENT_POLICY.equalsIgnoreCase(extElem.getUri()) || - Constants.WSDL_ELEMENT_POLICYREFERENCE.equalsIgnoreCase(extElem.getUri())) - { - appendElementSkippingKnownNs(builder, extElem.getElement()); - } - } - private void appendJAXWSCustomizationElements(StringBuilder builder, WSDLExtensibilityElement extElem) { if (Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS.equalsIgnoreCase(extElem.getUri())) @@ -388,18 +376,6 @@ continue; buffer.append("<portType name='" + intf.getName().getLocalPart() + "'"); - WSDLProperty policyProp = intf.getProperty(Constants.WSDL_PROPERTY_POLICYURIS); - if (policyProp != null) - { - String prefix = wsdl.getPrefix(Constants.URI_WS_POLICY); - buffer.append(" "); - buffer.append(prefix); - buffer.append(":"); - buffer.append(Constants.WSDL_ATTRIBUTE_WSP_POLICYURIS.getLocalPart()); - buffer.append("='"); - buffer.append(policyProp.getValue()); - buffer.append("'"); - } buffer.append(">"); appendDocumentation(buffer, intf.getDocumentationElement()); appendUnknownExtensibilityElements(buffer, intf); Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2009-06-16 12:41:21 UTC (rev 10198) @@ -21,8 +21,6 @@ */ package org.jboss.ws.tools.wsdl; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -32,21 +30,13 @@ import javax.xml.rpc.ParameterMode; import javax.xml.ws.soap.SOAPBinding; -import org.apache.ws.policy.Policy; -import org.apache.ws.policy.util.PolicyFactory; -import org.apache.ws.policy.util.PolicyWriter; import org.jboss.ws.Constants; -import org.jboss.ws.WSException; import org.jboss.ws.core.soap.Style; -import org.jboss.ws.extensions.policy.PolicyScopeLevel; -import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.MetaDataExtension; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.wsdl.Extendable; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingFault; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -63,7 +53,6 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; -import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem; import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; @@ -139,83 +128,7 @@ processOperation(wsdlInterface, wsdlBinding, operation); } - //Policies - MetaDataExtension ext = endpoint.getExtension(Constants.URI_WS_POLICY); - if (ext != null) - { - PolicyMetaExtension policyExt = (PolicyMetaExtension)ext; - for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT)) - { - addPolicyDefinition(policy); - addPolicyReference(policy, wsdlEndpoint); - } - for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT_TYPE)) - { - addPolicyDefinition(policy); - addPolicyURIAttribute(policy, wsdlInterface); - } - for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_BINDING)) - { - addPolicyDefinition(policy); - addPolicyReference(policy, wsdlBinding); - } - } } - - protected void addPolicyDefinition(Policy policy) - { - try - { - PolicyWriter writer = PolicyFactory.getPolicyWriter(PolicyFactory.StAX_POLICY_WRITER); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - writer.writePolicy(policy, outputStream); - Element element = DOMUtils.parse(outputStream.toString(Constants.DEFAULT_XML_CHARSET)); - WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICY, element); - wsdl.addExtensibilityElement(ext); - //optional: to obtain a better looking wsdl, register ws-policy - //prefix in wsdl:definitions if it is not defined there yet - if (wsdl.getPrefix(element.getNamespaceURI())==null) - { - wsdl.registerNamespaceURI(element.getNamespaceURI(),element.getPrefix()); - } - } - catch (IOException ioe) - { - throw new WSException("Error while converting policy to element!"); - } - } - - protected void addPolicyReference(Policy policy, Extendable extendable) - { - QName policyRefQName = Constants.WSDL_ELEMENT_WSP_POLICYREFERENCE; - String prefix = wsdl.getPrefix(policyRefQName.getNamespaceURI()); - if (prefix == null) - { - prefix = "wsp"; - wsdl.registerNamespaceURI(policyRefQName.getNamespaceURI(), prefix); - } - Element element = DOMUtils.createElement(policyRefQName.getLocalPart(), prefix); - element.setAttribute("URI", policy.getPolicyURI()); - //TODO!! we need to understand if the policy is local or not... - WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICYREFERENCE, element); - extendable.addExtensibilityElement(ext); - } - - protected void addPolicyURIAttribute(Policy policy, Extendable extendable) - { - //TODO!! we need to understand if the policy is local or not... - WSDLProperty prop = extendable.getProperty(Constants.WSDL_PROPERTY_POLICYURIS); - if (prop == null) - { - extendable.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policy.getPolicyURI())); - } - else - { - //PolicyURIs ships a comma separated list of URIs... - prop.setValue(prop.getValue() + "," + policy.getPolicyURI()); - } - - } protected void processOperation(WSDLInterface wsdlInterface, WSDLBinding wsdlBinding, OperationMetaData operation) { Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2009-06-16 12:41:21 UTC (rev 10198) @@ -25,8 +25,6 @@ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/> </target> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2009-06-16 12:41:21 UTC (rev 10198) @@ -19,7 +19,6 @@ <classpath> <pathelement path="${maven.test.classpath}"/> </classpath> - <classpath location="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"/> </taskdef> <wsprovide @@ -29,13 +28,6 @@ destdir="${tests.output.dir}/test-classes" verbose="false"/> - <wsprovide - resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurityAnnotatedpolicy" - genwsdl="true" - sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean" - destdir="${tests.output.dir}/test-classes" - verbose="false"/> - </target> </project> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-16 12:41:21 UTC (rev 10198) @@ -283,40 +283,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF"> - <include name="Policy.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecuritypolicy-encrypt.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> -  </target> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2009-06-16 12:41:21 UTC (rev 10198) @@ -22,31 +22,20 @@ package org.jboss.test.ws.common.wsdl11; import java.io.File; -import java.io.Writer; -import java.util.List; import javax.xml.namespace.QName; -import org.jboss.test.ws.tools.validation.WSDLValidator; import org.jboss.ws.Constants; -import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; -import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; -import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.common.IOUtils; -import org.w3c.dom.Element; /** * Test the unmarshalling of wsdl-1.1 into the unified wsdl structure @@ -165,122 +154,4 @@ assertNotNull(wsdlDefinitions); // should throw an Exception when SWA parts are not skipped } - /************************************************** - * Test WSDL 1.1 marshal/unmarshal with policies * - **************************************************/ - - public void testPolicyAttachment() throws Exception - { - File wsdlFile = getResourceFile("common/wsdl11/PolicyAttachment.wsdl"); - assertTrue(wsdlFile.exists()); - testPolicyAttachment(wsdlFile); - wsdlFile = getResourceFile("common/wsdl11/PolicyAttachmentFragment.wsdl"); - assertTrue(wsdlFile.exists()); - testPolicyAttachment(wsdlFile); - } - - private void testPolicyAttachment(File wsdlFile) throws Exception - { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - assertNotNull(wsdlDefinitions); - List<WSDLExtensibilityElement> list = wsdlDefinitions.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICY); - assertNotNull(list); - assertEquals(list.size(),5); - for (WSDLExtensibilityElement extEl : list) - { - Element el = extEl.getElement(); - assertNotNull(el); - QName qName = new QName(el.getNamespaceURI(),el.getLocalName(),el.getPrefix()); - assertEquals(qName,new QName("http://schemas.xmlsoap.org/ws/2004/09/policy","Policy","wsp")); - assertNotNull(el.getAttributeNodeNS("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...","Id")); - //System.out.println(DOMWriter.printNode(extEl.getElement(),true)); - } - } - - public void testServicePolicyRef() throws Exception - { - File wsdlFile = getResourceFile("common/wsdl11/PolicyAttachment.wsdl"); - testServicePolicyRef(wsdlFile); - wsdlFile = getResourceFile("common/wsdl11/PolicyAttachmentFragment.wsdl"); - testServicePolicyRef(wsdlFile); - } - - public void testServicePolicyRef(File wsdlFile) throws Exception - { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - WSDLService wsdlService = wsdlDefinitions.getServices()[0]; - List<WSDLExtensibilityElement> list = wsdlService.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(list); - assertEquals(list.size(),1); - assertPolicyRef(list.get(0),"uselessServicePolicy"); - } - - public void testEndpointPolicyRef() throws Exception - { - File wsdlFile = getResourceFile("common/wsdl11/PolicyAttachment.wsdl"); - testEndpointPolicyRef(wsdlFile); - wsdlFile = getResourceFile("common/wsdl11/PolicyAttachmentFragment.wsdl"); - testEndpointPolicyRef(wsdlFile); - } - - public void testEndpointPolicyRef(File wsdlFile) throws Exception - { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - WSDLService wsdlService = wsdlDefinitions.getServices()[0]; - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoints()[0]; - - List<WSDLExtensibilityElement> extPortList = wsdlEndpoint.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extPortList); - assertEquals(extPortList.size(),1); - assertPolicyRef(extPortList.get(0),"uselessPortPolicy"); - - WSDLProperty extPortTypeProp = wsdlEndpoint.getInterface().getProperty( - Constants.WSDL_PROPERTY_POLICYURIS); - assertEquals(extPortTypeProp.getValue(),"#RmPolicy"); - - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(wsdlEndpoint.getBinding()); - List<WSDLExtensibilityElement> extBinding = wsdlBinding.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extBinding); - assertEquals(extBinding.size(),2); - assertPolicyRef(extBinding.get(0),"RmPolicy"); - assertPolicyRef(extBinding.get(1),"X509EndpointPolicy"); - } - - private void assertPolicyRef(WSDLExtensibilityElement extEl, String policyURI) - { - Element el = extEl.getElement(); - QName qName = new QName(el.getNamespaceURI(),el.getLocalName(),el.getPrefix()); - assertEquals(qName,new QName("http://schemas.xmlsoap.org/ws/2004/09/policy","PolicyReference","wsp")); - assertNotNull(el); - assertEquals(el.getAttributeNode("URI").getValue(),"#"+policyURI); - } - - public void testPolicyAttachmentReadWrite() throws Exception - { - //Read wsdl containing policies from file and get the wsdl metadata model - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(getResourceURL("/common/wsdl11/PolicyAttachment.wsdl")); - assertNotNull(wsdlDefinitions); - //set wsdlOneOne to null to force wsdl generation from metadata model - wsdlDefinitions.setWsdlOneOneDefinition(null); - - //process the wsdl metadata model writing it back to another file - File wsdlDir = new File("./tools/wsdl-out"); - if (!wsdlDir.exists()) wsdlDir.mkdirs(); - Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlDir+"/GeneratedWsdlWithPolicies.wsdl"), Constants.DEFAULT_XML_CHARSET); - new WSDLWriter(wsdlDefinitions).write(fw, Constants.DEFAULT_XML_CHARSET); - fw.close(); - - //parse the obtained file and validate the resulting wsdl metadata model against the first one - WSDLDefinitions newWsdlDefinitions = factory.parse(new File(wsdlDir+"/GeneratedWsdlWithPolicies.wsdl").toURL()); - assertNotNull(newWsdlDefinitions); - WSDLValidator validator = new WSDLValidator(); - assertTrue(validator.validate(wsdlDefinitions,newWsdlDefinitions)); - } } Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLExtensElemTestCase.java 2009-06-16 12:41:21 UTC (rev 10198) @@ -1,129 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.common.wsdl11; - -import java.io.File; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.jboss.ws.Constants; -import org.jboss.ws.metadata.wsdl.WSDLBinding; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; -import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.w3c.dom.Element; - -/** - * Test the unmarshalling of wsdl-1.1 into the unified wsdl structure - * using known and unknown wsdl extensibility elements. - * - * @author alessio.soldano(a)jboss.com - * @since 15-Jan-2009 - */ -public class WSDLExtensElemTestCase extends JBossWSTest -{ - public void testPolicyEndpointExtensibilityElements() throws Exception - { - File wsdlFile = getResourceFile("common/wsdl11/PolicyAttachment.wsdl"); - assertTrue(wsdlFile.exists()); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - WSDLService wsdlService = wsdlDefinitions.getServices()[0]; - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoints()[0]; - - List<WSDLExtensibilityElement> extPortList = wsdlEndpoint.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extPortList); - assertEquals(extPortList.size(),1); - assertPolicyRef(extPortList.get(0),"uselessPortPolicy"); - List<WSDLExtensibilityElement> portNotUnderstoodList = wsdlEndpoint.getNotUnderstoodExtElements(); - assertNotNull(portNotUnderstoodList); - assertEquals(0, portNotUnderstoodList.size()); - - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(wsdlEndpoint.getBinding()); - List<WSDLExtensibilityElement> extBinding = wsdlBinding.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extBinding); - assertEquals(extBinding.size(),2); - assertPolicyRef(extBinding.get(0),"RmPolicy"); - assertPolicyRef(extBinding.get(1),"X509EndpointPolicy"); - List<WSDLExtensibilityElement> bindingNotUnderstoodList = wsdlBinding.getNotUnderstoodExtElements(); - assertNotNull(bindingNotUnderstoodList); - assertEquals(0, bindingNotUnderstoodList.size()); - } - - public void testPolicyAndUnkwnownEndpointExtensibilityElements() throws Exception - { - File wsdlFile = getResourceFile("common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl"); - assertTrue(wsdlFile.exists()); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - WSDLService wsdlService = wsdlDefinitions.getServices()[0]; - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoints()[0]; - - List<WSDLExtensibilityElement> extPortList = wsdlEndpoint.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extPortList); - assertEquals(extPortList.size(),1); - assertPolicyRef(extPortList.get(0),"uselessPortPolicy"); - List<WSDLExtensibilityElement> portNotUnderstoodList = wsdlEndpoint.getNotUnderstoodExtElements(); - assertNotNull(portNotUnderstoodList); - assertEquals(1, portNotUnderstoodList.size()); - assertUnknownExtElem(portNotUnderstoodList.get(0), "foo1", "http://foo.org/foo1", "bar", true); - - WSDLBinding wsdlBinding = wsdlDefinitions.getBinding(wsdlEndpoint.getBinding()); - List<WSDLExtensibilityElement> extBinding = wsdlBinding.getExtensibilityElements( - Constants.WSDL_ELEMENT_POLICYREFERENCE); - assertNotNull(extBinding); - assertEquals(extBinding.size(),2); - assertPolicyRef(extBinding.get(0),"RmPolicy"); - assertPolicyRef(extBinding.get(1),"X509EndpointPolicy"); - List<WSDLExtensibilityElement> bindingNotUnderstoodList = wsdlBinding.getNotUnderstoodExtElements(); - assertNotNull(bindingNotUnderstoodList); - assertEquals(2, bindingNotUnderstoodList.size()); - assertUnknownExtElem(bindingNotUnderstoodList.get(0), "foo1", "http://foo.org/foo1", "bar", false); - assertUnknownExtElem(bindingNotUnderstoodList.get(1), "foo2", "http://foo.org/foo2", "bar", false); - } - - private static void assertPolicyRef(WSDLExtensibilityElement extEl, String policyURI) - { - Element el = extEl.getElement(); - QName qName = new QName(el.getNamespaceURI(),el.getLocalName(),el.getPrefix()); - assertEquals(qName,new QName("http://schemas.xmlsoap.org/ws/2004/09/policy","PolicyReference","wsp")); - assertEquals(el.getAttributeNode("URI").getValue(),"#"+policyURI); - } - - private static void assertUnknownExtElem(WSDLExtensibilityElement extEl, String prefix, String namespaceURI, String localName, boolean required) - { - Element el = extEl.getElement(); - QName qName = new QName(el.getNamespaceURI(),el.getLocalName(),el.getPrefix()); - assertEquals(qName, new QName(namespaceURI, localName, prefix)); - assertEquals(required, "true".equals(el.getAttributeNS(Constants.NS_WSDL11, "required"))); - assertEquals(required, extEl.isRequired()); - } -} Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/WSDLValidationHelper.java 2009-06-16 12:41:21 UTC (rev 10198) @@ -21,15 +21,12 @@ */ package org.jboss.test.ws.tools.validation; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.Map; import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.Constants; import org.jboss.ws.metadata.wsdl.Extendable; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -37,14 +34,12 @@ import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInfault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; -import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.exceptions.JBossWSToolsException; import org.jboss.wsf.common.DOMUtils; @@ -149,90 +144,10 @@ { boolean bool = true; //add validation of further extensibility element types below - if (bool) bool = validatePolicyElements(ext1,ext2); return bool; } - - private static boolean validatePolicyElements(Extendable ext1, Extendable ext2) - throws JBossWSToolsException - { - //policies - List<WSDLExtensibilityElement> pol1 = new ArrayList<WSDLExtensibilityElement>( - ext1.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICY)); - List<WSDLExtensibilityElement> pol2 = new ArrayList<WSDLExtensibilityElement>( - ext2.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICY)); - //check whether lists are the same size - if (pol1.size() != pol2.size()) - throw new JBossWSToolsException("Policy WSDLExtensibilityElement mismatch!"); - //check equality - for (WSDLExtensibilityElement el1 : pol1) - { - boolean done = false; - Iterator it = pol2.iterator(); - WSDLExtensibilityElement el2 = null; - while (it.hasNext() && !done) - { - el2 = (WSDLExtensibilityElement)it.next(); - done = (el1.isRequired() == el2.isRequired()) && - checkElementEquality(el1.getElement(), el2.getElement()); - } - if (!done) - { - log.error("Failing policy validation on policy on: "+ext1+" and "+ext2); - return false; - } - pol2.remove(el2); - } - //policy references - List<WSDLExtensibilityElement> polRef1 = new ArrayList<WSDLExtensibilityElement>( - ext1.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE)); - List<WSDLExtensibilityElement> polRef2 = new ArrayList<WSDLExtensibilityElement>( - ext2.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE)); - //check whether lists are the same size - if (polRef1.size() != polRef2.size()) - throw new JBossWSToolsException("Policy ref WSDLExtensibilityElement mismatch!"); - //check equality - for (WSDLExtensibilityElement el1 : polRef1) - { - boolean done = false; - Iterator it = polRef2.iterator(); - WSDLExtensibilityElement el2 = null; - while (it.hasNext() && !done) - { - el2 = (WSDLExtensibilityElement)it.next(); - done = (el1.isRequired() == el2.isRequired()) && - checkElementEquality(el1.getElement(), el2.getElement()); - } - if (!done) - { - log.error("Failing policy validation on policy ref on: "+ext1+" and "+ext2); - return false; - } - polRef2.remove(el2); - } - //check properties - WSDLProperty prop1 = ext1.getProperty(Constants.WSDL_PROPERTY_POLICYURIS); - WSDLProperty prop2 = ext2.getProperty(Constants.WSDL_PROPERTY_POLICYURIS); - if (prop1 != null || prop2 != null) - { - if (prop1 == null || prop2 == null || prop1.isRequired() != prop2.isRequired()) - throw new JBossWSToolsException("Policy prop WSDLExtensibilityElement mismatch!"); - String value1 = prop1.getValue(); - String value2 = prop2.getValue(); - if (value1 != null || value2 != null) - { - if (value1 == null || value2 == null || !value1.equalsIgnoreCase(value2)) - { - log.error("Failing policy validation on policy uri prop on: "+ext1+" and "+ext2); - return false; - } - } - } - return true; - } - /** * Validates the namespace definitions in the wsdl * @param w1 WSDL Definitions for the first wsdl Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachment.wsdl 2009-06-16 12:41:21 UTC (rev 10198) @@ -1,134 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc" - xmlns:tns="http://org.jboss.ws/jaxrpc" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:ns2="http://org.jboss.ws/jaxrpc/types" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:fab="http://www.fabrikam123.example.com/stock" - xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." > - <wsp:Policy wsu:Id="RmPolicy" > - <rmp:RMAssertion> - <rmp:InactivityTimeout Milliseconds="600000" /> - <rmp:BaseRetransmissionInterval Milliseconds="3000" /> - <rmp:ExponentialBackoff /> - <rmp:AcknowledgementInterval Milliseconds="200" /> - </rmp:RMAssertion> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessServicePolicy" > - <fab:useless>nothing</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessPortPolicy" > - <fab:useless>nothing again</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="X509EndpointPolicy" > - <sp:AsymmetricBinding> - <wsp:Policy> -  - <sp:IncludeTimestamp /> - <sp:OnlySignEntireHeadersAndBody /> - </wsp:Policy> - </sp:AsymmetricBinding> - </wsp:Policy> - <wsp:Policy wsu:Id="SecureMessagePolicy" > - <sp:SignedParts> - <sp:Body /> - </sp:SignedParts> - <sp:EncryptedParts> - <sp:Body /> - </sp:EncryptedParts> - </wsp:Policy> - <types> - <schema targetNamespace="http://org.jboss.ws/jaxrpc/types" xmlns:tns="http://org.jboss.ws/jaxrpc/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema"> - <complexType name="echoSimpleUserType"> - <sequence> - <element name="String_1" type="string" nillable="true"/> - <element name="SimpleUserType_2" type="tns:SimpleUserType" nillable="true"/> - </sequence> - </complexType> - <complexType name="SimpleUserType"> - <sequence> - <element name="a" type="int"/> - <element name="b" type="int"/> - </sequence> - </complexType> - <complexType name="echoSimpleUserTypeResponse"> - <sequence> - <element name="result" type="tns:SimpleUserType" nillable="true"/> - </sequence> - </complexType> - <complexType name="echoString"> - <sequence> - <element name="String_1" type="string" nillable="true"/> - <element name="String_2" type="string" nillable="true"/> - </sequence> - </complexType> - <complexType name="echoStringResponse"> - <sequence> - <element name="result" type="string" nillable="true"/> - </sequence> - </complexType> - <element name="echoSimpleUserType" type="tns:echoSimpleUserType"/> - <element name="echoSimpleUserTypeResponse" type="tns:echoSimpleUserTypeResponse"/> - <element name="echoString" type="tns:echoString"/> - <element name="echoStringResponse" type="tns:echoStringResponse"/> - </schema> - </types> - <message name="JaxRpcTestService_echoSimpleUserType"> - <part name="parameters" element="ns2:echoSimpleUserType"/> - </message> - <message name="JaxRpcTestService_echoSimpleUserTypeResponse"> - <part name="result" element="ns2:echoSimpleUserTypeResponse"/> - </message> - <message name="JaxRpcTestService_echoString"> - <part name="parameters" element="ns2:echoString"/> - </message> - <message name="JaxRpcTestService_echoStringResponse"> - <part name="result" element="ns2:echoStringResponse"/> - </message> - <portType name="JaxRpcTestService" wsp:PolicyURIs="#RmPolicy"> - <operation name="echoSimpleUserType"> - <input message="tns:JaxRpcTestService_echoSimpleUserType"/> - <output message="tns:JaxRpcTestService_echoSimpleUserTypeResponse"/> - </operation> - <operation name="echoString"> - <input message="tns:JaxRpcTestService_echoString"/> - <output message="tns:JaxRpcTestService_echoStringResponse"/> - </operation> - </portType> - <binding name="JaxRpcTestServiceBinding" type="tns:JaxRpcTestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <wsp:PolicyReference URI="#RmPolicy" wsdl:required="true" /> - <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" /> - <operation name="echoSimpleUserType"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="echoString"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - <service name="TestService"> - <wsp:PolicyReference URI="#uselessServicePolicy" wsdl:required="true" /> - <port name="JaxRpcTestServicePort" binding="tns:JaxRpcTestServiceBinding"> - <wsp:PolicyReference URI="#uselessPortPolicy" wsdl:required="true" /> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/> - </port> - </service> -</definitions> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentAndUnknownExtElem.wsdl 2009-06-16 12:41:21 UTC (rev 10198) @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc" - xmlns:tns="http://org.jboss.ws/jaxrpc" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:ns2="http://org.jboss.ws/jaxrpc/types" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:fab="http://www.fabrikam123.example.com/stock" - xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:foo1="http://foo.org/foo1" - xmlns:foo2="http://foo.org/foo2" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." > - <wsp:Policy wsu:Id="RmPolicy" > - <rmp:RMAssertion> - <rmp:InactivityTimeout Milliseconds="600000" /> - <rmp:BaseRetransmissionInterval Milliseconds="3000" /> - <rmp:ExponentialBackoff /> - <rmp:AcknowledgementInterval Milliseconds="200" /> - </rmp:RMAssertion> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessServicePolicy" > - <fab:useless>nothing</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessPortPolicy" > - <fab:useless>nothing again</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="X509EndpointPolicy" > - <sp:AsymmetricBinding> - <wsp:Policy> -  - <sp:IncludeTimestamp /> - <sp:OnlySignEntireHeadersAndBody /> - </wsp:Policy> - </sp:AsymmetricBinding> - </wsp:Policy> - <wsp:Policy wsu:Id="SecureMessagePolicy" > - <sp:SignedParts> - <sp:Body /> - </sp:SignedParts> - <sp:EncryptedParts> - <sp:Body /> - </sp:EncryptedParts> - </wsp:Policy> - <types> - <schema targetNamespace="http://org.jboss.ws/jaxrpc/types" xmlns:tns="http://org.jboss.ws/jaxrpc/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema"> - <complexType name="echoSimpleUserType"> - <sequence> - <element name="String_1" type="string" nillable="true"/> - <element name="SimpleUserType_2" type="tns:SimpleUserType" nillable="true"/> - </sequence> - </complexType> - <complexType name="SimpleUserType"> - <sequence> - <element name="a" type="int"/> - <element name="b" type="int"/> - </sequence> - </complexType> - <complexType name="echoSimpleUserTypeResponse"> - <sequence> - <element name="result" type="tns:SimpleUserType" nillable="true"/> - </sequence> - </complexType> - <complexType name="echoString"> - <sequence> - <element name="String_1" type="string" nillable="true"/> - <element name="String_2" type="string" nillable="true"/> - </sequence> - </complexType> - <complexType name="echoStringResponse"> - <sequence> - <element name="result" type="string" nillable="true"/> - </sequence> - </complexType> - <element name="echoSimpleUserType" type="tns:echoSimpleUserType"/> - <element name="echoSimpleUserTypeResponse" type="tns:echoSimpleUserTypeResponse"/> - <element name="echoString" type="tns:echoString"/> - <element name="echoStringResponse" type="tns:echoStringResponse"/> - </schema> - </types> - <message name="JaxRpcTestService_echoSimpleUserType"> - <part name="parameters" element="ns2:echoSimpleUserType"/> - </message> - <message name="JaxRpcTestService_echoSimpleUserTypeResponse"> - <part name="result" element="ns2:echoSimpleUserTypeResponse"/> - </message> - <message name="JaxRpcTestService_echoString"> - <part name="parameters" element="ns2:echoString"/> - </message> - <message name="JaxRpcTestService_echoStringResponse"> - <part name="result" element="ns2:echoStringResponse"/> - </message> - <portType name="JaxRpcTestService" wsp:PolicyURIs="#RmPolicy"> - <operation name="echoSimpleUserType"> - <input message="tns:JaxRpcTestService_echoSimpleUserType"/> - <output message="tns:JaxRpcTestService_echoSimpleUserTypeResponse"/> - </operation> - <operation name="echoString"> - <input message="tns:JaxRpcTestService_echoString"/> - <output message="tns:JaxRpcTestService_echoStringResponse"/> - </operation> - </portType> - <binding name="JaxRpcTestServiceBinding" type="tns:JaxRpcTestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <wsp:PolicyReference URI="#RmPolicy" wsdl:required="true" /> - <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" /> - <foo1:bar wsdl:required="false"/> - <foo2:bar/> - <operation name="echoSimpleUserType"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="echoString"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - <service name="TestService"> - <wsp:PolicyReference URI="#uselessServicePolicy" wsdl:required="true" /> - <port name="JaxRpcTestServicePort" binding="tns:JaxRpcTestServiceBinding"> - <wsp:PolicyReference URI="#uselessPortPolicy" wsdl:required="true" /> - <foo1:bar wsdl:required="true"/> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/> - </port> - </service> -</definitions> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl 2009-06-16 12:39:23 UTC (rev 10197) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/wsdl11/PolicyAttachmentFragment.wsdl 2009-06-16 12:41:21 UTC (rev 10198) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc" - xmlns:tns="http://org.jboss.ws/jaxrpc" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:fab="http://www.fabrikam123.example.com/stock" - xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." > - <wsp:Policy wsu:Id="RmPolicy" > - <rmp:RMAssertion> - <rmp:InactivityTimeout Milliseconds="600000" /> - <rmp:BaseRetransmissionInterval Milliseconds="3000" /> - <rmp:ExponentialBackoff /> - <rmp:AcknowledgementInterval Milliseconds="200" /> - </rmp:RMAssertion> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessServicePolicy" > - <fab:useless>nothing</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="uselessPortPolicy" > - <fab:useless>nothing again</fab:useless> - </wsp:Policy> - <wsp:Policy wsu:Id="X509EndpointPolicy" > - <sp:AsymmetricBinding> - <wsp:Policy> -  - <sp:IncludeTimestamp /> - <sp:OnlySignEntireHeadersAndBody /> - </wsp:Policy> - </sp:AsymmetricBinding> - </wsp:Policy> - <wsp:Policy wsu:Id="SecureMessagePolicy" > - <sp:SignedParts> - <sp:Body /> - </sp:SignedParts> - <sp:EncryptedParts> - <sp:Body /> - </sp:EncryptedParts> - </wsp:Policy> - <types> - </types> - <portType name="JaxRpcTestService" wsp:PolicyURIs="#RmPolicy"> - </portType> - <binding name="JaxRpcTestServiceBinding" type="tns:JaxRpcTestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <wsp:PolicyReference URI="#RmPolicy" wsdl:required="true" /> - <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" /> - </binding> - <service name="TestService"> - <wsp:PolicyReference URI="#uselessServicePolicy" wsdl:required="true" /> - <port name="JaxRpcTestServicePort" binding="tns:JaxRpcTestServiceBinding"> - <wsp:PolicyReference URI="#uselessPortPolicy" wsdl:required="true" /> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/> - </port> - </service> -</definitions>

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10197 - common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-06-16 08:39:23 -0400 (Tue, 16 Jun 2009) New Revision: 10197 Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/Constants.java Log: [JBPAPP-1888][JBPAPP-1902] Removing constants not required Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/Constants.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/Constants.java 2009-06-16 10:06:19 UTC (rev 10196) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/ws/Constants.java 2009-06-16 12:39:23 UTC (rev 10197) @@ -93,12 +93,6 @@ static final String URI_STYLE_RPC = "http://www.w3.org/2004/03/wsdl/style/rpc"; static final String URI_STYLE_DOCUMENT = "http://www.w3.org/2004/03/wsdl/style/iri"; - /** WS-Eventing namespace uri **/ - static final String URI_WS_EVENTING = "http://schemas.xmlsoap.org/ws/2004/08/eventing"; - - /** WS-Policy namespace uri **/ - static final String URI_WS_POLICY = "http://schemas.xmlsoap.org/ws/2004/09/policy"; - /** WS-Addressing namespace uri **/ static final String URI_WS_ADDRESSING = "http://www.w3.org/2005/08/addressing"; @@ -273,12 +267,6 @@ /** Key to the outbound wsa action */ static final String WSDL_PROPERTY_ACTION_OUT = "http://www.jboss.org/jbossws/wsa/actionOut"; - static final String WSDL_PROPERTY_EVENTSOURCE = "http://www.jboss.org/jbossws/wse/isEventSource"; - - static final String WSDL_ELEMENT_POLICY = "http://www.jboss.org/jbossws/wsp/policy"; - static final String WSDL_PROPERTY_POLICYURIS = "http://www.jboss.org/jbossws/wsp/policyURIs"; - static final String WSDL_ELEMENT_POLICYREFERENCE = "http://www.jboss.org/jbossws/wsp/policyReference"; - /** The key to the original message part name */ static final String WSDL_PROPERTY_PART_NAME = "http://www.jboss.org/jbossws/partname"; /** The key to the message part type in case a part does not reference an element; http://www.jboss.org/jbossws/part/xmltype */ @@ -294,10 +282,6 @@ static final QName WSDL_ATTRIBUTE_WSA_ACTION = new QName(URI_WS_ADDRESSING, "Action"); - static final QName WSDL_ATTRIBUTE_WSE_EVENTSOURCE = new QName(URI_WS_EVENTING, "EventSource"); - - static final QName WSDL_ATTRIBUTE_WSP_POLICYURIS = new QName(URI_WS_POLICY, "PolicyURIs"); - static final QName WSDL_ELEMENT_WSP_POLICYREFERENCE = new QName(URI_WS_POLICY, "PolicyReference"); static final QName WSDL_ELEMENT_JAXWS_BINDINGS = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "bindings"); static final QName WSDL_ELEMENT_JAXWS_CLASS = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "class"); static final QName WSDL_ELEMENT_JAXWS_METHOD = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "method");

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10196 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-06-16 06:06:19 -0400 (Tue, 16 Jun 2009) New Revision: 10196 Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml Log: Use jboss 5.1.0.GA artifacts to run tests (and not snapshots) Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2009-06-16 09:54:37 UTC (rev 10195) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2009-06-16 10:06:19 UTC (rev 10196) @@ -429,7 +429,7 @@ <profile> <id>jboss510</id> <properties> - <jboss.version>5.1.0-SNAPSHOT</jboss.version> + <jboss.version>5.1.0.GA</jboss.version> <jbossws.integration.target>jboss510</jbossws.integration.target> </properties> <dependencies>

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10195 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-06-16 05:54:37 -0400 (Tue, 16 Jun 2009) New Revision: 10195 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java Log: Add impl for getTextContent Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2009-06-16 09:33:10 UTC (rev 10194) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2009-06-16 09:54:37 UTC (rev 10195) @@ -614,8 +614,7 @@ public String getTextContent() throws DOMException { - // FIXME getTextContent - throw new NotImplementedException("getTextContent"); + return domNode.getTextContent(); } public Object getUserData(String key)

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10194 - in stack/native/branches/jbossws-native-3.1.2/modules: core/src/main/java/org/jboss/ws/metadata/builder and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-06-16 05:33:10 -0400 (Tue, 16 Jun 2009) New Revision: 10194 Removed: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/eventing/ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/eventing_200408.xsd stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wseventing/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/wseventing/ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java Log: [JBPAPP-1888] Removing unsupported WS-Eventing implementation Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2009-06-16 09:33:10 UTC (rev 10194) @@ -46,9 +46,6 @@ import org.jboss.ws.core.soap.Use; import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.EventingUtils; -import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -58,11 +55,8 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; -import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -73,9 +67,9 @@ import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; /** An abstract meta data builder. @@ -443,40 +437,7 @@ protected void processEndpointMetaDataExtensions(EndpointMetaData epMetaData, WSDLDefinitions wsdlDefinitions) { - for (WSDLInterface wsdlInterface : wsdlDefinitions.getInterfaces()) - { - WSDLProperty eventSourceProp = wsdlInterface.getProperty(Constants.WSDL_PROPERTY_EVENTSOURCE); - if (eventSourceProp != null && epMetaData instanceof ServerEndpointMetaData) - { - ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData; - String eventSourceNS = wsdlInterface.getName().getNamespaceURI() + "/" + wsdlInterface.getName().getLocalPart(); - - // extract the schema model - JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); - String[] notificationSchema = EventingUtils.extractNotificationSchema(schemaModel); - - // extract the root element NS - String notificationRootElementNS = null; - WSDLInterfaceOperation wsdlInterfaceOperation = wsdlInterface.getOperations()[0]; - if (wsdlInterfaceOperation.getOutputs().length > 0) - { - WSDLInterfaceOperationOutput wsdlInterfaceOperationOutput = wsdlInterfaceOperation.getOutputs()[0]; - notificationRootElementNS = wsdlInterfaceOperationOutput.getElement().getNamespaceURI(); - } - else - { - // WSDL operation of an WSDL interface that is marked as an event source - // requires to carry an output message. - throw new WSException("Unable to resolve eventing root element NS. No operation output found at " + wsdlInterfaceOperation.getName()); - } - - EventingEpMetaExt ext = new EventingEpMetaExt(EventingConstants.NS_EVENTING); - ext.setEventSourceNS(eventSourceNS); - ext.setNotificationSchema(notificationSchema); - ext.setNotificationRootElementNS(notificationRootElementNS); - sepMetaData.addExtension(ext); - } - } + //nothing to do; WS-Eventing processing removed as it's not supported (JBPAPP-1888) } /** Process operation meta data extensions. */ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2009-06-16 09:33:10 UTC (rev 10194) @@ -720,13 +720,6 @@ destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policyURIsProp.getLocalPart())); } - // eventing extensions - QName eventSourceProp = (QName)srcPortType.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSE_EVENTSOURCE); - if (eventSourceProp != null && eventSourceProp.getLocalPart().equals(Boolean.TRUE.toString())) - { - destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_EVENTSOURCE, eventSourceProp.getLocalPart())); - } - // documentation Element documentationElement = srcPortType.getDocumentationElement(); if (documentationElement != null && documentationElement.getTextContent() != null) Deleted: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-06-16 09:33:10 UTC (rev 10194) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.jbws; - -import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; -import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt; -import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory; -import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * A deployer that creates event sources and register them with the - * subscripion manager when a service endpoint is created. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class EventingDeploymentAspect extends DeploymentAspect -{ - @Override - public void start(Deployment dep) - { - for (Endpoint ep : dep.getService().getEndpoints()) - { - ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); - if (sepMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING); - if (ext != null) - { - // Currently several endpoints may belong to an event source deployment. - // Therefore we have to avoid duplicate registrations - // Actually there should be a 1:n mapping of event source NS to endpoints. - // See also http://jira.jboss.org/jira/browse/JBWS-770 - - // create pending incomplete event source - EventingEndpointDeployment desc = new EventingEndpointDeployment(ext.getEventSourceNS(), ext.getNotificationSchema(), ext.getNotificationRootElementNS()); - desc.setEndpointAddress(sepMetaData.getEndpointAddress()); - desc.setPortName(sepMetaData.getPortName()); - - SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance(); - SubscriptionManagerMBean manager = factory.getSubscriptionManager(); - manager.registerEventSource(desc); - } - } - } - - @Override - public void destroy(Deployment dep) - { - for (Endpoint ep : dep.getService().getEndpoints()) - { - ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); - if (sepMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING); - if (ext != null) - { - SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance(); - SubscriptionManagerMBean manager = factory.getSubscriptionManager(); - manager.removeEventSource(ext.getEventSourceURI()); - } - } - } -} Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2009-06-16 09:33:10 UTC (rev 10194) @@ -4,7 +4,6 @@ http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd http\://www.w3.org/2005/08/addressing=schema/ws-addr.xsd -http\://schemas.xmlsoap.org/ws/2004/08/eventing=schema/eventing_200408.xsd http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd http\://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd=schema/j2ee_web_services_client_1_1.xsd Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-16 09:33:10 UTC (rev 10194) @@ -28,11 +28,6 @@ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> </bean> -  - <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> - <property name="bindAddress">${jboss.bind.address}</property> - </bean> -  <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> <property name="recording">false</property> @@ -75,10 +70,6 @@ </property> </bean> - <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> <property name="provides">PublishedContract</property> @@ -121,7 +112,6 @@ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeRMDeploymentAspect"/> @@ -142,7 +132,6 @@ <inject bean="WSNativeEagerInitializeDeploymentAspect"/> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeRMDeploymentAspect"/> @@ -162,7 +151,6 @@ <inject bean="WSNativeEagerInitializeDeploymentAspect"/> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> <inject bean="WSNativeRMDeploymentAspect"/> Deleted: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/eventing_200408.xsd =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/eventing_200408.xsd 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/eventing_200408.xsd 2009-06-16 09:33:10 UTC (rev 10194) @@ -1,186 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/eventing" - xmlns:tns="http://schemas.xmlsoap.org/ws/2004/08/eventing" - xmlns:wsa="http://www.w3.org/2005/08/addressing" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - blockDefault="#all"> - - <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> - -  - <xs:import namespace="http://www.w3.org/2005/08/addressing"/> - -  - <xs:complexType name="DeliveryType" mixed="true"> - <xs:sequence> - <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="Mode" type="xs:anyURI" use="optional"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="NotifyTo" type="wsa:EndpointReferenceType"/> - - <xs:simpleType name="NonNegativeDurationType"> - <xs:restriction base="xs:duration"> - <xs:minInclusive value="P0Y0M0DT0H0M0S"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="ExpirationType"> - <xs:union memberTypes="xs:dateTime tns:NonNegativeDurationType"/> - </xs:simpleType> - - <xs:complexType name="FilterType" mixed="true"> - <xs:sequence> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="Dialect" type="xs:anyURI" use="optional"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:complexType name="LanguageSpecificStringType"> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute ref="xml:lang"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - -  - <xs:element name="Subscribe"> - <xs:complexType> - <xs:sequence> - <xs:element name="EndTo" type="wsa:EndpointReferenceType" minOccurs="0"/> - <xs:element name="Delivery" type="tns:DeliveryType"/> - <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/> - <xs:element name="Filter" type="tns:FilterType" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:element name="Identifier" type="xs:anyURI"/> - -  - <xs:element name="SubscribeResponse"> - <xs:complexType> - <xs:sequence> - <xs:element name="SubscriptionManager" type="wsa:EndpointReferenceType"/> - <xs:element name="Expires" type="tns:ExpirationType"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - -  - <xs:element name="SupportedDialect" type="xs:anyURI"/> - -  - <xs:element name="SupportedDeliveryMode" type="xs:anyURI"/> - -  - <xs:element name="Renew"> - <xs:complexType> - <xs:sequence> - <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - -  - <xs:element name="RenewResponse"> - <xs:complexType> - <xs:sequence> - <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - -  - <xs:element name="GetStatus"> - <xs:complexType> - <xs:sequence> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - -  - <xs:element name="GetStatusResponse"> - <xs:complexType> - <xs:sequence> - <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - -  - <xs:element name="Unsubscribe"> - <xs:complexType> - <xs:sequence> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - -  - -  - <xs:element name="SubscriptionEnd"> - <xs:complexType> - <xs:sequence> - <xs:element name="SubscriptionManager" type="wsa:EndpointReferenceType"/> - <xs:element name="Code" type="tns:OpenSubscriptionEndCodeType"/> - <xs:element name="Reason" type="tns:LanguageSpecificStringType" minOccurs="0" maxOccurs="unbounded"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:simpleType name="SubscriptionEndCodeType"> - <xs:restriction base="xs:QName"> - <xs:enumeration value="tns:DeliveryFailure"/> - <xs:enumeration value="tns:SourceShuttingDown"/> - <xs:enumeration value="tns:SourceCancelling"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="OpenSubscriptionEndCodeType"> - <xs:union memberTypes="tns:SubscriptionEndCodeType xs:QName"/> - </xs:simpleType> - - <xs:attribute name="EventSource" type="xs:boolean"/> - -</xs:schema> \ No newline at end of file Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-16 09:33:10 UTC (rev 10194) @@ -750,17 +750,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/ws/eventing/*.class"/> - <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/wseventing/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-06-16 09:33:10 UTC (rev 10194) @@ -222,26 +222,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/Sysmon**.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF"> - <include name="wsdl/jboss-web.xml"/> - <include name="wsdl/sysmon.wsdl"/> - <include name="wsdl/ws-eventing.wsdl"/> - <include name="wsdl/ws-eventing.xsd"/> - <include name="wsdl/ws-addr.xsd"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing-sink.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/EventSink*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/SystemStatus.class"/> - </fileset> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2009-06-11 12:01:02 UTC (rev 10193) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2009-06-16 09:33:10 UTC (rev 10194) @@ -29,7 +29,6 @@ import org.jboss.test.ws.tools.validation.WSDLValidator; import org.jboss.ws.Constants; -import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; @@ -156,32 +155,6 @@ } - public void testEventSourceBinding() throws Exception - { - File wsdlFile = getResourceFile("common/wsdl11/inherit/wind_inherit.wsdl"); - assertTrue(wsdlFile.exists()); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL()); - - WSDLService service = wsdlDefinitions.getService(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventingService")); - assertNotNull(service); - WSDLEndpoint[] endpoints = service.getEndpoints(); - for (int i = 0; i < endpoints.length; i++) - { - WSDLEndpoint ep = endpoints[i]; - assertEquals(EventingConstants.NS_EVENTING, ep.getName().getNamespaceURI()); - } - - WSDLInterface warningsInterface = wsdlDefinitions.getInterface(new QName(wsdlDefinitions.getTargetNamespace(), "Warnings")); - assertNotNull("Event source port type not parsed", warningsInterface); - assertEquals(warningsInterface.getName().getNamespaceURI(), "http://www.example.org/oceanwatch"); - - WSDLInterface eventSourceInterface = wsdlDefinitions.getInterface(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventSource")); - assertNotNull(eventSourceInterface); - assertEquals(eventSourceInterface.getName().getNamespaceURI(), EventingConstants.NS_EVENTING); - } - public void testSwaMessages() throws Exception { File wsdlFile = getResourceFile("common/wsdl11/SwaTestService.wsdl");

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10193 - framework/branches/ropalka/hudson.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-06-11 08:01:02 -0400 (Thu, 11 Jun 2009) New Revision: 10193 Modified: framework/branches/ropalka/hudson/ant.properties.example Log: changing admin port Modified: framework/branches/ropalka/hudson/ant.properties.example =================================================================== --- framework/branches/ropalka/hudson/ant.properties.example 2009-06-11 11:33:26 UTC (rev 10192) +++ framework/branches/ropalka/hudson/ant.properties.example 2009-06-11 12:01:02 UTC (rev 10193) @@ -19,7 +19,7 @@ hudson.root=/data/workspace hudson.host=jbossws.jboss.org -hudson.admin.port=8250 +hudson.admin.port=8151 hudson.http.port=8280 hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/bra...

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10192 - stack/native/branches/ropalka/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-06-11 07:33:26 -0400 (Thu, 11 Jun 2009) New Revision: 10192 Modified: stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss500.txt stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss501.txt stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss510.txt stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss520.txt stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss600.txt Log: [JBWS-2674][JBWS-2332] disabling test Modified: stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss500.txt 2009-06-11 11:19:05 UTC (rev 10191) +++ stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss500.txt 2009-06-11 11:33:26 UTC (rev 10192) @@ -12,3 +12,6 @@ # [JBWS-2634] Implement support for @EJB annotations in WS components (fixed in AS 501 and above) org/jboss/test/ws/jaxws/jbws2634/** + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.* Modified: stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss501.txt 2009-06-11 11:19:05 UTC (rev 10191) +++ stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss501.txt 2009-06-11 11:33:26 UTC (rev 10192) @@ -6,3 +6,6 @@ # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.* Modified: stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss510.txt 2009-06-11 11:19:05 UTC (rev 10191) +++ stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss510.txt 2009-06-11 11:33:26 UTC (rev 10192) @@ -6,3 +6,6 @@ # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.* \ No newline at end of file Modified: stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss520.txt =================================================================== --- stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss520.txt 2009-06-11 11:19:05 UTC (rev 10191) +++ stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss520.txt 2009-06-11 11:33:26 UTC (rev 10192) @@ -6,3 +6,6 @@ # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.* Modified: stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss600.txt 2009-06-11 11:19:05 UTC (rev 10191) +++ stack/native/branches/ropalka/modules/testsuite/test-excludes-jboss600.txt 2009-06-11 11:33:26 UTC (rev 10192) @@ -6,3 +6,6 @@ # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.*

14 years, 11 months

1
0
0 / 0

JBossWS SVN: r10191 - in framework/branches/ropalka/hudson: hudson-home/jobs/AS-ALL and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-06-11 07:19:05 -0400 (Thu, 11 Jun 2009) New Revision: 10191 Modified: framework/branches/ropalka/hudson/ant.properties.example framework/branches/ropalka/hudson/hudson-home/jobs/AS-ALL/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/CXF-ALL/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/CXF-Light/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/Metro-ALL/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/Metro-Light/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/Native-ALL/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/Native-Light/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/Weekend-Matrix/config.xml framework/branches/ropalka/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml Log: configuring hudson Modified: framework/branches/ropalka/hudson/ant.properties.example =================================================================== --- framework/branches/ropalka/hudson/ant.properties.example 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/ant.properties.example 2009-06-11 11:19:05 UTC (rev 10191) @@ -19,12 +19,12 @@ hudson.root=/data/workspace hudson.host=jbossws.jboss.org -hudson.admin.port=8150 -hudson.http.port=8180 +hudson.admin.port=8250 +hudson.http.port=8280 -hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk -hudson.metro.url=http://anonsvn.jboss.org/repos/jbossws/stack/metro/trunk -hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk +hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/ropalka +hudson.metro.url=http://anonsvn.jboss.org/repos/jbossws/stack/metro/branches/ropalka +hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/ropalka hudson.jboss500.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_0... hudson.jboss500.build=jboss-5.0.0.GA Modified: framework/branches/ropalka/hudson/hudson-home/jobs/AS-ALL/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/AS-ALL/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/AS-ALL/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-5.2.0, AS-6.0.0</childProjects> + <childProjects>AS-5.1.0</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-Tests-AS-5.0.0, AS-Tests-AS-5.0.1, AS-Tests-AS-5.1.0, AS-Tests-AS-5.2.0, AS-Tests-AS-6.0.0</childProjects> + <childProjects>AS-Tests-AS-5.1.0</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/CXF-ALL/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -4,41 +4,12 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> - CXF-Core-AS-5.0.0-JDK5 -, CXF-Core-AS-5.0.1-JDK5 -, CXF-Core-AS-5.1.0-JDK5 -, CXF-Core-AS-5.2.0-JDK5 -, CXF-Core-AS-6.0.0-JDK5 - -, CXF-Core-AS-5.0.0-JDK6 -, CXF-Core-AS-5.0.1-JDK6 + CXF-Core-AS-5.1.0-JDK5 , CXF-Core-AS-5.1.0-JDK6 -, CXF-Core-AS-5.2.0-JDK6 -, CXF-Core-AS-6.0.0-JDK6 - -, CXF-Binary-Distro-AS-5.0.0-JDK5 -, CXF-Binary-Distro-AS-5.0.1-JDK5 , CXF-Binary-Distro-AS-5.1.0-JDK5 -, CXF-Binary-Distro-AS-5.2.0-JDK5 -, CXF-Binary-Distro-AS-6.0.0-JDK5 - -, CXF-Binary-Distro-AS-5.0.0-JDK6 -, CXF-Binary-Distro-AS-5.0.1-JDK6 , CXF-Binary-Distro-AS-5.1.0-JDK6 -, CXF-Binary-Distro-AS-5.2.0-JDK6 -, CXF-Binary-Distro-AS-6.0.0-JDK6 - -, CXF-Source-Distro-AS-5.0.0-JDK5 -, CXF-Source-Distro-AS-5.0.1-JDK5 , CXF-Source-Distro-AS-5.1.0-JDK5 -, CXF-Source-Distro-AS-5.2.0-JDK5 -, CXF-Source-Distro-AS-6.0.0-JDK5 - -, CXF-Source-Distro-AS-5.0.0-JDK6 -, CXF-Source-Distro-AS-5.0.1-JDK6 , CXF-Source-Distro-AS-5.1.0-JDK6 -, CXF-Source-Distro-AS-5.2.0-JDK6 -, CXF-Source-Distro-AS-6.0.0-JDK6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/CXF-Light/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -4,29 +4,10 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> - CXF-Core-AS-5.0.0-JDK5 -, CXF-Core-AS-5.0.1-JDK5 -, CXF-Core-AS-5.1.0-JDK5 -, CXF-Core-AS-5.2.0-JDK5 -, CXF-Core-AS-6.0.0-JDK5 - -, CXF-Core-AS-5.0.0-JDK6 -, CXF-Core-AS-5.0.1-JDK6 + CXF-Core-AS-5.1.0-JDK5 , CXF-Core-AS-5.1.0-JDK6 -, CXF-Core-AS-5.2.0-JDK6 -, CXF-Core-AS-6.0.0-JDK6 - -, CXF-Binary-Distro-AS-5.0.0-JDK5 -, CXF-Binary-Distro-AS-5.0.1-JDK5 , CXF-Binary-Distro-AS-5.1.0-JDK5 -, CXF-Binary-Distro-AS-5.2.0-JDK5 -, CXF-Binary-Distro-AS-6.0.0-JDK5 - -, CXF-Binary-Distro-AS-5.0.0-JDK6 -, CXF-Binary-Distro-AS-5.0.1-JDK6 , CXF-Binary-Distro-AS-5.1.0-JDK6 -, CXF-Binary-Distro-AS-5.2.0-JDK6 -, CXF-Binary-Distro-AS-6.0.0-JDK6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/Metro-ALL/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -4,41 +4,12 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> - Metro-Core-AS-5.0.0-JDK5 -, Metro-Core-AS-5.0.1-JDK5 -, Metro-Core-AS-5.1.0-JDK5 -, Metro-Core-AS-5.2.0-JDK5 -, Metro-Core-AS-6.0.0-JDK5 - -, Metro-Core-AS-5.0.0-JDK6 -, Metro-Core-AS-5.0.1-JDK6 + Metro-Core-AS-5.1.0-JDK5 , Metro-Core-AS-5.1.0-JDK6 -, Metro-Core-AS-5.2.0-JDK6 -, Metro-Core-AS-6.0.0-JDK6 - -, Metro-Binary-Distro-AS-5.0.0-JDK5 -, Metro-Binary-Distro-AS-5.0.1-JDK5 , Metro-Binary-Distro-AS-5.1.0-JDK5 -, Metro-Binary-Distro-AS-5.2.0-JDK5 -, Metro-Binary-Distro-AS-6.0.0-JDK5 - -, Metro-Binary-Distro-AS-5.0.0-JDK6 -, Metro-Binary-Distro-AS-5.0.1-JDK6 , Metro-Binary-Distro-AS-5.1.0-JDK6 -, Metro-Binary-Distro-AS-5.2.0-JDK6 -, Metro-Binary-Distro-AS-6.0.0-JDK6 - -, Metro-Source-Distro-AS-5.0.0-JDK5 -, Metro-Source-Distro-AS-5.0.1-JDK5 , Metro-Source-Distro-AS-5.1.0-JDK5 -, Metro-Source-Distro-AS-5.2.0-JDK5 -, Metro-Source-Distro-AS-6.0.0-JDK5 - -, Metro-Source-Distro-AS-5.0.0-JDK6 -, Metro-Source-Distro-AS-5.0.1-JDK6 , Metro-Source-Distro-AS-5.1.0-JDK6 -, Metro-Source-Distro-AS-5.2.0-JDK6 -, Metro-Source-Distro-AS-6.0.0-JDK6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/Metro-Light/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -4,29 +4,10 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> - Metro-Core-AS-5.0.0-JDK5 -, Metro-Core-AS-5.0.1-JDK5 -, Metro-Core-AS-5.1.0-JDK5 -, Metro-Core-AS-5.2.0-JDK5 -, Metro-Core-AS-6.0.0-JDK5 - -, Metro-Core-AS-5.0.0-JDK6 -, Metro-Core-AS-5.0.1-JDK6 + Metro-Core-AS-5.1.0-JDK5 , Metro-Core-AS-5.1.0-JDK6 -, Metro-Core-AS-5.2.0-JDK6 -, Metro-Core-AS-6.0.0-JDK6 - -, Metro-Binary-Distro-AS-5.0.0-JDK5 -, Metro-Binary-Distro-AS-5.0.1-JDK5 , Metro-Binary-Distro-AS-5.1.0-JDK5 -, Metro-Binary-Distro-AS-5.2.0-JDK5 -, Metro-Binary-Distro-AS-6.0.0-JDK5 - -, Metro-Binary-Distro-AS-5.0.0-JDK6 -, Metro-Binary-Distro-AS-5.0.1-JDK6 , Metro-Binary-Distro-AS-5.1.0-JDK6 -, Metro-Binary-Distro-AS-5.2.0-JDK6 -, Metro-Binary-Distro-AS-6.0.0-JDK6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/Native-ALL/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -4,41 +4,12 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> - Native-Core-AS-5.0.0-JDK5 -, Native-Core-AS-5.0.1-JDK5 -, Native-Core-AS-5.1.0-JDK5 -, Native-Core-AS-5.2.0-JDK5 -, Native-Core-AS-6.0.0-JDK5 - -, Native-Core-AS-5.0.0-JDK6 -, Native-Core-AS-5.0.1-JDK6 + Native-Core-AS-5.1.0-JDK5 , Native-Core-AS-5.1.0-JDK6 -, Native-Core-AS-5.2.0-JDK6 -, Native-Core-AS-6.0.0-JDK6 - -, Native-Binary-Distro-AS-5.0.0-JDK5 -, Native-Binary-Distro-AS-5.0.1-JDK5 , Native-Binary-Distro-AS-5.1.0-JDK5 -, Native-Binary-Distro-AS-5.2.0-JDK5 -, Native-Binary-Distro-AS-6.0.0-JDK5 - -, Native-Binary-Distro-AS-5.0.0-JDK6 -, Native-Binary-Distro-AS-5.0.1-JDK6 , Native-Binary-Distro-AS-5.1.0-JDK6 -, Native-Binary-Distro-AS-5.2.0-JDK6 -, Native-Binary-Distro-AS-6.0.0-JDK6 - -, Native-Source-Distro-AS-5.0.0-JDK5 -, Native-Source-Distro-AS-5.0.1-JDK5 , Native-Source-Distro-AS-5.1.0-JDK5 -, Native-Source-Distro-AS-5.2.0-JDK5 -, Native-Source-Distro-AS-6.0.0-JDK5 - -, Native-Source-Distro-AS-5.0.0-JDK6 -, Native-Source-Distro-AS-5.0.1-JDK6 , Native-Source-Distro-AS-5.1.0-JDK6 -, Native-Source-Distro-AS-5.2.0-JDK6 -, Native-Source-Distro-AS-6.0.0-JDK6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/Native-Light/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/Native-Light/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/Native-Light/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -4,29 +4,10 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> - Native-Core-AS-5.0.0-JDK5 -, Native-Core-AS-5.0.1-JDK5 -, Native-Core-AS-5.1.0-JDK5 -, Native-Core-AS-5.2.0-JDK5 -, Native-Core-AS-6.0.0-JDK5 - -, Native-Core-AS-5.0.0-JDK6 -, Native-Core-AS-5.0.1-JDK6 + Native-Core-AS-5.1.0-JDK5 , Native-Core-AS-5.1.0-JDK6 -, Native-Core-AS-5.2.0-JDK6 -, Native-Core-AS-6.0.0-JDK6 - -, Native-Binary-Distro-AS-5.0.0-JDK5 -, Native-Binary-Distro-AS-5.0.1-JDK5 , Native-Binary-Distro-AS-5.1.0-JDK5 -, Native-Binary-Distro-AS-5.2.0-JDK5 -, Native-Binary-Distro-AS-6.0.0-JDK5 - -, Native-Binary-Distro-AS-5.0.0-JDK6 -, Native-Binary-Distro-AS-5.0.1-JDK6 , Native-Binary-Distro-AS-5.1.0-JDK6 -, Native-Binary-Distro-AS-5.2.0-JDK6 -, Native-Binary-Distro-AS-6.0.0-JDK6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/Weekend-Matrix/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -12,9 +12,9 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"> - <hudson.triggers.TimerTrigger> +  </triggers> <logRotator> <daysToKeep>14</daysToKeep> Modified: framework/branches/ropalka/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml =================================================================== --- framework/branches/ropalka/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-06-11 11:10:40 UTC (rev 10190) +++ framework/branches/ropalka/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-06-11 11:19:05 UTC (rev 10191) @@ -12,9 +12,9 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"> - <hudson.triggers.TimerTrigger> +  </triggers> <logRotator> <daysToKeep>14</daysToKeep>

14 years, 11 months

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 June 2009