[jbossws-commits] JBossWS SVN: r4696 - in stack/native/branches/tdiesler/trunk: ant-import and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-10-09 00:48:47 -0400 (Tue, 09 Oct 2007) New Revision: 4696 Modified: stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml stack/native/branches/tdiesler/trunk/ant-import/macros-deploy-native.xml stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java stack/native/branches/tdiesler/trunk/version.properties Log: partial commit Modified: stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2007-10-08 18:26:57 UTC (rev 4695) +++ stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2007-10-09 04:48:47 UTC (rev 4696) @@ -56,6 +56,7 @@ <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-src.zip" dest="${thirdparty.dir}/jbossws-jboss40-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/branches/tdiesler/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/branches/tdiesler/trunk/ant-import/macros-deploy-native.xml 2007-10-08 18:26:57 UTC (rev 4695) +++ stack/native/branches/tdiesler/trunk/ant-import/macros-deploy-native.xml 2007-10-09 04:48:47 UTC (rev 4696) @@ -160,7 +160,6 @@ <include name="jboss-xml-binding.jar"/> </fileset> </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> @@ -212,7 +211,7 @@ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> <!-- Remove only, do not deploy --> <include name="jbossws-integration.jar"/> Modified: stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-10-08 18:26:57 UTC (rev 4695) +++ stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-10-09 04:48:47 UTC (rev 4696) @@ -48,7 +48,6 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.Service.Mode; import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.PortInfo; import javax.xml.ws.http.HTTPBinding; @@ -70,6 +69,7 @@ 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.core.soap.SOAPMessageImpl; import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -177,7 +177,7 @@ { Object retObj = null; - MessageAbstraction reqMsg = getRequestMessage(obj); + SOAPMessageImpl reqMsg = (SOAPMessageImpl)getRequestMessage(obj); String targetAddress = epMetaData.getEndpointAddress(); // R2744 A HTTP request MESSAGE MUST contain a SOAPAction HTTP header field @@ -207,6 +207,8 @@ // Associate a message context with the current thread CommonMessageContext msgContext = new SOAPMessageContextJAXWS(); MessageContextAssociation.pushMessageContext(msgContext); + msgContext.setEndpointMetaData(epMetaData); + msgContext.setSOAPMessage(reqMsg); // The contents of the request context are used to initialize the message context (see section 9.4.1) // prior to invoking any handlers (see chapter 9) for the outbound message. Each property within the @@ -223,7 +225,7 @@ handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]); // Handlers might have replaced the message - reqMsg = msgContext.getMessageAbstraction(); + reqMsg = (SOAPMessageImpl)msgContext.getSOAPMessage(); MessageAbstraction resMsg = null; if (handlerPass) @@ -257,11 +259,11 @@ } finally { - MessageContextAssociation.popMessageContext(); - closeHandlerChain(portName, handlerType[2]); closeHandlerChain(portName, handlerType[1]); closeHandlerChain(portName, handlerType[0]); + + MessageContextAssociation.popMessageContext(); } return retObj; } Modified: stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-10-08 18:26:57 UTC (rev 4695) +++ stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-10-09 04:48:47 UTC (rev 4696) @@ -83,13 +83,13 @@ return newList; } - private static Config getConfig(WSSecurityConfiguration config, String portName, String operationName) + private static Config getConfig(WSSecurityConfiguration config, String portName, String opName) { Port port = config.getPorts().get(portName); if (port == null) return config.getDefaultConfig(); - Operation operation = port.getOperations().get(operationName); + Operation operation = port.getOperations().get(opName); if (operation == null) { Config portConfig = port.getDefaultConfig(); @@ -230,26 +230,29 @@ WSSecurityConfiguration config = getSecurityConfig(ctx); SOAPMessageImpl soapMessage = (SOAPMessageImpl)ctx.getSOAPMessage(); + EndpointMetaData epMetaData = ctx.getEndpointMetaData(); + String port = epMetaData.getPortName().getLocalPart(); + + String opName = null; OperationMetaData opMetaData = ctx.getOperationMetaData(); - String operation = opMetaData.getQName().toString(); - String port = opMetaData.getEndpointMetaData().getPortName().getLocalPart(); + if (opMetaData != null) + opName = opMetaData.getQName().toString(); - Config operationConfig = getConfig(config, port, operation); - - log.debug("WS-Security config: " + operationConfig); + Config opConfig = getConfig(config, port, opName); + log.debug("WS-Security config: " + opConfig); // Nothing to process - if (operationConfig == null) + if (opConfig == null) return; ArrayList<OperationDescription<EncodingOperation>> operations = new ArrayList<OperationDescription<EncodingOperation>>(); - Timestamp timestamp = operationConfig.getTimestamp(); + Timestamp timestamp = opConfig.getTimestamp(); if (timestamp != null) { operations.add(new OperationDescription<EncodingOperation>(TimestampOperation.class, null, null, timestamp.getTtl(), null)); } - if (operationConfig.getUsername() != null) + if (opConfig.getUsername() != null) { Object user = ctx.get(Stub.USERNAME_PROPERTY); Object pass = ctx.get(Stub.PASSWORD_PROPERTY); @@ -267,7 +270,7 @@ } } - Sign sign = operationConfig.getSign(); + Sign sign = opConfig.getSign(); if (sign != null) { List<Target> targets = convertTargets(sign.getTargets()); @@ -283,7 +286,7 @@ operations.add(new OperationDescription<EncodingOperation>(SignatureOperation.class, targets, sign.getAlias(), null, null)); } - Encrypt encrypt = operationConfig.getEncrypt(); + Encrypt encrypt = opConfig.getEncrypt(); if (encrypt != null) { List<Target> targets = convertTargets(encrypt.getTargets()); Modified: stack/native/branches/tdiesler/trunk/version.properties =================================================================== --- stack/native/branches/tdiesler/trunk/version.properties 2007-10-08 18:26:57 UTC (rev 4695) +++ stack/native/branches/tdiesler/trunk/version.properties 2007-10-09 04:48:47 UTC (rev 4696) @@ -28,6 +28,7 @@ jbossws-common=1.0.0.GA jbossws-framework=2.0.1.GA jbossws-jboss40=2.0.1.GA +jbossws-jboss42=2.0.1.GA # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR4