Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 31289 invoked from network); 26 Oct 2005 04:34:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Oct 2005 04:34:23 -0000 Received: (qmail 38635 invoked by uid 500); 26 Oct 2005 04:34:17 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 38398 invoked by uid 500); 26 Oct 2005 04:34:14 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 38135 invoked by uid 500); 26 Oct 2005 04:34:11 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 38083 invoked by uid 99); 26 Oct 2005 04:34:09 -0000 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 25 Oct 2005 21:34:00 -0700 Received: (qmail 30527 invoked by uid 65534); 26 Oct 2005 04:33:39 -0000 Message-ID: <20051026043339.30524.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r328554 [3/6] - in /webservices/axis2/trunk/java: modules/codegen/src/org/apache/axis2/databinding/extensions/ modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeans/ modules/codegen/src/org/apache/axis2/rpc/ modules/codegen/s... Date: Wed, 26 Oct 2005 04:33:01 -0000 To: axis2-cvs@ws.apache.org From: chinthaka@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Tue Oct 25 21:29:17 2005 @@ -25,9 +25,9 @@ import org.apache.axis2.deployment.ServiceBuilder; import org.apache.axis2.deployment.ServiceGroupBuilder; import org.apache.axis2.description.AxisDescWSDLComponentFactory; +import org.apache.axis2.description.AxisService; +import org.apache.axis2.description.AxisServiceGroup; import org.apache.axis2.description.ModuleDescription; -import org.apache.axis2.description.ServiceDescription; -import org.apache.axis2.description.ServiceGroupDescription; import org.apache.axis2.i18n.Messages; import org.apache.axis2.om.OMElement; import org.apache.axis2.wsdl.WSDLConstants; @@ -54,16 +54,16 @@ private Log log = LogFactory.getLog(getClass()); /** - * To create a ServiceDescrption ServiceDescription using given wsdl , if the - * service.wsdl there in the arcive file ServiceDescription will be creted using that else - * default ServiceDescription will be crated + * To create a ServiceDescrption AxisService using given wsdl , if the + * service.wsdl there in the arcive file AxisService will be creted using that else + * default AxisService will be crated * * @param file * @return * @throws DeploymentException */ - public ServiceDescription createService(ArchiveFileData file) throws DeploymentException { - ServiceDescription service = null; + public AxisService createService(ArchiveFileData file) throws DeploymentException { + AxisService service = null; InputStream in = file.getClassLoader().getResourceAsStream(SERVICE_WSDL_WITH_FOLDER); boolean foundservice = false; try { @@ -80,15 +80,15 @@ // description we read in as we will be replacing them anyway. WSDLServiceImpl serviceimpl = (WSDLServiceImpl) womDescription.getServices().get(iterator.next()); - service = new ServiceDescription(serviceimpl); + service = new AxisService(serviceimpl); } if (!foundservice) { - service = new ServiceDescription(); + service = new AxisService(); } service.setWSDLDefinition(wsdlVersionWrapper.getDefinition()); in.close(); } else { - service = new ServiceDescription(); + service = new AxisService(); log.info(Messages.getMessage(DeploymentErrorMsgs.WSDL_FILE_NOT_FOUND, file.getName())); } @@ -123,7 +123,7 @@ // description we read in as we will be replacing them anyway. WSDLServiceImpl serviceimpl = (WSDLServiceImpl) womDescription.getServices().get(iterator.next()); - ServiceDescription service = new ServiceDescription(serviceimpl); + AxisService service = new AxisService(serviceimpl); service.setName(serviceimpl.getName()); service.setWSDLDefinition(wsdlVersionWrapper.getDefinition()); depengine.getCurrentFileItem().addService(service); @@ -215,7 +215,7 @@ */ public void processServiceGroup(String filename, DeploymentEngine engine, - ServiceGroupDescription serviceGroupDesc, boolean extarctService) + AxisServiceGroup axisServiceGroup, boolean extarctService) throws DeploymentException { // get attribute values boolean foundServiceXML = false; @@ -227,8 +227,8 @@ while ((entry = zin.getNextEntry()) != null) { if (entry.getName().equals(SERVICEXML)) { foundServiceXML = true; - buildServiceGroup(zin, engine, serviceGroupDesc); - serviceGroupDesc.setServiceGroupName(DescriptionBuilder.getShortFileName( + buildServiceGroup(zin, engine, axisServiceGroup); + axisServiceGroup.setServiceGroupName(DescriptionBuilder.getShortFileName( engine.getCurrentFileItem().getName())); break; } @@ -247,8 +247,8 @@ InputStream in ; try { in = new FileInputStream(file); - buildServiceGroup(in,engine,serviceGroupDesc); - serviceGroupDesc.setServiceGroupName(engine.getCurrentFileItem().getName()); + buildServiceGroup(in,engine,axisServiceGroup); + axisServiceGroup.setServiceGroupName(engine.getCurrentFileItem().getName()); } catch (FileNotFoundException e) { throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.FNF_WITH_E ,e.getMessage())); @@ -264,7 +264,7 @@ } private void buildServiceGroup(InputStream zin, DeploymentEngine engine, - ServiceGroupDescription serviceGroupDesc) + AxisServiceGroup axisServiceGroup) throws XMLStreamException, DeploymentException { DescriptionBuilder builder; String rootelementName; @@ -272,23 +272,23 @@ OMElement services = builder.buildOM(); rootelementName = services.getLocalName(); if(SERVICE_ELEMENT.equals(rootelementName)){ - ServiceDescription serviceDesc = engine.getCurrentFileItem(). + AxisService axisService = engine.getCurrentFileItem(). getService(DescriptionBuilder.getShortFileName( engine.getCurrentFileItem().getName())); - if(serviceDesc == null){ - serviceDesc = new ServiceDescription( + if(axisService == null){ + axisService = new AxisService( new QName(DescriptionBuilder.getShortFileName( engine.getCurrentFileItem().getName()))); - engine.getCurrentFileItem().addService(serviceDesc); + engine.getCurrentFileItem().addService(axisService); } - serviceDesc.setParent(serviceGroupDesc); - serviceDesc.setClassLoader(engine.getCurrentFileItem().getClassLoader()); - ServiceBuilder serviceBuilder = new ServiceBuilder(engine,serviceDesc); + axisService.setParent(axisServiceGroup); + axisService.setClassLoader(engine.getCurrentFileItem().getClassLoader()); + ServiceBuilder serviceBuilder = new ServiceBuilder(engine,axisService); serviceBuilder.populateService(services); - engine.getCurrentFileItem().getDeploybleServices().add(serviceDesc); + engine.getCurrentFileItem().getDeploybleServices().add(axisService); } else if(SERVICE_GROUP_ELEMENT.equals(rootelementName)){ ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(services,engine); - groupBuilder.populateServiceGroup(serviceGroupDesc); + groupBuilder.populateServiceGroup(axisServiceGroup); } } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java Tue Oct 25 21:29:17 2005 @@ -16,7 +16,7 @@ package org.apache.axis2.deployment.util; -import org.apache.axis2.description.OperationDescription; +import org.apache.axis2.description.AxisOperation; import org.apache.axis2.engine.Phase; import org.apache.axis2.phaseresolver.PhaseMetadata; @@ -109,12 +109,12 @@ return oprationOUT_FaultPhases; } - public void setOperationPhases(OperationDescription operation) { - if (operation != null) { - operation.setRemainingPhasesInFlow(getOperationInPhases()); - operation.setPhasesOutFlow(getOperationOutPhases()); - operation.setPhasesInFaultFlow(getOperationInFaultPhases()); - operation.setPhasesOutFaultFlow(getOperationOutFaultPhases()); + public void setOperationPhases(AxisOperation axisOperation) { + if (axisOperation != null) { + axisOperation.setRemainingPhasesInFlow(getOperationInPhases()); + axisOperation.setPhasesOutFlow(getOperationOutPhases()); + axisOperation.setPhasesInFaultFlow(getOperationInFaultPhases()); + axisOperation.setPhasesOutFaultFlow(getOperationOutFaultPhases()); } } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java Tue Oct 25 21:29:17 2005 @@ -15,7 +15,7 @@ public WSDLService createService() { - return new ServiceDescription(); + return new AxisService(); } @@ -35,7 +35,7 @@ public WSDLOperation createOperation() { -// return new OperationDescription(); // by Deepal +// return new AxisOperation(); // by Deepal return new WSDLOperationImpl(); } Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java (from r328531, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java&r1=328531&r2=328554&rev=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java Tue Oct 25 21:29:17 2005 @@ -1,22 +1,34 @@ package org.apache.axis2.description; -import org.apache.wsdl.*; -import org.apache.wsdl.impl.WSDLOperationImpl; -import org.apache.axis2.engine.MessageReceiver; -import org.apache.axis2.engine.Phase; -import org.apache.axis2.engine.SOAPProcessingModelChecker; -import org.apache.axis2.engine.AxisError; -import org.apache.axis2.phaseresolver.PhaseMetadata; import org.apache.axis2.AxisFault; -import org.apache.axis2.i18n.Messages; +import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; import org.apache.axis2.context.ServiceContext; -import org.apache.axis2.context.ConfigurationContext; +import org.apache.axis2.engine.AxisError; +import org.apache.axis2.engine.MessageReceiver; +import org.apache.axis2.engine.Phase; +import org.apache.axis2.engine.SOAPProcessingModelChecker; +import org.apache.axis2.i18n.Messages; +import org.apache.axis2.phaseresolver.PhaseMetadata; +import org.apache.wsdl.MessageReference; +import org.apache.wsdl.WSDLConstants; +import org.apache.wsdl.WSDLExtensibilityAttribute; +import org.apache.wsdl.WSDLExtensibilityElement; +import org.apache.wsdl.WSDLFaultReference; +import org.apache.wsdl.WSDLFeature; +import org.apache.wsdl.WSDLOperation; +import org.apache.wsdl.WSDLProperty; +import org.apache.wsdl.impl.WSDLOperationImpl; import org.w3c.dom.Document; import javax.xml.namespace.QName; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /* * Copyright 2004,2005 The Apache Software Foundation. * @@ -35,12 +47,7 @@ * */ -/** - * Author: Deepal Jayasinghe - * Date: Sep 30, 2005 - * Time: 5:35:07 PM - */ -public abstract class OperationDescription implements +public abstract class AxisOperation implements ParameterInclude, WSDLOperation, DescriptionConstants, WSDLConstants { @@ -56,14 +63,14 @@ private WSDLOperationImpl wsdlopeartion; - private ServiceDescription parent; + private AxisService parent; //To store deploytime module refs private ArrayList modulerefs; - public OperationDescription(WSDLOperation wsdlopeartion) { + public AxisOperation(WSDLOperation wsdlopeartion) { this.wsdlopeartion = (WSDLOperationImpl)wsdlopeartion; this.setMessageExchangePattern(MEP_URI_IN_OUT); this.setComponentProperty(PARAMETER_KEY, new ParameterIncludeImpl()); @@ -86,11 +93,11 @@ moduleConfigmap = new HashMap(); } - public OperationDescription() { + public AxisOperation() { this(new WSDLOperationImpl()); } - public OperationDescription(QName name) { + public AxisOperation(QName name) { this(); this.setName(name); } @@ -141,7 +148,7 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#getEngadgedModules() + * @see org.apache.axis2.description.AxisService#getEngadgedModules() */ /** @@ -290,11 +297,11 @@ return modulerefs; } - public ServiceDescription getParent() { + public AxisService getParent() { return parent; } - public void setParent(ServiceDescription parent) { + public void setParent(AxisService parent) { this.parent = parent; } @@ -575,4 +582,4 @@ public void setWsdlopeartion(WSDLOperationImpl wsdlopeartion) { this.wsdlopeartion = wsdlopeartion; } -} +} \ No newline at end of file Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java (from r328531, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescriptionFactory.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescriptionFactory.java&r1=328531&r2=328554&rev=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescriptionFactory.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java Tue Oct 25 21:29:17 2005 @@ -21,46 +21,41 @@ * */ -/** - * Author: Deepal Jayasinghe - * Date: Oct 1, 2005 - * Time: 6:41:39 PM - */ -public class OperationDescriptionFactory implements WSDLConstants { +public class AxisOperationFactory implements WSDLConstants { - public static OperationDescription getOperetionDescription(int mepURI) throws AxisFault { - OperationDescription abOpdesc ; + public static AxisOperation getOperetionDescription(int mepURI) throws AxisFault { + AxisOperation abOpdesc ; switch(mepURI){ case MEP_CONSTANT_IN_ONLY : { - abOpdesc = new InOnlyOperationDescription(); + abOpdesc = new InOnlyAxisOperation(); break; } case MEP_CONSTANT_OUT_ONLY : { - abOpdesc = new OutOnlyOperationDescription(); + abOpdesc = new OutOnlyAxisOperation(); break; } case MEP_CONSTANT_IN_OUT : { - abOpdesc = new InOutOperationDescrition(); + abOpdesc = new InOutAxisOperation(); break; } case MEP_CONSTANT_IN_OPTIONAL_OUT : { - abOpdesc = new InOutOperationDescrition(); + abOpdesc = new InOutAxisOperation(); break; } case MEP_CONSTANT_ROBUST_IN_ONLY : { - abOpdesc = new InOutOperationDescrition(); + abOpdesc = new InOutAxisOperation(); break; } case MEP_CONSTANT_OUT_IN : { - abOpdesc = new OutInOperationDescription(); + abOpdesc = new OutInAxisOperation(); break; } case MEP_CONSTANT_OUT_OPTIONAL_IN : { - abOpdesc = new OutInOperationDescription(); + abOpdesc = new OutInAxisOperation(); break; } case MEP_CONSTANT_ROBUST_OUT_ONLY : { - abOpdesc = new OutInOperationDescription(); + abOpdesc = new OutInAxisOperation(); break; } default : { @@ -72,27 +67,27 @@ - public static OperationDescription getOperetionDescription(String mepURI) throws AxisFault { - OperationDescription abOpdesc ; + public static AxisOperation getOperetionDescription(String mepURI) throws AxisFault { + AxisOperation abOpdesc ; if(MEP_URI_IN_ONLY.equals(mepURI)){ - abOpdesc = new InOnlyOperationDescription(); + abOpdesc = new InOnlyAxisOperation(); } else if (MEP_URI_OUT_ONLY.equals(mepURI)) { - abOpdesc = new OutOnlyOperationDescription(); + abOpdesc = new OutOnlyAxisOperation(); } else if (MEP_URI_IN_OUT.equals(mepURI)) { - abOpdesc = new InOutOperationDescrition(); + abOpdesc = new InOutAxisOperation(); }else if(MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)){ - abOpdesc = new InOutOperationDescrition(); + abOpdesc = new InOutAxisOperation(); } else if(MEP_URI_IN_ONLY.equals(mepURI)) { - abOpdesc = new InOutOperationDescrition(); + abOpdesc = new InOutAxisOperation(); } else if(MEP_URI_OUT_IN.equals(mepURI)) { - abOpdesc = new OutInOperationDescription(); + abOpdesc = new OutInAxisOperation(); } else if (MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) { - abOpdesc = new OutInOperationDescription(); + abOpdesc = new OutInAxisOperation(); } else if (MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) ) { - abOpdesc = new OutInOperationDescription(); + abOpdesc = new OutInAxisOperation(); } else { throw new AxisFault(Messages.getMessage("unSupportedMEP","ID is "+ mepURI)); } return abOpdesc; } -} +} \ No newline at end of file Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (from r328531, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java&r1=328531&r2=328554&rev=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Tue Oct 25 21:29:17 2005 @@ -36,7 +36,10 @@ import org.apache.wsdl.impl.WSDLInterfaceImpl; import org.apache.wsdl.impl.WSDLServiceImpl; -import javax.wsdl.*; +import javax.wsdl.Definition; +import javax.wsdl.Port; +import javax.wsdl.Service; +import javax.wsdl.WSDLException; import javax.wsdl.extensions.soap.SOAPAddress; import javax.wsdl.factory.WSDLFactory; import javax.xml.namespace.QName; @@ -51,9 +54,9 @@ import java.util.Map; /** - * Class ServiceDescription + * Class AxisService */ -public class ServiceDescription +public class AxisService // extends WSDLServiceImpl implements WSDLService , ParameterInclude, @@ -64,12 +67,12 @@ private HashMap moduleConfigmap; - private ServiceGroupDescription parent; + private AxisServiceGroup parent; //to store the wsdl definition , which is build at the deployment time //to keep the time that last update time of the service private long lastupdate ; - private String serviceDescription ; + private String axisServiceName ; private String fileName = ""; private WSDLServiceImpl serviceimpl = null; @@ -82,10 +85,10 @@ /** - * Constructor ServiceDescription + * Constructor AxisService */ - public ServiceDescription(WSDLServiceImpl serviceimpl){ + public AxisService(WSDLServiceImpl serviceimpl){ this.serviceimpl = serviceimpl; this.wasaction_opeartionmap = new HashMap(); this.setComponentProperty(MODULEREF_KEY, new ArrayList()); @@ -95,7 +98,7 @@ } - public ServiceDescription() { + public AxisService() { this.serviceimpl = new WSDLServiceImpl(); this.wasaction_opeartionmap = new HashMap(); this.setComponentProperty(MODULEREF_KEY, new ArrayList()); @@ -105,11 +108,11 @@ } /** - * Constructor ServiceDescription + * Constructor AxisService * * @param qName */ - public ServiceDescription(QName qName) { + public AxisService(QName qName) { this(); this.setName(qName); } @@ -117,7 +120,7 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#addModule(javax.xml.namespace.QName) + * @see org.apache.axis2.description.AxisService#addModule(javax.xml.namespace.QName) */ /** @@ -161,17 +164,17 @@ PhaseResolver pr = new PhaseResolver(axisConfig, this); for (Iterator iterator = col.iterator(); iterator.hasNext();) { - OperationDescription operation = (OperationDescription) iterator.next(); - ArrayList paramters = operation.getParameters(); + AxisOperation axisOperation = (AxisOperation) iterator.next(); + ArrayList paramters = axisOperation.getParameters(); // Adding wsa-maping into service for (int j = 0; j < paramters.size(); j++) { Parameter parameter = (Parameter) paramters.get(j); if(parameter.getName().equals(Constants.WSA_ACTION)){ - this.addMapping((String)parameter.getValue(),operation); + this.addMapping((String)parameter.getValue(),axisOperation); } } - pr.buildModuleOperation(operation); - this.addOperation(operation); + pr.buildModuleOperation(axisOperation); + this.addOperation(axisOperation); } } @@ -191,7 +194,7 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#getEngadgedModules() + * @see org.apache.axis2.description.AxisService#getEngadgedModules() */ /** @@ -207,15 +210,15 @@ * Method getOperation * * @param operationName - * @return OperationDescription + * @return AxisOperation */ - public OperationDescription getOperation(QName operationName) { + public AxisOperation getOperation(QName operationName) { String opStr = operationName.getLocalPart(); HashMap allOperations = this.getServiceInterface().getAllOperations(); - OperationDescription opeartion = (OperationDescription) allOperations.get(opStr); + AxisOperation opeartion = (AxisOperation) allOperations.get(opStr); if(opeartion == null ){ - opeartion = (OperationDescription)wasaction_opeartionmap.get( + opeartion = (AxisOperation)wasaction_opeartionmap.get( operationName.getLocalPart()); } return opeartion; @@ -234,23 +237,23 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#addOperation(org.apache.axis2.description.OperationDescription) + * @see org.apache.axis2.description.AxisService#addOperation(org.apache.axis2.description.AxisOperation) */ /** * Method addOperation * - * @param operation + * @param axisOperation */ - public void addOperation(OperationDescription operation) { - operation.setParent(this); - this.getServiceInterface().setOperation(operation); + public void addOperation(AxisOperation axisOperation) { + axisOperation.setParent(this); + this.getServiceInterface().setOperation(axisOperation); } /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#setClassLoader(java.lang.ClassLoader) + * @see org.apache.axis2.description.AxisService#setClassLoader(java.lang.ClassLoader) */ /** @@ -267,7 +270,7 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#getClassLoader() + * @see org.apache.axis2.description.AxisService#getClassLoader() */ /** @@ -282,7 +285,7 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#setContextPath(java.lang.String) + * @see org.apache.axis2.description.AxisService#setContextPath(java.lang.String) */ /** @@ -299,7 +302,7 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#getContextPath() + * @see org.apache.axis2.description.AxisService#getContextPath() */ /** @@ -314,7 +317,7 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#setStyle(javax.swing.text.Style) + * @see org.apache.axis2.description.AxisService#setStyle(javax.swing.text.Style) */ /** @@ -331,7 +334,7 @@ /* * (non-Javadoc) * - * @see org.apache.axis2.description.ServiceDescription#getStyle() + * @see org.apache.axis2.description.AxisService#getStyle() */ /** @@ -514,8 +517,8 @@ return this.getServiceInterface().getOperations(); } - public OperationDescription getOperation(String ncName) { - return (OperationDescription) this.getServiceInterface().getOperations() + public AxisOperation getOperation(String ncName) { + return (AxisOperation) this.getServiceInterface().getOperations() .get(ncName); } @@ -528,10 +531,10 @@ * the given SOAP Action; null will be returned. * * @param soapAction SOAP Action defined for the particular Operation - * @return A OperationDescription if a unque Operation can be found with the given SOAP Action + * @return A AxisOperation if a unque Operation can be found with the given SOAP Action * otherwise will return null. */ - public OperationDescription getOperationBySOAPAction(String soapAction) { + public AxisOperation getOperationBySOAPAction(String soapAction) { if(soapAction == null || soapAction.equals("")){ return null; } @@ -558,15 +561,15 @@ * @param endpoint Particular Enpoint in which the bining is defined with the particular SOAP * Action. * @param soapAction SOAP Action defined for the particular Operation - * @return A OperationDescription if a unque Operation can be found with the given SOAP Action + * @return A AxisOperation if a unque Operation can be found with the given SOAP Action * otherwise will return null. */ - public OperationDescription getOperationBySOAPAction(String soapAction, + public AxisOperation getOperationBySOAPAction(String soapAction, QName endpoint) { HashMap bindingOperations = this.getEndpoint(endpoint).getBinding() .getBindingOperations(); Iterator operationKeySetIterator = bindingOperations.keySet().iterator(); - OperationDescription operation = null; + AxisOperation axisOperation = null; int count = 0; while (operationKeySetIterator.hasNext()) { WSDLBindingOperation bindingOperation = (WSDLBindingOperation) bindingOperations.get( @@ -580,8 +583,8 @@ if (((SOAPOperation) element).getSoapAction().equals( soapAction)) { WSDLOperation op = bindingOperation.getOperation(); - if (op instanceof OperationDescription) { - operation = (OperationDescription) op; + if (op instanceof AxisOperation) { + axisOperation = (AxisOperation) op; count++; } } @@ -589,7 +592,7 @@ } } if (1 == count) { - return operation; + return axisOperation; } return null; } @@ -628,17 +631,17 @@ * ty67tyuio * @return String */ - public String getServiceDescription() { - return serviceDescription; + public String getAxisServiceName() { + return axisServiceName; } /** * Set the description about the service * - * @param serviceDescription + * @param axisServiceName */ - public void setServiceDescription(String serviceDescription) { - this.serviceDescription = serviceDescription; + public void setAxisServiceName(String axisServiceName) { + this.axisServiceName = axisServiceName; } public Definition getWSDLDefinition() { @@ -785,19 +788,19 @@ /** * To add the was action paramater into has map so that was action based dispatch can support */ - public void addMapping(String mappingKey , OperationDescription operation){ - wasaction_opeartionmap.put(mappingKey,operation); + public void addMapping(String mappingKey , AxisOperation axisOperation){ + wasaction_opeartionmap.put(mappingKey,axisOperation); } /** * To get the parent (which is AxisConfiguration in this case) * @return AxisConfiguration */ - public ServiceGroupDescription getParent() { + public AxisServiceGroup getParent() { return parent; } - public void setParent(ServiceGroupDescription parent) { + public void setParent(AxisServiceGroup parent) { this.parent = parent; } Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java (from r328531, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java&r1=328531&r2=328554&rev=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java Tue Oct 25 21:29:17 2005 @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Iterator; -public class ServiceGroupDescription implements ParameterInclude{ +public class AxisServiceGroup implements ParameterInclude{ //to add and get paramters protected ParameterInclude paramInclude; @@ -54,14 +54,14 @@ private ArrayList mdoulesList = new ArrayList(); - public ServiceGroupDescription() { + public AxisServiceGroup() { paramInclude = new ParameterIncludeImpl(); services = new HashMap(); moduleConfigmap = new HashMap(); modules = new ArrayList(); } - public ServiceGroupDescription(AxisConfiguration axisDescription) { + public AxisServiceGroup(AxisConfiguration axisDescription) { this(); this.parent = axisDescription; } @@ -151,8 +151,8 @@ if (module !=null) { while (srevice.hasNext()) { // engagin per each service - ServiceDescription serviceDescription = (ServiceDescription) srevice.next(); - phaseResolver.engageModuleToService(serviceDescription, module); + AxisService axisService = (AxisService) srevice.next(); + phaseResolver.engageModuleToService(axisService, module); } } addModule(moduleName); @@ -167,7 +167,7 @@ return services.values().iterator(); } - public synchronized void addService(ServiceDescription service) throws AxisFault { + public synchronized void addService(AxisService service) throws AxisFault { services.put(service.getName(), service); PhaseResolver handlerResolver = new PhaseResolver(this.parent, service); handlerResolver.buildchains(); @@ -183,8 +183,8 @@ this.parent = axisDescription; } - public ServiceDescription getService(QName name) throws AxisFault { - return (ServiceDescription) services.get(name); + public AxisService getService(QName name) throws AxisFault { + return (AxisService) services.get(name); } public void addModuleref(QName moduleref){ @@ -197,7 +197,7 @@ public synchronized void removeService(QName name) throws AxisFault { - ServiceDescription service = getService(name); + AxisService service = getService(name); if (service != null) { this.parent.notifyObservers(AxisEvent.SERVICE_DEPLOY , service); } @@ -208,4 +208,4 @@ ServiceGroupContext serviceGroupContext = new ServiceGroupContext(parent,this) ; return serviceGroupContext; } -} +} \ No newline at end of file Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java (from r328531, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyOperationDescription.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyOperationDescription.java&r1=328531&r2=328554&rev=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyOperationDescription.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java Tue Oct 25 21:29:17 2005 @@ -1,8 +1,8 @@ package org.apache.axis2.description; +import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; -import org.apache.axis2.AxisFault; import org.apache.wsdl.WSDLOperation; import javax.xml.namespace.QName; @@ -29,17 +29,17 @@ * Date: Oct 3, 2005 * Time: 2:06:31 PM */ -public class InOnlyOperationDescription extends OperationDescription { +public class InOnlyAxisOperation extends AxisOperation { - public InOnlyOperationDescription(WSDLOperation wsdlopeartion) { + public InOnlyAxisOperation(WSDLOperation wsdlopeartion) { super(wsdlopeartion); } - public InOnlyOperationDescription() { + public InOnlyAxisOperation() { super(); } - public InOnlyOperationDescription(QName name) { + public InOnlyAxisOperation(QName name) { super(name); } @@ -52,4 +52,4 @@ throw new AxisFault("Invalid messge addition , operation context completed") ; } } -} +} \ No newline at end of file Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOutAxisOperation.java (from r328531, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOutOperationDescrition.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOutAxisOperation.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOutAxisOperation.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOutOperationDescrition.java&r1=328531&r2=328554&rev=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOutOperationDescrition.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOutAxisOperation.java Tue Oct 25 21:29:17 2005 @@ -1,8 +1,8 @@ package org.apache.axis2.description; +import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; -import org.apache.axis2.AxisFault; import org.apache.wsdl.WSDLOperation; import javax.xml.namespace.QName; @@ -30,17 +30,17 @@ * Date: Oct 3, 2005 * Time: 2:07:15 PM */ -public class InOutOperationDescrition extends OperationDescription { +public class InOutAxisOperation extends AxisOperation { - public InOutOperationDescrition(WSDLOperation wsdlopeartion) { + public InOutAxisOperation(WSDLOperation wsdlopeartion) { super(wsdlopeartion); } - public InOutOperationDescrition() { + public InOutAxisOperation() { super(); } - public InOutOperationDescrition(QName name) { + public InOutAxisOperation(QName name) { super(name); } @@ -58,4 +58,4 @@ opContext.setComplete(true); } } -} +} \ No newline at end of file Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java Tue Oct 25 21:29:17 2005 @@ -179,8 +179,8 @@ this.module = module; } - public void addOperation(OperationDescription operation) { - opeartions.put(operation.getName(), operation); + public void addOperation(AxisOperation axisOperation) { + opeartions.put(axisOperation.getName(), axisOperation); } public HashMap getOperations() { Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java (from r328531, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInOperationDescription.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInOperationDescription.java&r1=328531&r2=328554&rev=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInOperationDescription.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java Tue Oct 25 21:29:17 2005 @@ -1,8 +1,8 @@ package org.apache.axis2.description; +import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; -import org.apache.axis2.AxisFault; import org.apache.wsdl.WSDLOperation; import javax.xml.namespace.QName; @@ -30,17 +30,17 @@ * Date: Oct 3, 2005 * Time: 6:01:33 PM */ -public class OutInOperationDescription extends OperationDescription { +public class OutInAxisOperation extends AxisOperation { - public OutInOperationDescription(WSDLOperation wsdlopeartion) { + public OutInAxisOperation(WSDLOperation wsdlopeartion) { super(wsdlopeartion); } - public OutInOperationDescription() { + public OutInAxisOperation() { super(); } - public OutInOperationDescription(QName name) { + public OutInAxisOperation(QName name) { super(name); } @@ -58,4 +58,4 @@ opContext.setComplete(true); } } -} +} \ No newline at end of file Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java (from r328531, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyOperationDescription.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyOperationDescription.java&r1=328531&r2=328554&rev=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyOperationDescription.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java Tue Oct 25 21:29:17 2005 @@ -1,8 +1,8 @@ package org.apache.axis2.description; +import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; -import org.apache.axis2.AxisFault; import org.apache.wsdl.WSDLOperation; import javax.xml.namespace.QName; @@ -29,17 +29,17 @@ * Date: Oct 3, 2005 * Time: 6:04:11 PM */ -public class OutOnlyOperationDescription extends OperationDescription { +public class OutOnlyAxisOperation extends AxisOperation { - public OutOnlyOperationDescription(WSDLOperation wsdlopeartion) { + public OutOnlyAxisOperation(WSDLOperation wsdlopeartion) { super(wsdlopeartion); } - public OutOnlyOperationDescription() { + public OutOnlyAxisOperation() { super(); } - public OutOnlyOperationDescription(QName name) { + public OutOnlyAxisOperation(QName name) { super(name); } @@ -52,4 +52,4 @@ throw new AxisFault("Invalid messge addition , operation context completed") ; } } -} +} \ No newline at end of file Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java Tue Oct 25 21:29:17 2005 @@ -22,9 +22,9 @@ import org.apache.axis2.context.OperationContext; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.context.ServiceGroupContext; +import org.apache.axis2.description.AxisOperation; +import org.apache.axis2.description.AxisService; import org.apache.axis2.description.HandlerDescription; -import org.apache.axis2.description.OperationDescription; -import org.apache.axis2.description.ServiceDescription; import org.apache.axis2.handlers.AbstractHandler; import javax.xml.namespace.QName; @@ -70,11 +70,11 @@ if (relatesTo != null || "".equals(relatesTo)) { OperationContext operationContext = msgctx.getSystemContext().getOperationContext(relatesTo); if (operationContext != null) { - msgctx.setOperationDescription(operationContext.getOperationDescription()); + msgctx.setAxisOperation(operationContext.getAxisOperation()); msgctx.setOperationContext(operationContext); msgctx.setServiceContext((ServiceContext) operationContext.getParent()); - msgctx.setServiceDescription(((ServiceContext) operationContext.getParent()).getServiceConfig()); - msgctx.getOperationDescription().registerOperationContext(msgctx, operationContext); + msgctx.setAxisService(((ServiceContext) operationContext.getParent()).getAxisService()); + msgctx.getAxisOperation().registerOperationContext(msgctx, operationContext); msgctx.setServiceGroupContextId(((ServiceGroupContext) msgctx.getServiceContext().getParent()).getId()); } } @@ -82,19 +82,19 @@ } - ServiceDescription serviceDescription = msgctx.getServiceDescription(); - if (serviceDescription == null) { - serviceDescription = findService(msgctx); - if (serviceDescription != null) { - msgctx.setServiceDescription(serviceDescription); + AxisService axisService = msgctx.getAxisService(); + if (axisService == null) { + axisService = findService(msgctx); + if (axisService != null) { + msgctx.setAxisService(axisService); // TODO Chinthaka : set the Service Group Context to the message Context } } - if (msgctx.getServiceDescription() != null && msgctx.getOperationDescription() == null) { - OperationDescription operationDescription = findOperation(serviceDescription, msgctx); - if (operationDescription != null) { - msgctx.setOperationDescription(operationDescription); + if (msgctx.getAxisService() != null && msgctx.getAxisOperation() == null) { + AxisOperation axisOperation = findOperation(axisService, msgctx); + if (axisOperation != null) { + msgctx.setAxisOperation(axisOperation); } } } @@ -106,7 +106,7 @@ * @return * @throws AxisFault */ - public abstract ServiceDescription findService( + public abstract AxisService findService( MessageContext messageContext) throws AxisFault; /** @@ -117,7 +117,7 @@ * @return * @throws AxisFault */ - public abstract OperationDescription findOperation( - ServiceDescription service, MessageContext messageContext) throws AxisFault; + public abstract AxisOperation findOperation( + AxisService service, MessageContext messageContext) throws AxisFault; } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Tue Oct 25 21:29:17 2005 @@ -20,9 +20,9 @@ import org.apache.axis2.addressing.AddressingConstants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.description.AxisOperation; +import org.apache.axis2.description.AxisService; import org.apache.axis2.description.HandlerDescription; -import org.apache.axis2.description.OperationDescription; -import org.apache.axis2.description.ServiceDescription; import org.apache.axis2.util.Utils; import javax.xml.namespace.QName; @@ -43,7 +43,7 @@ } //TODO this logic needed to be improved, as the Dispatching is almost garentnee to fail - public OperationDescription findOperation(ServiceDescription service, + public AxisOperation findOperation(AxisService service, MessageContext messageContext) throws AxisFault { String action = messageContext.getWSAAction(); @@ -57,9 +57,9 @@ } // TODO this logic needed to be improved, as the Dispatching is almost garentnee to fail - public ServiceDescription findService(MessageContext messageContext) throws AxisFault { + public AxisService findService(MessageContext messageContext) throws AxisFault { EndpointReference toEPR = messageContext.getTo(); - ServiceDescription service = null; + AxisService service = null; if (toEPR != null) { String address = toEPR.getAddress(); if (Final.WSA_ANONYMOUS_URL.equals(address) || Submission.WSA_ANONYMOUS_URL.equals(address)) { Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Tue Oct 25 21:29:17 2005 @@ -17,10 +17,10 @@ package org.apache.axis2.engine; import org.apache.axis2.AxisFault; +import org.apache.axis2.description.AxisService; +import org.apache.axis2.description.AxisServiceGroup; import org.apache.axis2.description.ModuleDescription; import org.apache.axis2.description.ParameterInclude; -import org.apache.axis2.description.ServiceDescription; -import org.apache.axis2.description.ServiceGroupDescription; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.TransportOutDescription; import org.apache.axis2.storage.AxisStorage; @@ -62,7 +62,7 @@ * @return * @throws AxisFault */ - public ServiceDescription getService(String name) throws AxisFault; + public AxisService getService(String name) throws AxisFault; /** * Method addService @@ -70,10 +70,10 @@ * @param service * @throws AxisFault */ - public void addService(ServiceDescription service) throws AxisFault; + public void addService(AxisService service) throws AxisFault; //to Add service Groups - public void addServiceGroup(ServiceGroupDescription serviceGroup) throws AxisFault; + public void addServiceGroup(AxisServiceGroup axisServiceGroup) throws AxisFault; /** * Method removeService @@ -144,9 +144,9 @@ //to check whether a given paramter is locked public boolean isParamterLocked(String paramterName); - public ServiceGroupDescription getServiceGroup(String serviceNameAndGroupString); + public AxisServiceGroup getServiceGroup(String serviceNameAndGroupString); Iterator getServiceGroups(); - public void notifyObservers(int event_type , ServiceDescription service); + public void notifyObservers(int event_type , AxisService service); } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Tue Oct 25 21:29:17 2005 @@ -212,36 +212,36 @@ * @param service * @throws AxisFault */ - public synchronized void addService(ServiceDescription service) throws AxisFault { - ServiceGroupDescription serviceGroup = new ServiceGroupDescription(); - serviceGroup.setServiceGroupName(service.getName().getLocalPart()); - serviceGroup.setParent(this); - serviceGroup.addService(service); - addServiceGroup(serviceGroup); + public synchronized void addService(AxisService service) throws AxisFault { + AxisServiceGroup axisServiceGroup = new AxisServiceGroup(); + axisServiceGroup.setServiceGroupName(service.getName().getLocalPart()); + axisServiceGroup.setParent(this); + axisServiceGroup.addService(service); + addServiceGroup(axisServiceGroup); } - public void addServiceGroup(ServiceGroupDescription serviceGroup) throws AxisFault { - Iterator services = serviceGroup.getServices(); - ServiceDescription description ; + public void addServiceGroup(AxisServiceGroup axisServiceGroup) throws AxisFault { + Iterator services = axisServiceGroup.getServices(); + AxisService description ; while (services.hasNext()) { - description = (ServiceDescription) services.next(); + description = (AxisService) services.next(); if(allservices.get(description.getName().getLocalPart()) !=null){ throw new AxisFault("Two service can not have same name, a service with " + description.getName().getLocalPart() + " alredy exist in the system"); } } - services = serviceGroup.getServices(); + services = axisServiceGroup.getServices(); while (services.hasNext()) { - description = (ServiceDescription) services.next(); + description = (AxisService) services.next(); allservices.put(description.getName().getLocalPart(),description); notifyObservers(AxisEvent.SERVICE_DEPLOY ,description); } Iterator enModule = engagedModules.iterator(); while (enModule.hasNext()) { QName moduleDescription = (QName) enModule.next(); - serviceGroup.addModule(moduleDescription); + axisServiceGroup.addModule(moduleDescription); } - serviceGroups.put(serviceGroup.getServiceGroupName(),serviceGroup); + serviceGroups.put(axisServiceGroup.getServiceGroupName(),axisServiceGroup); } /** @@ -267,8 +267,8 @@ * @return * @throws AxisFault */ - public ServiceDescription getService(String name) throws AxisFault { - return (ServiceDescription)allservices.get(name); + public AxisService getService(String name) throws AxisFault { + return (AxisService)allservices.get(name); } /** @@ -278,7 +278,7 @@ * @throws AxisFault */ public synchronized void removeService(String name) throws AxisFault { - ServiceDescription service =(ServiceDescription)allservices.remove(name); + AxisService service =(AxisService)allservices.remove(name); if(service != null){ log.info("Removed service " + name); } @@ -337,8 +337,8 @@ return parameter != null && parameter.isLocked(); } - public ServiceGroupDescription getServiceGroup(String serviceNameAndGroupString) { - return (ServiceGroupDescription)serviceGroups.get(serviceNameAndGroupString); + public AxisServiceGroup getServiceGroup(String serviceNameAndGroupString) { + return (AxisServiceGroup)serviceGroups.get(serviceNameAndGroupString); } public Iterator getServiceGroups() { @@ -473,11 +473,11 @@ public HashMap getServices() { Iterator sgs = getServiceGroups(); while (sgs.hasNext()) { - ServiceGroupDescription groupDescription = (ServiceGroupDescription) sgs.next(); - Iterator servics = groupDescription.getServices(); + AxisServiceGroup axisServiceGroup = (AxisServiceGroup) sgs.next(); + Iterator servics = axisServiceGroup.getServices(); while (servics.hasNext()) { - ServiceDescription serviceDescription = (ServiceDescription) servics.next(); - allservices.put(serviceDescription.getName().getLocalPart(),serviceDescription); + AxisService axisService = (AxisService) servics.next(); + allservices.put(axisService.getName().getLocalPart(),axisService); } } return allservices; @@ -503,7 +503,7 @@ this.axis2Repository = axis2Repository; } - public void notifyObservers(int event_type , ServiceDescription service){ + public void notifyObservers(int event_type , AxisService service){ AxisEvent event = new AxisEvent(service,event_type); for (int i = 0; i < observersList.size(); i++) { AxisObserver axisObserver = (AxisObserver) observersList.get(i); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Tue Oct 25 21:29:17 2005 @@ -21,7 +21,7 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; -import org.apache.axis2.description.OperationDescription; +import org.apache.axis2.description.AxisOperation; import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportOutDescription; import org.apache.axis2.i18n.Messages; @@ -83,7 +83,7 @@ //find and invoke the Phases OperationContext operationContext = msgContext.getOperationContext(); ArrayList phases = - operationContext.getOperationDescription().getPhasesOutFlow(); + operationContext.getAxisOperation().getPhasesOutFlow(); if (msgContext.isPaused()) { // the message has paused, so rerun them from the position they stoped. The Handler //who paused the Message will be the first one to run @@ -114,7 +114,7 @@ public void receive(MessageContext msgContext) throws AxisFault { ConfigurationContext sysCtx = msgContext.getSystemContext(); - OperationDescription operationDescription = null; + AxisOperation axisOperation = null; ArrayList preCalculatedPhases = sysCtx .getAxisConfiguration() @@ -130,25 +130,25 @@ //resume operation specific phases OperationContext operationContext = msgContext.getOperationContext(); - operationDescription = operationContext.getOperationDescription(); + axisOperation = operationContext.getAxisOperation(); operationSpecificPhases = - operationDescription.getRemainingPhasesInFlow(); + axisOperation.getRemainingPhasesInFlow(); resumeInvocationPhases(operationSpecificPhases, msgContext); } else { invokePhases(preCalculatedPhases, msgContext); verifyContextBuilt(msgContext); OperationContext operationContext = msgContext.getOperationContext(); - operationDescription = operationContext.getOperationDescription(); + axisOperation = operationContext.getAxisOperation(); operationSpecificPhases = - operationDescription.getRemainingPhasesInFlow(); + axisOperation.getRemainingPhasesInFlow(); invokePhases(operationSpecificPhases, msgContext); } if (msgContext.isServerSide() && !msgContext.isPaused()) { // invoke the Message Receivers MessageReceiver receiver = - operationDescription.getMessageReceiver(); + axisOperation.getMessageReceiver(); receiver.receive(msgContext); } } @@ -163,7 +163,7 @@ OperationContext opContext = msgContext.getOperationContext(); //find and execute the Fault Out Flow Handlers if (opContext != null) { - OperationDescription axisOperation = opContext.getOperationDescription(); + AxisOperation axisOperation = opContext.getAxisOperation(); ArrayList phases = axisOperation.getPhasesOutFaultFlow(); if (msgContext.isPaused()) { resumeInvocationPhases(phases, msgContext); @@ -209,7 +209,7 @@ opContext = msgContext.getOperationContext(); //find and execute the Fault In Flow Handlers if (opContext != null) { - OperationDescription axisOperation = opContext.getOperationDescription(); + AxisOperation axisOperation = opContext.getAxisOperation(); ArrayList phases = axisOperation.getPhasesInFaultFlow(); if (msgContext.isPaused()) { resumeInvocationPhases(phases, msgContext); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEvent.java Tue Oct 25 21:29:17 2005 @@ -16,7 +16,7 @@ package org.apache.axis2.engine; -import org.apache.axis2.description.ServiceDescription; +import org.apache.axis2.description.AxisService; public class AxisEvent { @@ -29,16 +29,16 @@ public static final int SERVICE_DEPLOY = 1; public static final int SERVICE_REMOVE = 0; - private ServiceDescription service ; + private AxisService service ; private int EVENT_TYPE; - public AxisEvent(ServiceDescription service, int EVENT_TYPE) { + public AxisEvent(AxisService service, int EVENT_TYPE) { this.service = service; this.EVENT_TYPE = EVENT_TYPE; } - public ServiceDescription getService() { + public AxisService getService() { return service; } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java Tue Oct 25 21:29:17 2005 @@ -53,20 +53,20 @@ * @throws AxisFault */ public final void invoke(MessageContext msgctx) throws AxisFault { - if(msgctx.getOperationDescription() == null && msgctx.getOperationContext() != null ){ - msgctx.setOperationDescription(msgctx.getOperationContext().getOperationDescription()); + if(msgctx.getAxisOperation() == null && msgctx.getOperationContext() != null ){ + msgctx.setAxisOperation(msgctx.getOperationContext().getAxisOperation()); } - if(msgctx.getServiceDescription() == null && msgctx.getServiceContext() != null){ - msgctx.setServiceDescription(msgctx.getServiceContext().getServiceConfig()); + if(msgctx.getAxisService() == null && msgctx.getServiceContext() != null){ + msgctx.setAxisService(msgctx.getServiceContext().getAxisService()); } EndpointReference toEPR = msgctx.getTo(); - if (msgctx.getServiceDescription() == null) { + if (msgctx.getAxisService() == null) { throw new AxisFault( "Service Not found EPR is " + ((toEPR != null) ? toEPR.getAddress() : "")); - } else if (msgctx.getOperationDescription() == null) { + } else if (msgctx.getAxisOperation() == null) { throw new AxisFault( "Operation Not found EPR is " + ((toEPR != null) ? toEPR.getAddress() : "") + Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java Tue Oct 25 21:29:17 2005 @@ -19,9 +19,9 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.description.AxisOperation; +import org.apache.axis2.description.AxisService; import org.apache.axis2.description.HandlerDescription; -import org.apache.axis2.description.OperationDescription; -import org.apache.axis2.description.ServiceDescription; import org.apache.axis2.util.Utils; import javax.xml.namespace.QName; @@ -40,7 +40,7 @@ QName operationName = null; - public OperationDescription findOperation(ServiceDescription service, + public AxisOperation findOperation(AxisService service, MessageContext messageContext) throws AxisFault { if (operationName != null) { @@ -53,7 +53,7 @@ /* (non-Javadoc) * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext) */ - public ServiceDescription findService(MessageContext messageContext) throws AxisFault { + public AxisService findService(MessageContext messageContext) throws AxisFault { EndpointReference toEPR = messageContext.getTo(); if (toEPR != null) { String filePart = toEPR.getAddress(); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java Tue Oct 25 21:29:17 2005 @@ -18,9 +18,9 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.description.AxisOperation; +import org.apache.axis2.description.AxisService; import org.apache.axis2.description.HandlerDescription; -import org.apache.axis2.description.OperationDescription; -import org.apache.axis2.description.ServiceDescription; import javax.xml.namespace.QName; @@ -38,13 +38,13 @@ public void initDispatcher() { init(new HandlerDescription(NAME)); } - public OperationDescription findOperation(ServiceDescription service, + public AxisOperation findOperation(AxisService service, MessageContext messageContext) throws AxisFault { String action = messageContext.getSoapAction(); if (action != null) { - OperationDescription op = service.getOperationBySOAPAction(action); + AxisOperation op = service.getOperationBySOAPAction(action); if (op == null) { op = service.getOperation(new QName(action)); } @@ -60,7 +60,7 @@ /* (non-Javadoc) * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext) */ - public ServiceDescription findService(MessageContext messageContext) throws AxisFault { + public AxisService findService(MessageContext messageContext) throws AxisFault { return null; } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java Tue Oct 25 21:29:17 2005 @@ -18,9 +18,9 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; +import org.apache.axis2.description.AxisOperation; +import org.apache.axis2.description.AxisService; import org.apache.axis2.description.HandlerDescription; -import org.apache.axis2.description.OperationDescription; -import org.apache.axis2.description.ServiceDescription; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNamespace; import org.apache.axis2.util.Utils; @@ -45,7 +45,7 @@ init(new HandlerDescription(NAME)); } - public OperationDescription findOperation(ServiceDescription service, + public AxisOperation findOperation(AxisService service, MessageContext messageContext) throws AxisFault { OMElement bodyFirstChild = messageContext.getEnvelope().getBody() @@ -62,7 +62,7 @@ /* (non-Javadoc) * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext) */ - public ServiceDescription findService(MessageContext messageContext) throws AxisFault { + public AxisService findService(MessageContext messageContext) throws AxisFault { OMElement bodyFirstChild = messageContext.getEnvelope().getBody().getFirstElement(); if(bodyFirstChild != null){ Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java Tue Oct 25 21:29:17 2005 @@ -18,12 +18,12 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.deployment.DeploymentErrorMsgs; +import org.apache.axis2.description.AxisOperation; +import org.apache.axis2.description.AxisService; +import org.apache.axis2.description.AxisServiceGroup; import org.apache.axis2.description.Flow; import org.apache.axis2.description.HandlerDescription; import org.apache.axis2.description.ModuleDescription; -import org.apache.axis2.description.OperationDescription; -import org.apache.axis2.description.ServiceDescription; -import org.apache.axis2.description.ServiceGroupDescription; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.TransportOutDescription; import org.apache.axis2.engine.AxisConfiguration; @@ -50,7 +50,7 @@ /** * Field axisService */ - private ServiceDescription axisService; + private AxisService axisService; /** @@ -77,7 +77,7 @@ * @param serviceContext */ public PhaseResolver(AxisConfiguration axisConfig, - ServiceDescription serviceContext) { + AxisService serviceContext) { this.axisConfig = axisConfig; this.axisService = serviceContext; } @@ -92,9 +92,9 @@ HashMap operations = axisService.getOperations(); Collection col = operations.values(); for (Iterator iterator = col.iterator(); iterator.hasNext();) { - OperationDescription operation = (OperationDescription) iterator.next(); + AxisOperation axisOperation = (AxisOperation) iterator.next(); for (int i = 1; i < 5; i++) { - buildExcutionChains(i, operation); + buildExcutionChains(i, axisOperation); } } } @@ -102,10 +102,10 @@ /** * To build the opration for the opeartion which the module going to be added * - * @param opartion OperationDescription + * @param opartion AxisOperation * @throws AxisFault */ - public void buildModuleOperation(OperationDescription opartion) throws AxisFault { + public void buildModuleOperation(AxisOperation opartion) throws AxisFault { for (int i = 1; i < 5; i++) { buildExcutionChains(i, opartion); } @@ -122,7 +122,7 @@ * @throws AxisFault * @throws PhaseException */ - private void buildExcutionChains(int type, OperationDescription operation) + private void buildExcutionChains(int type, AxisOperation axisOperation) throws AxisFault, PhaseException { ArrayList allHandlers = new ArrayList(); ModuleDescription module; @@ -157,7 +157,7 @@ } } axisService.addToEngagModuleList(module); - operation.addToEngageModuleList(module); + axisOperation.addToEngageModuleList(module); } else { throw new PhaseException(Messages.getMessage( DeploymentErrorMsgs.INVALID_MODULE_REF, modulename.getLocalPart())); @@ -227,25 +227,25 @@ case PhaseMetadata.IN_FLOW: { phaseHolder = - new PhaseHolder(operation.getRemainingPhasesInFlow()); + new PhaseHolder(axisOperation.getRemainingPhasesInFlow()); break; } case PhaseMetadata.OUT_FLOW: { phaseHolder = - new PhaseHolder(operation.getPhasesOutFlow()); + new PhaseHolder(axisOperation.getPhasesOutFlow()); break; } case PhaseMetadata.FAULT_IN_FLOW: { phaseHolder = - new PhaseHolder(operation.getPhasesInFaultFlow()); + new PhaseHolder(axisOperation.getPhasesInFaultFlow()); break; } case PhaseMetadata.FAULT_OUT_FLOW: { phaseHolder = - new PhaseHolder(operation.getPhasesOutFaultFlow()); + new PhaseHolder(axisOperation.getPhasesOutFaultFlow()); break; } } @@ -357,13 +357,13 @@ enageToGlobalChain(module); Iterator servicegroups = axisConfig.getServiceGroups(); while (servicegroups.hasNext()) { - ServiceGroupDescription sericeGroup = (ServiceGroupDescription) servicegroups.next(); + AxisServiceGroup sericeGroup = (AxisServiceGroup) servicegroups.next(); Iterator services = sericeGroup.getServices(); while (services.hasNext()) { - ServiceDescription serviceDescription = (ServiceDescription) services.next(); - serviceDescription.addModuleOperations(module, axisConfig); - engageModuleToServiceFromGlobal(serviceDescription, module); - serviceDescription.addToEngagModuleList(module); + AxisService axisService = (AxisService) services.next(); + axisService.addModuleOperations(module, axisConfig); + engageModuleToServiceFromGlobal(axisService, module); + axisService.addToEngagModuleList(module); } sericeGroup.addModule(module.getName()); } @@ -376,13 +376,13 @@ * @param module * @throws PhaseException */ - public void engageModuleToServiceFromGlobal(ServiceDescription service, + public void engageModuleToServiceFromGlobal(AxisService service, ModuleDescription module) throws PhaseException { HashMap opeartions = service.getOperations(); Collection opCol = opeartions.values(); boolean engaged = false; for (Iterator iterator = opCol.iterator(); iterator.hasNext();) { - OperationDescription opDesc = (OperationDescription) iterator.next(); + AxisOperation opDesc = (AxisOperation) iterator.next(); Collection modules = opDesc.getModules(); for (Iterator iterator1 = modules.iterator(); iterator1.hasNext();) { @@ -536,14 +536,14 @@ } - public void engageModuleToService(ServiceDescription service, + public void engageModuleToService(AxisService service, ModuleDescription module) throws AxisFault { HashMap opeartions = service.getOperations(); Collection opCol = opeartions.values(); boolean engaged = false; service.addModuleOperations(module, axisConfig); for (Iterator iterator = opCol.iterator(); iterator.hasNext();) { - OperationDescription opDesc = (OperationDescription) iterator.next(); + AxisOperation opDesc = (AxisOperation) iterator.next(); Collection modules = opDesc.getModules(); for (Iterator iterator1 = modules.iterator(); iterator1.hasNext();) { @@ -561,7 +561,7 @@ } - public void engageModuleToOperation(OperationDescription operation, + public void engageModuleToOperation(AxisOperation axisOperation, ModuleDescription module) throws PhaseException { Flow flow = null; for (int type = 1; type < 5; type++) { @@ -569,25 +569,25 @@ case PhaseMetadata.IN_FLOW: { phaseHolder = - new PhaseHolder(operation.getRemainingPhasesInFlow()); + new PhaseHolder(axisOperation.getRemainingPhasesInFlow()); break; } case PhaseMetadata.OUT_FLOW: { phaseHolder = - new PhaseHolder(operation.getPhasesOutFlow()); + new PhaseHolder(axisOperation.getPhasesOutFlow()); break; } case PhaseMetadata.FAULT_IN_FLOW: { phaseHolder = - new PhaseHolder(operation.getPhasesInFaultFlow()); + new PhaseHolder(axisOperation.getPhasesInFaultFlow()); break; } case PhaseMetadata.FAULT_OUT_FLOW: { phaseHolder = - new PhaseHolder(operation.getPhasesOutFaultFlow()); + new PhaseHolder(axisOperation.getPhasesOutFaultFlow()); break; } } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Tue Oct 25 21:29:17 2005 @@ -38,13 +38,13 @@ public void handleResult(MessageContext result) throws AxisFault { AxisEngine engine = new AxisEngine( - messageCtx.getOperationContext().getServiceContext().getEngineContext()); + messageCtx.getOperationContext().getServiceContext().getConfigurationContext()); engine.send(messageCtx); } public void handleFault(AxisFault fault) throws AxisFault { AxisEngine engine = new AxisEngine( - messageCtx.getOperationContext().getServiceContext().getEngineContext()); + messageCtx.getOperationContext().getServiceContext().getConfigurationContext()); MessageContext faultContext = engine.createFaultMessageContext(messageCtx, fault); engine.sendFault(faultContext); } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java Tue Oct 25 21:29:17 2005 @@ -38,7 +38,7 @@ AxisEngine engine = new AxisEngine( msgContext.getOperationContext().getServiceContext() - .getEngineContext()); + .getConfigurationContext()); engine.send(outMsgContext); } } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Tue Oct 25 21:29:17 2005 @@ -21,8 +21,8 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.SessionContext; +import org.apache.axis2.description.AxisService; import org.apache.axis2.description.Parameter; -import org.apache.axis2.description.ServiceDescription; import org.apache.axis2.engine.MessageReceiver; import org.apache.axis2.i18n.Messages; import org.apache.axis2.om.OMAbstractFactory; @@ -59,11 +59,11 @@ throw new AxisFault(Messages.getMessage("invalidSOAPversion")); } - ServiceDescription service = + AxisService service = msgContext .getOperationContext() .getServiceContext() - .getServiceConfig(); + .getAxisService(); ClassLoader classLoader = service.getClassLoader(); Parameter implInfoParam = service.getParameter(SERVICE_CLASS); if (implInfoParam != null) { @@ -94,11 +94,11 @@ */ protected Object getTheImplementationObject(MessageContext msgContext) throws AxisFault { - ServiceDescription service = + AxisService service = msgContext .getOperationContext() .getServiceContext() - .getServiceConfig(); + .getAxisService(); Parameter scopeParam = service.getParameter(SCOPE); QName serviceName = service.getName(); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java?rev=328554&r1=328553&r2=328554&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java Tue Oct 25 21:29:17 2005 @@ -36,7 +36,7 @@ } catch (AxisFault e) { AxisEngine engine = new AxisEngine( - messgeCtx.getOperationContext().getServiceContext().getEngineContext()); + messgeCtx.getOperationContext().getServiceContext().getConfigurationContext()); MessageContext faultContext = engine.createFaultMessageContext(messgeCtx, e); engine.sendFault(faultContext); }