Author: gdaniels Date: Thu May 24 06:03:03 2007 New Revision: 541294 URL: http://svn.apache.org/viewvc?view=rev&rev=541294 Log: Checking in small changes for a clean tree before more major work.
* AxisEngine methods become static (per https://issues.apache.org/jira/browse/AXIS2-2650) * Clean up logic in ConfigurationContext.registerOperationContext * Fix incorrect variable reference in ModuleBuilder * JavaDoc in AxisConfiguration * Use log.error() in MessageContextChangeTest to make sure we get the output Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java?view=diff&rev=541294&r1=541293&r2=541294 ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java Thu May 24 06:03:03 2007 @@ -175,14 +175,13 @@ try { System.out.println("MessageSaveAndRestoreTest:Worker thread started"); Thread.sleep(5000); - AxisEngine axisEngine = new AxisEngine(configurationContext); System.out.println("MessageSaveAndRestoreTest:Resuming processing"); ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(serializedMessageContext)); MessageContext reconstitutedMessageContext = (MessageContext)objectInputStream.readObject(); reconstitutedMessageContext.activate(configurationContext); - axisEngine.resume(reconstitutedMessageContext); + AxisEngine.resume(reconstitutedMessageContext); } catch (Exception e) { e.printStackTrace(); Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=541294&r1=541293&r2=541294 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Thu May 24 06:03:03 2007 @@ -215,20 +215,21 @@ * If the given message id already has a registered operation context, * no change is made and the methid resturns false. * - * @param messageID - * @param mepContext + * @param messageID the message-id to register + * @param mepContext the OperationContext for the specified message-id + * @return true if we added a new context, false if the messageID was already there and we did + * nothing */ public boolean registerOperationContext(String messageID, OperationContext mepContext) { - boolean alreadyInMap; - mepContext.setKey(messageID); + mepContext.setKey(messageID); // TODO: Doing this here seems dangerous.... synchronized (operationContextMap) { - alreadyInMap = operationContextMap.containsKey(messageID); - if (!alreadyInMap) { + if (!operationContextMap.containsKey(messageID)) { this.operationContextMap.put(messageID, mepContext); + return true; } } - return (!alreadyInMap); + return false; } /** Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?view=diff&rev=541294&r1=541293&r2=541294 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Thu May 24 06:03:03 2007 @@ -281,7 +281,7 @@ // processing <wsp:PolicyReference> .. </..> elements Iterator policyRefElements = operation.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY_REF)); - if (policyRefElements != null && policyElements.hasNext()) { + if (policyRefElements != null && policyRefElements.hasNext()) { processPolicyRefElements(PolicyInclude.AXIS_MODULE_OPERATION_POLICY, policyRefElements, module.getPolicyInclude()); } Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=541294&r1=541293&r2=541294 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Thu May 24 06:03:03 2007 @@ -170,8 +170,8 @@ * Register a messageBuilder implementation against a content type. * This is used by Axis2 to support different message formats. * - * @param contentType - * @param messageBuilder + * @param contentType the relevant content-type (i.e. "text/xml") + * @param messageBuilder a Builder implementation */ public void addMessageBuilder(String contentType, Builder messageBuilder) { @@ -183,8 +183,8 @@ * This is used by Axis2 to support serialization of messages to different * message formats. (Eg: JSON) * - * @param contentType - * @param messageFormatter + * @param contentType the relevant content-type (i.e. "text/xml") + * @param messageFormatter a MessageFormatter implementation */ public void addMessageFormatter(String contentType, MessageFormatter messageFormatter) { @@ -192,10 +192,10 @@ } /** - * Method addModule. + * Add an available Module to this configuration * - * @param module - * @throws AxisFault + * @param module an AxisModule + * @throws AxisFault in case of error */ public void addModule(AxisModule module) throws AxisFault { module.setParent(this); @@ -229,7 +229,7 @@ /** * To remove a given module from the system * - * @param module + * @param module name of module to remove */ public void removeModule(String module) { allModules.remove(module); @@ -239,7 +239,7 @@ /** * Adds module configuration, if there is a moduleConfig tag in service. * - * @param moduleConfiguration + * @param moduleConfiguration a ModuleConfiguration to remember */ public void addModuleConfig(ModuleConfiguration moduleConfiguration) { moduleConfigmap.put(moduleConfiguration.getModuleName(), @@ -275,12 +275,11 @@ axisService = (AxisService) services.next(); String serviceName = axisService.getName(); if (allServices.get(serviceName) != null) { - throw new AxisFault(Messages.getMessage( - "twoservicecannothavesamename", axisService.getName())); + throw new AxisFault(Messages.getMessage("twoservicecannothavesamename", + axisService.getName())); } if (axisService.getSchematargetNamespace() == null) { - axisService - .setSchematargetNamespace(Java2WSDLConstants.AXIS2_XSD); + axisService.setSchematargetNamespace(Java2WSDLConstants.AXIS2_XSD); } } services = axisServiceGroup.getServices(); Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java?view=diff&rev=541294&r1=541293&r2=541294 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java Thu May 24 06:03:03 2007 @@ -61,7 +61,7 @@ public AxisEngine(ConfigurationContext engineContext) { } - private void checkMustUnderstand(MessageContext msgContext) throws AxisFault { + private static void checkMustUnderstand(MessageContext msgContext) throws AxisFault { SOAPEnvelope envelope = msgContext.getEnvelope(); if (envelope.getHeader() == null) { return; @@ -94,7 +94,7 @@ * * @deprecated (post 1.1 branch) */ - public MessageContext createFaultMessageContext(MessageContext processingContext, Throwable e) + public static MessageContext createFaultMessageContext(MessageContext processingContext, Throwable e) throws AxisFault { return MessageContextBuilder.createFaultMessageContext(processingContext, e); } @@ -109,7 +109,7 @@ * @see Phase * @see Handler */ - public InvocationResponse receive(MessageContext msgContext) throws AxisFault { + public static InvocationResponse receive(MessageContext msgContext) throws AxisFault { if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) { log.trace(msgContext.getLogIDString() + " receive:" + msgContext.getMessageID()); } @@ -173,7 +173,7 @@ * the next step in the message processing should be. * @throws AxisFault */ - public InvocationResponse invoke(MessageContext msgContext, boolean inbound, boolean resuming) + public static InvocationResponse invoke(MessageContext msgContext, boolean inbound, boolean resuming) throws AxisFault { if (msgContext.getCurrentHandlerIndex() == -1) { @@ -231,7 +231,7 @@ return pi; } - private void flowComplete(MessageContext msgContext, boolean inbound) { + private static void flowComplete(MessageContext msgContext, boolean inbound) { Iterator invokedPhaseIterator = inbound ? msgContext.getInboundExecutedPhases() : msgContext.getOutboundExecutedPhases(); @@ -260,7 +260,7 @@ * whether or not the message processing will ever succeed. * @throws AxisFault */ - public InvocationResponse resumeReceive(MessageContext msgContext) throws AxisFault { + public static InvocationResponse resumeReceive(MessageContext msgContext) throws AxisFault { if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) { log.trace(msgContext.getLogIDString() + " resumeReceive:" + msgContext.getMessageID()); } @@ -302,7 +302,7 @@ * whether or not the message processing will ever succeed. * @throws AxisFault */ - public InvocationResponse resumeSend(MessageContext msgContext) throws AxisFault { + public static InvocationResponse resumeSend(MessageContext msgContext) throws AxisFault { if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) { log.trace(msgContext.getLogIDString() + " resumeSend:" + msgContext.getMessageID()); } @@ -335,7 +335,7 @@ * whether or not the message processing will ever succeed. * @throws AxisFault */ - public InvocationResponse resume(MessageContext msgctx) throws AxisFault { + public static InvocationResponse resume(MessageContext msgctx) throws AxisFault { if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) { log.trace(msgctx.getLogIDString() + " resume:" + msgctx.getMessageID()); } @@ -359,7 +359,7 @@ * @see Phase * @see Handler */ - public void send(MessageContext msgContext) throws AxisFault { + public static void send(MessageContext msgContext) throws AxisFault { if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) { log.trace(msgContext.getLogIDString() + " send:" + msgContext.getMessageID()); } @@ -419,7 +419,7 @@ * @param msgContext * @throws AxisFault */ - public void sendFault(MessageContext msgContext) throws AxisFault { + public static void sendFault(MessageContext msgContext) throws AxisFault { if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) { log.trace(msgContext.getLogIDString() + " sendFault:" + msgContext.getMessageID()); } @@ -500,7 +500,7 @@ * <p/> * way transport. */ - private class TransportNonBlockingInvocationWorker implements Runnable { + private static class TransportNonBlockingInvocationWorker implements Runnable { private MessageContext msgctx; private TransportSender sender; Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?view=diff&rev=541294&r1=541293&r2=541294 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java Thu May 24 06:03:03 2007 @@ -24,6 +24,7 @@ import org.apache.axis2.transport.MessageFormatter; import org.apache.axis2.transport.TransportUtils; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.context.OperationContext; import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportOutDescription; import org.apache.axis2.i18n.Messages; @@ -304,9 +305,9 @@ } } - if (msgContext.getOperationContext() != null) { - msgContext.getOperationContext() - .setProperty(MessageContext.TRANSPORT_IN, in); + OperationContext opContext = msgContext.getOperationContext(); + if (opContext != null) { + opContext.setProperty(MessageContext.TRANSPORT_IN, in); } } Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?view=diff&rev=541294&r1=541293&r2=541294 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Thu May 24 06:03:03 2007 @@ -210,8 +210,8 @@ } if (msgContext.getOperationContext() != null) { - msgContext.getOperationContext().setProperty( - Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE); + msgContext.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN, + Constants.VALUE_TRUE); } } catch (XMLStreamException e) { log.debug(e); Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java?view=diff&rev=541294&r1=541293&r2=541294 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java (original) +++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java Thu May 24 06:03:03 2007 @@ -133,7 +133,7 @@ int numberKnownFields = knownList.length; if (numberKnownFields != numberFields) { - log.debug("ERROR: number of actual fields [" + numberFields + + log.error("ERROR: number of actual fields [" + numberFields + "] in MessageContext does not match the expected number [" + numberKnownFields + "]"); noChange = false; @@ -148,14 +148,14 @@ Field actualField = findField(fields, name); if (actualField == null) { - log.debug("ERROR: MessageContext is missing field [" + name + "]"); + log.error("ERROR: MessageContext is missing field [" + name + "]"); noChange = false; } else { String knownType = knownList[i].getType(); String actualType = actualField.getType().getName(); if (!knownType.equals(actualType)) { - log.debug("ERROR: MessageContext field [" + name + + log.error("ERROR: MessageContext field [" + name + "] expected type [" + knownType + "] does not match actual type [" + actualType + "]"); noChange = false; @@ -174,7 +174,7 @@ FieldDescription fd = findFieldDescription(name); if (fd == null) { - log.debug("ERROR: MessageContext has new field [" + description + + log.error("ERROR: MessageContext has new field [" + description + "] that needs to be assessed for message context save/restore functions"); noChange = false; } else { @@ -182,7 +182,7 @@ String actualType = fields[j].getType().getName(); if (!knownType.equals(actualType)) { - log.debug("ERROR: MessageContext field [" + name + + log.error("ERROR: MessageContext field [" + name + "] expected type [" + knownType + "] does not match actual type [" + actualType + "]"); noChange = false; @@ -192,7 +192,6 @@ } assertTrue(noChange); - } private Field findField(Field[] fields, String name) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
