Author: richard.opalka(a)jboss.com Date: 2007-12-14 09:29:35 -0500 (Fri, 14 Dec 2007) New Revision: 5319 Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java Log: refactoring Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -18,15 +18,8 @@ } private static final String PREFIX = "wsrm"; - public static final String TARGET_ADDRESS = PREFIX + ".targetAddress"; - public static final String REMOTING_VERSION = PREFIX + ".remotingVersion"; + public static final String ONE_WAY_OPERATION = PREFIX + ".oneWayOperation"; - public static final String INVOCATION_CONTEXT = PREFIX + ".invocationContext"; - public static final String MARSHALLER = PREFIX + ".marshaller"; - public static final String UNMARSHALLER = PREFIX + ".unmarshaller"; - public static final String SERIALIZATION_CONTEXT = PREFIX + ".serializationContext"; - public static final String REMOTING_INVOCATION_CONTEXT = PREFIX + ".remotingInvocationContext"; - public static final String REMOTING_CONFIGURATION_CONTEXT = PREFIX + ".remotingConfigurationContext"; public static final String REQUEST_CONTEXT = PREFIX + ".requestContext"; public static final String RESPONSE_CONTEXT = PREFIX + ".responseContext"; public static final String SEQUENCE_REFERENCE = PREFIX + ".sequenceReference"; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -32,13 +32,11 @@ import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.JAXWSAConstants; import javax.xml.ws.addressing.Relationship; -import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.wsrm.RMAddressingConstants; import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.wsrm.api.RMException; Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.extensions.wsrm.transport; + +/** + * RM transport constants + * + * @author richard.opalka(a)jboss.com + * + * @since Dec 14, 2007 + */ +public class RMChannelConstants +{ + + public static final String TARGET_ADDRESS = "targetAddress"; + public static final String REMOTING_VERSION = "remotingVersion"; + public static final String INVOCATION_CONTEXT = "invocationContext"; + public static final String MARSHALLER = "marshaller"; + public static final String UNMARSHALLER = "unmarshaller"; + public static final String SERIALIZATION_CONTEXT = "serializationContext"; + public static final String REMOTING_INVOCATION_CONTEXT = "remotingInvocationContext"; + public static final String REMOTING_CONFIGURATION_CONTEXT = "remotingConfigurationContext"; + + private RMChannelConstants() + { + // instances not allowed + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -21,8 +21,6 @@ */ package org.jboss.ws.extensions.wsrm.transport; -import static org.jboss.ws.extensions.wsrm.RMConstant.*; - import java.io.IOException; import java.net.URI; import java.util.Map; @@ -58,8 +56,8 @@ { try { - String targetAddress = (String)rmRequest.getMetadata().getContext(INVOCATION_CONTEXT).get(TARGET_ADDRESS); - String version = (String)rmRequest.getMetadata().getContext(INVOCATION_CONTEXT).get(REMOTING_VERSION); + String targetAddress = (String)rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT).get(RMChannelConstants.TARGET_ADDRESS); + String version = (String)rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT).get(RMChannelConstants.REMOTING_VERSION); if (version.startsWith("1.4")) { @@ -84,7 +82,7 @@ } boolean oneWay = RMTransportHelper.isOneWayOperation(rmRequest); - Client client = new Client(locator, JBOSSWS_SUBSYSTEM, rmRequest.getMetadata().getContext(REMOTING_CONFIGURATION_CONTEXT)); + Client client = new Client(locator, JBOSSWS_SUBSYSTEM, rmRequest.getMetadata().getContext(RMChannelConstants.REMOTING_CONFIGURATION_CONTEXT)); client.connect(); client.setMarshaller(RMMarshaller.getInstance()); @@ -92,7 +90,7 @@ if ((false == oneWay) && (null == backPort)) client.setUnMarshaller(RMUnMarshaller.getInstance()); - Map<String, Object> remotingInvocationContext = rmRequest.getMetadata().getContext(REMOTING_INVOCATION_CONTEXT); + Map<String, Object> remotingInvocationContext = rmRequest.getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT); // debug the outgoing request message MessageTrace.traceMessage("Outgoing RM Request Message", rmRequest.getPayload()); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -21,11 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.transport; -import static org.jboss.ws.extensions.wsrm.RMConstant.INVOCATION_CONTEXT; -import static org.jboss.ws.extensions.wsrm.RMConstant.MARSHALLER; -import static org.jboss.ws.extensions.wsrm.RMConstant.REMOTING_INVOCATION_CONTEXT; -import static org.jboss.ws.extensions.wsrm.RMConstant.SERIALIZATION_CONTEXT; -import static org.jboss.ws.extensions.wsrm.RMConstant.UNMARSHALLER; +import static org.jboss.ws.extensions.wsrm.transport.RMChannelConstants.*; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -4,7 +4,6 @@ import java.util.HashMap; import org.jboss.remoting.marshal.Marshaller; import org.jboss.remoting.marshal.UnMarshaller; -import org.jboss.ws.extensions.wsrm.RMConstant; /** * RM metadata heavily used by this RM transport @@ -27,27 +26,27 @@ if (targetAddress == null) throw new IllegalArgumentException("Target address cannot be null"); - invocationContext.put(RMConstant.TARGET_ADDRESS, targetAddress); - invocationContext.put(RMConstant.REMOTING_VERSION, remotingVersion); - setContext(RMConstant.INVOCATION_CONTEXT, invocationContext); + invocationContext.put(RMChannelConstants.TARGET_ADDRESS, targetAddress); + invocationContext.put(RMChannelConstants.REMOTING_VERSION, remotingVersion); + setContext(RMChannelConstants.INVOCATION_CONTEXT, invocationContext); if (marshaller == null || unmarshaller == null) throw new IllegalArgumentException("Unable to create de/serialization context"); Map<String, Object> serializationContext = new HashMap<String, Object>(); - serializationContext.put(RMConstant.MARSHALLER, marshaller); - serializationContext.put(RMConstant.UNMARSHALLER, unmarshaller); - setContext(RMConstant.SERIALIZATION_CONTEXT, serializationContext); + serializationContext.put(RMChannelConstants.MARSHALLER, marshaller); + serializationContext.put(RMChannelConstants.UNMARSHALLER, unmarshaller); + setContext(RMChannelConstants.SERIALIZATION_CONTEXT, serializationContext); if (remotingInvocationContext == null) throw new IllegalArgumentException("Remoting invocation context cannot be null"); - setContext(RMConstant.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext); + setContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext); if (remotingConfigurationContext == null) throw new IllegalArgumentException("Remoting configuraton context cannot be null"); - setContext(RMConstant.REMOTING_CONFIGURATION_CONTEXT, remotingConfigurationContext); + setContext(RMChannelConstants.REMOTING_CONFIGURATION_CONTEXT, remotingConfigurationContext); } public RMMetadata(Map<String, Object> remotingInvocationContext) @@ -55,7 +54,7 @@ if (remotingInvocationContext == null) throw new IllegalArgumentException("Remoting invocation context cannot be null"); - setContext(RMConstant.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext); + setContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext); } void setContext(String key, Map<String, Object> ctx) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -21,8 +21,6 @@ */ package org.jboss.ws.extensions.wsrm.transport; -import static org.jboss.ws.extensions.wsrm.RMConstant.REMOTING_INVOCATION_CONTEXT; - import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -123,7 +121,7 @@ endTime = System.currentTimeMillis(); if (result.getResponse() != null) { - Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(REMOTING_INVOCATION_CONTEXT); + Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT); if (remotingCtx != null) { if (Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(HTTPMetadataConstants.RESPONSE_CODE))) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -41,7 +41,7 @@ private static Map<String, Object> getWsrmRequestContext(RMMessage rmRequest) { - Map<String, Object> invocationCtx = (Map<String, Object>)rmRequest.getMetadata().getContext(INVOCATION_CONTEXT); + Map<String, Object> invocationCtx = (Map<String, Object>)rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT); return (Map<String, Object>)invocationCtx.get(REQUEST_CONTEXT); } @@ -54,12 +54,10 @@ { RMMetadata meta = rmRequest.getMetadata(); if (meta == null) throw new RuntimeException("Unable to obtain wsrm metadata"); - Map<String, Object> invCtx = meta.getContext(RMConstant.INVOCATION_CONTEXT); + Map<String, Object> invCtx = meta.getContext(RMChannelConstants.INVOCATION_CONTEXT); if (invCtx == null) throw new RuntimeException("Unable to obtain invocation context"); Map<String, Object> wsrmReqCtx = (Map<String, Object>)invCtx.get(RMConstant.REQUEST_CONTEXT); Boolean isOneWay = (Boolean)wsrmReqCtx.get(ONE_WAY_OPERATION); - logger.debug("oneWayMessage == " + (isOneWay == null ? false : isOneWay.booleanValue())); - logger.debug("messages == " + wsrmReqCtx.get(PROTOCOL_MESSAGES)); return isOneWay == null ? false : isOneWay.booleanValue(); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -77,8 +77,7 @@ public void testOneWayMethods() throws Exception { - boolean addressableClient = isClientAddressable(); - RMSequence sequence = ((RMProvider)proxy).createSequence(addressableClient); + RMSequence sequence = ((RMProvider)proxy).createSequence(isClientAddressable()); setAddrProps(proxy, "http://useless/action1", serviceURL); proxy.method1(); setAddrProps(proxy, "http://useless/action2", serviceURL);