Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 10226 invoked from network); 1 Nov 2005 07:08:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Nov 2005 07:08:20 -0000 Received: (qmail 85329 invoked by uid 500); 1 Nov 2005 07:08:18 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 85305 invoked by uid 500); 1 Nov 2005 07:08:18 -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 85294 invoked by uid 500); 1 Nov 2005 07:08:18 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 85290 invoked by uid 99); 1 Nov 2005 07:08:18 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,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; Mon, 31 Oct 2005 23:08:16 -0800 Received: (qmail 10001 invoked by uid 65534); 1 Nov 2005 07:07:56 -0000 Message-ID: <20051101070756.10000.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r329997 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: clientapi/ deployment/ deployment/listener/ deployment/repository/util/ description/ Date: Tue, 01 Nov 2005 07:07:53 -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 Author: chinthaka Date: Mon Oct 31 23:06:49 2005 New Revision: 329997 URL: http://svn.apache.org/viewcvs?rev=329997&view=rev Log: - Fixing a small bug in InOnlyMepClient and MessageSender. - Fixing some typos, came across Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentClassLoader.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java Mon Oct 31 23:06:49 2005 @@ -180,7 +180,7 @@ //crated Phases from the templete operation to the this Operation // opDesc = new AxisOperation(new QName(axisOp)); - opDesc = AxisOperationFactory.getOperetionDescription(mepURL); + opDesc = AxisOperationFactory.getAxisOperation(mepURL); opDesc.setName(new QName(axisOp)); opDesc.setRemainingPhasesInFlow( axisOperationTemplate.getRemainingPhasesInFlow()); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java Mon Oct 31 23:06:49 2005 @@ -59,7 +59,7 @@ msgctx.setMessageID(messageID); msgctx.setServiceContext(serviceContext); ConfigurationContext syscontext = serviceContext.getConfigurationContext(); - + //if the transport to use for sending is not specified, try to find it from the URL if (senderTransport == null) { senderTransport = @@ -71,7 +71,7 @@ ConfigurationContext sysContext = serviceContext.getConfigurationContext(); AxisConfiguration registry = sysContext.getAxisConfiguration(); msgctx.setOperationContext(axisop.findOperationContext(msgctx, serviceContext)); - + AxisEngine engine = new AxisEngine(sysContext); engine.send(msgctx); } @@ -131,7 +131,7 @@ * @throws org.apache.axis2.AxisFault if the transport not found */ public void setSenderTransport(String senderTransport) throws AxisFault { - AxisConfiguration axisConfiguration = + AxisConfiguration axisConfiguration = serviceContext.getConfigurationContext().getAxisConfiguration(); this.senderTransport = axisConfiguration.getTransportOut(new QName(senderTransport)); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java Mon Oct 31 23:06:49 2005 @@ -19,6 +19,7 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; +import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.context.ServiceGroupContext; import org.apache.axis2.deployment.util.PhasesInfo; @@ -26,21 +27,25 @@ import org.apache.axis2.description.AxisOperationFactory; import org.apache.axis2.description.AxisService; import org.apache.axis2.description.OutInAxisOperation; +import org.apache.axis2.description.OutOnlyAxisOperation; import org.apache.axis2.engine.AxisConfigurationImpl; import org.apache.axis2.om.OMElement; +import org.apache.axis2.soap.SOAPEnvelope; import org.apache.wsdl.WSDLConstants; import javax.xml.namespace.QName; /** - * Message Sender is the class simmiler to the Call, one that provides much simpler API - * to users to work with. + * Message Sender is the class simmiler to the Call, one that provides much simpler API + * to users to work with. */ public class MessageSender extends InOnlyMEPClient { protected static AxisOperation axisOperationTemplate; + /** * Service context of the Service this MessageSender handles, compare this with the Call, simpler method. + * * @param service */ public MessageSender(ServiceContext service) { @@ -53,6 +58,7 @@ /** * This constrctor is to take repository as aragumnet and build the Configurationcontext using that + * * @param repo repository location * @throws AxisFault */ @@ -60,21 +66,36 @@ public MessageSender(String repo) throws AxisFault { super(assumeServiceContext(repo)); } + /** * Send the SOAP Message, the actual worker + * * @param opName * @param toSend * @throws AxisFault */ public void send(String opName, OMElement toSend) throws AxisFault { + SOAPEnvelope envelope = createDefaultSOAPEnvelope(); + if (toSend != null) { + envelope.getBody().addChild(toSend); + } + + this.send(opName, envelope); + } + + public void send(String opName, SOAPEnvelope soapEnvelope) throws AxisFault { + if(soapEnvelope == null){ + throw new AxisFault("Can not send null SOAP envelope"); + } + AxisOperation axisOp = serviceContext.getAxisService() .getOperation(opName); if (axisOp == null) { //todo I just assumed mep is alwas in-out , this has to improve : Deepal - axisOp = new OutInAxisOperation(new QName(opName)); + axisOp = new OutOnlyAxisOperation(new QName(opName)); serviceContext.getAxisService().addOperation(axisOp); - axisOp = AxisOperationFactory.getOperetionDescription(WSDLConstants.MEP_CONSTANT_IN_ONLY); + axisOp = AxisOperationFactory.getAxisOperation(WSDLConstants.MEP_CONSTANT_IN_ONLY); axisOp.setName(new QName(opName)); axisOp.setRemainingPhasesInFlow( axisOperationTemplate.getRemainingPhasesInFlow()); @@ -85,11 +106,16 @@ axisOperationTemplate.getPhasesOutFaultFlow()); serviceContext.getAxisService().addOperation(axisOp); } - super.send(axisOp, prepareTheSOAPEnvelope(toSend)); + + MessageContext msgctx = new MessageContext(serviceContext.getConfigurationContext()); + + msgctx.setEnvelope(soapEnvelope); + super.send(axisOp, msgctx); } /** * create a default service Context if the users are not intersted in the lower levels of control + * * @return * @throws AxisFault */ @@ -106,17 +132,13 @@ QName assumedServiceName = new QName("AnonymousService"); AxisService axisService = new AxisService(assumedServiceName); - - - - //we will assume a Service and operations // axisOperationTemplate = new AxisOperation(new QName("TemplateOperation")); - axisOperationTemplate = new OutInAxisOperation(new QName("TemplateOperation")); + axisOperationTemplate = new OutInAxisOperation(new QName("TemplateOperation")); - PhasesInfo info =((AxisConfigurationImpl)sysContext.getAxisConfiguration()).getPhasesinfo(); + PhasesInfo info = ((AxisConfigurationImpl) sysContext.getAxisConfiguration()).getPhasesinfo(); //to set the operation flows - if(info != null){ + if (info != null) { info.setOperationPhases(axisOperationTemplate); } axisService.addOperation(axisOperationTemplate); @@ -124,7 +146,7 @@ ServiceGroupContext serviceGroupContext = axisService.getParent().getServiceGroupContext(sysContext); return serviceGroupContext.getServiceContext(assumedServiceName.getLocalPart()); } - + public Object get(String key) { return serviceContext.getProperty(key); } @@ -132,5 +154,5 @@ public void set(String key, Object value) { serviceContext.getConfigurationContext().setProperty(key, value); } - + } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentClassLoader.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentClassLoader.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentClassLoader.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentClassLoader.java Mon Oct 31 23:06:49 2005 @@ -38,7 +38,7 @@ //To keep jar files inside /lib directory in the main jar private ArrayList lib_jars_list; - private HashMap loadedclass; + private HashMap loadedClass; /** @@ -53,7 +53,7 @@ super(urls, parent); this.urls = urls; lib_jars_list = new ArrayList(); - loadedclass = new HashMap(); + loadedClass = new HashMap(); findLibJars(); } @@ -110,14 +110,14 @@ throws ClassNotFoundException { Class cla ; try { - cla = (Class)loadedclass.get(name); + cla = (Class)loadedClass.get(name); if(cla != null){ return cla; } boolean foundClass ; try { cla = super.findClass(name); - loadedclass.put(name, cla); + loadedClass.put(name, cla); return cla; } catch (ClassNotFoundException e) { foundClass = false; @@ -126,7 +126,7 @@ try { byte raw[] = getBytes(name); cla = defineClass(name, raw, 0, raw.length); - loadedclass.put(name, cla); + loadedClass.put(name, cla); return cla; } catch (Exception e) { foundClass = false; Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Mon Oct 31 23:06:49 2005 @@ -25,8 +25,13 @@ import org.apache.axis2.deployment.scheduler.Scheduler; import org.apache.axis2.deployment.scheduler.SchedulerTask; import org.apache.axis2.deployment.util.PhasesInfo; -import org.apache.axis2.deployment.util.Utils; -import org.apache.axis2.description.*; +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.Parameter; import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.engine.AxisConfigurationImpl; import org.apache.axis2.engine.Handler; @@ -38,8 +43,19 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; public class DeploymentEngine implements DeploymentConstants { @@ -74,7 +90,6 @@ */ private String folderName; - private File repository; private String engineConfigName; @@ -118,7 +133,7 @@ } this.folderName = repositoryName; axis2repository = repositoryName; - repository = new File(repositoryName); + File repository = new File(repositoryName); if (!repository.exists()) { repository.mkdirs(); File services = new File(repository, "services"); @@ -146,7 +161,7 @@ } catch (IOException e) { throw new DeploymentException(e); } finally { - if (out != null) { + if( out!=null) { try { out.close(); } catch (IOException e) { @@ -209,10 +224,8 @@ try { InputStream in = new FileInputStream(tempfile); axisConfig = createEngineConfig(); - AxisConfigBuilder builder = new AxisConfigBuilder(in, this, axisConfig); + AxisConfigBuilder builder =new AxisConfigBuilder(in,this,axisConfig); builder.populateConfig(); - //setting the CLs - setClassLoaders(repository); } catch (FileNotFoundException e) { throw new DeploymentException(e); } @@ -254,13 +267,11 @@ cl.getResourceAsStream(AXIS2_CONFIGURATION_RESOURCE); } axisConfig = createEngineConfig(); - AxisConfigBuilder builder = new AxisConfigBuilder(in, this, axisConfig); + AxisConfigBuilder builder =new AxisConfigBuilder(in,this,axisConfig); builder.populateConfig(); if (isRepositoryExist) { hotDeployment = false; hotUpdate = false; - //setting CLs - setClassLoaders(repository); new RepositoryListenerImpl(folderName, this); } try { @@ -278,7 +289,7 @@ private void checkClientHome(String clientHome) throws DeploymentException { String clientXML = SERVER_XML_FILE; this.folderName = clientHome; - repository = new File(clientHome); + File repository = new File(clientHome); if (!repository.exists()) { repository.mkdirs(); File services = new File(repository, "services"); @@ -366,9 +377,9 @@ } - private void addnewService(AxisServiceGroup axisServiceMetaData) throws AxisFault { + private void addNewService(AxisServiceGroup axisServiceMetaData) throws AxisFault { // Iterator services = currentArchiveFile.getService().values().iterator(); - Iterator services = currentArchiveFile.getDeploybleServices().iterator(); + Iterator services = currentArchiveFile.getDeployableServices().iterator(); while (services.hasNext()) { AxisService axisService = (AxisService) services.next(); loadServiceProperties(axisService); @@ -455,7 +466,7 @@ private void loadModuleClass(ModuleDescription module) throws AxisFault { - Class moduleClass; + Class moduleClass ; try { String readInClass = currentArchiveFile.getModuleClass(); if (readInClass != null && !"".equals(readInClass)) { @@ -477,7 +488,7 @@ ClassLoader loader1 = currentArchiveFile.getClassLoader(); for (int j = 0; j < count; j++) { HandlerDescription handlermd = flow.getHandler(j); - Class handlerClass; + Class handlerClass ; Handler handler; handlerClass = getHandlerClass(handlermd.getClassName(), loader1); try { @@ -496,7 +507,7 @@ public Class getHandlerClass(String className, ClassLoader loader1) throws AxisFault { - Class handlerClass; + Class handlerClass ; try { handlerClass = Class.forName(className, true, loader1); } catch (ClassNotFoundException e) { @@ -557,38 +568,41 @@ StringWriter errorWriter = new StringWriter(); switch (type) { case SERVICE: - currentArchiveFile.setClassLoader(explodedDir,axisConfig.getServiceClassLoader()); + currentArchiveFile.setClassLoader(explodedDir); archiveReader = new ArchiveReader(); String serviceStatus = ""; try { - archiveReader.processWSDLs(currentArchiveFile, this); + archiveReader.processWSDLs(currentArchiveFile,this); // AxisService service = archiveReader.createService(currentArchiveFile.getAbsolutePath()); AxisServiceGroup sericeGroup = new AxisServiceGroup(axisConfig); archiveReader.processServiceGroup(currentArchiveFile.getAbsolutePath(), this, - sericeGroup, explodedDir); - addnewService(sericeGroup); + sericeGroup,explodedDir); + addNewService(sericeGroup); log.info(Messages.getMessage( DeploymentErrorMsgs.DEPLOYING_WS, currentArchiveFile.getName())); } catch (DeploymentException de) { log.info(Messages.getMessage(DeploymentErrorMsgs.IN_VALID_SERVICE, - currentArchiveFile.getName(), de.getMessage())); + currentArchiveFile.getName(),de.getMessage())); PrintWriter error_ptintWriter = new PrintWriter(errorWriter); de.printStackTrace(error_ptintWriter); serviceStatus = "Error:\n" + errorWriter.toString(); + de.printStackTrace(); + } catch (AxisFault axisFault) { log.info(Messages.getMessage(DeploymentErrorMsgs.IN_VALID_SERVICE, - currentArchiveFile.getName(), axisFault.getMessage())); + currentArchiveFile.getName(),axisFault.getMessage())); PrintWriter error_ptintWriter = new PrintWriter(errorWriter); axisFault.printStackTrace(error_ptintWriter); serviceStatus = "Error:\n" + errorWriter.toString(); + axisFault.printStackTrace(); } catch (Exception e) { log.info(Messages.getMessage(DeploymentErrorMsgs.IN_VALID_SERVICE, - currentArchiveFile.getName(), e.getMessage())); + currentArchiveFile.getName(),e.getMessage())); PrintWriter error_ptintWriter = new PrintWriter(errorWriter); e.printStackTrace(error_ptintWriter); serviceStatus = "Error:\n" + @@ -602,7 +616,7 @@ } break; case MODULE: - currentArchiveFile.setClassLoader(explodedDir,axisConfig.getModuleClassLoader()); + currentArchiveFile.setClassLoader(explodedDir); archiveReader = new ArchiveReader(); String moduleStatus = ""; try { @@ -610,7 +624,7 @@ metaData.setParent(axisConfig); archiveReader.readModuleArchive(currentArchiveFile.getAbsolutePath(), this, - metaData, explodedDir); + metaData,explodedDir); addNewModule(metaData); log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE, metaData.getName().getLocalPart())); @@ -653,11 +667,11 @@ for (int i = 0; i < wsToUnDeploy.size(); i++) { WSInfo wsInfo = (WSInfo) wsToUnDeploy.get(i); if (wsInfo.getType() == SERVICE) { - serviceName = getAxisServiceName(wsInfo.getFilename()); + serviceName = getAxisServiceName(wsInfo.getFileName()); //todo fix me deepal // axisConfig.removeService(new QName(serviceName)); log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED, - wsInfo.getFilename())); + wsInfo.getFileName())); } axisConfig.getFaultyServices().remove(serviceName); } @@ -682,7 +696,7 @@ */ private String getAxisServiceName(String fileName) { char seperator = '.'; - String value; + String value ; int index = fileName.indexOf(seperator); if (index > 0) { value = fileName.substring(0, index); @@ -742,16 +756,16 @@ * @throws DeploymentException */ public AxisService buildService(AxisService axisService, - InputStream serviceInputStream, - ClassLoader classLoader) throws DeploymentException { + InputStream serviceInputStream, + ClassLoader classLoader) throws DeploymentException { try { currentArchiveFile = new ArchiveFileData(SERVICE, ""); currentArchiveFile.setClassLoader(classLoader); - ServiceBuilder builder = new ServiceBuilder(serviceInputStream, this, axisService); + ServiceBuilder builder = new ServiceBuilder(serviceInputStream,this,axisService); builder.populateService(builder.buildOM()); loadServiceProperties(axisService); - } catch (AxisFault axisFault) { + } catch (AxisFault axisFault) { throw new DeploymentException(axisFault); } catch (XMLStreamException e) { throw new DeploymentException(e); @@ -770,12 +784,12 @@ public ModuleDescription buildModule(File modulearchive, AxisConfiguration config) throws DeploymentException { ModuleDescription axismodule; try { - this.setPhasesinfo(((AxisConfigurationImpl) config).getPhasesinfo()); + this.setPhasesinfo(((AxisConfigurationImpl)config).getPhasesinfo()); currentArchiveFile = new ArchiveFileData(modulearchive, MODULE); axismodule = new ModuleDescription(); ArchiveReader archiveReader = new ArchiveReader(); - currentArchiveFile.setClassLoader(false,config.getModuleClassLoader()); - archiveReader.readModuleArchive(currentArchiveFile.getAbsolutePath(), this, axismodule, false); + currentArchiveFile.setClassLoader(false); + archiveReader.readModuleArchive(currentArchiveFile.getAbsolutePath(), this, axismodule,false); Flow inflow = axismodule.getInFlow(); if (inflow != null) { addFlowHandlers(inflow); @@ -801,44 +815,4 @@ return axismodule; } - /** - * To set the all the classLoader hierarchy this method can be used , the top most parenet is - * CCL then SCL(system Class Loader) - * CCL - * : - * SCL - * : : - * MCCL SCCL - * : : - * MCL SCL - *

- *

- * MCCL : module common class loader - * SCCL : Service commin class loader - * MCL : module class loader - * SCL : Service class loader - * - * @param axis2repo : The repository folder of Axis2 - * @throws DeploymentException - */ - private void setClassLoaders(File axis2repo) throws DeploymentException { - ClassLoader sysClassLoader = Utils.getClassLoader( - Thread.currentThread().getContextClassLoader(), axis2repo); - axisConfig.setSystemClassLoader(sysClassLoader); - - File services = new File(axis2repo, "services"); - if (services.exists()) { - axisConfig.setServiceClassLoader(Utils.getClassLoader( - axisConfig.getSystemClassLoader(), services)); - } else { - axisConfig.setServiceClassLoader(axisConfig.getSystemClassLoader()); - } - File modules = new File(axis2repo, "modules"); - if (modules.exists()) { - axisConfig.setServiceClassLoader(Utils.getClassLoader( - axisConfig.getSystemClassLoader(), modules)); - } else { - axisConfig.setModuleClassLoader(axisConfig.getSystemClassLoader()); - } - } } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Mon Oct 31 23:06:49 2005 @@ -40,8 +40,8 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import java.io.InputStream; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; /** * To do the common tasks for all *Builder class @@ -254,7 +254,7 @@ } - protected void processOpeasrtionModuleRefs(Iterator moduleRefs + protected void processOperationModuleRefs(Iterator moduleRefs , AxisOperation opeartion) throws DeploymentException { try { while (moduleRefs.hasNext()) { @@ -302,7 +302,7 @@ return receiver; } - protected MessageReceiver loadDefaultMessageReciver() throws DeploymentException { + protected MessageReceiver loadDefaultMessageReceiver() throws DeploymentException { MessageReceiver receiver; String defaultMessageReciver ="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"; try { Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java Mon Oct 31 23:06:49 2005 @@ -115,7 +115,7 @@ //processing Operations Iterator op_itr = moduleElement.getChildrenWithName(new QName(OPRATIONST)); - ArrayList opeartions = processOpeartions(op_itr); + ArrayList opeartions = processOperations(op_itr); for (int i = 0; i < opeartions.size(); i++) { AxisOperation opeartion = (AxisOperation) opeartions.get(i); module.addOperation(opeartion); @@ -129,7 +129,7 @@ } - private ArrayList processOpeartions(Iterator opeartinsItr) throws DeploymentException { + private ArrayList processOperations(Iterator opeartinsItr) throws DeploymentException { ArrayList operations = new ArrayList(); while (opeartinsItr.hasNext()) { OMElement operation = (OMElement) opeartinsItr.next(); @@ -184,13 +184,13 @@ op_descrip.setMessageReceiver(messageReceiver); } else { //setting default message reciver - MessageReceiver msgReceiver = loadDefaultMessageReciver(); + MessageReceiver msgReceiver = loadDefaultMessageReceiver(); op_descrip.setMessageReceiver(msgReceiver); } //Process Module Refs Iterator modules = operation.getChildrenWithName( new QName(MODULEST)); - processOpeasrtionModuleRefs(modules, op_descrip); + processOperationModuleRefs(modules, op_descrip); //setting Operation phase PhasesInfo info = engine.getPhasesinfo(); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Mon Oct 31 23:06:49 2005 @@ -17,7 +17,6 @@ package org.apache.axis2.deployment; import org.apache.axis2.AxisFault; -import org.apache.axis2.Constants; import org.apache.axis2.deployment.util.PhasesInfo; import org.apache.axis2.description.AxisOperation; import org.apache.axis2.description.AxisOperationFactory; @@ -125,7 +124,7 @@ //processing operations Iterator opeartinsItr = service_element.getChildrenWithName( new QName(OPRATIONST)); - ArrayList ops = processOpeartions(opeartinsItr); + ArrayList ops = processOperations(opeartinsItr); for (int i = 0; i < ops.size(); i++) { AxisOperation opeartionDesc = (AxisOperation) ops.get(i); ArrayList wsamappings = opeartionDesc.getWsamappingList(); @@ -148,7 +147,7 @@ } } - private ArrayList processOpeartions(Iterator opeartinsItr) throws AxisFault { + private ArrayList processOperations(Iterator opeartinsItr) throws AxisFault { ArrayList operations = new ArrayList(); while (opeartinsItr.hasNext()) { OMElement operation = (OMElement) opeartinsItr.next(); @@ -214,14 +213,14 @@ op_descrip.setMessageReceiver(messageReceiver); } else { //setting default message reciver - MessageReceiver msgReceiver = loadDefaultMessageReciver(); + MessageReceiver msgReceiver = loadDefaultMessageReceiver(); op_descrip.setMessageReceiver(msgReceiver); } //Process Module Refs Iterator modules = operation.getChildrenWithName( new QName(MODULEST)); - processOpeasrtionModuleRefs(modules, op_descrip); + processOperationModuleRefs(modules, op_descrip); //setting Operation phase if (engine !=null) { Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Mon Oct 31 23:06:49 2005 @@ -70,7 +70,7 @@ axisService.setName(new QName(serviceName)); } // the service that has to be deploy - engine.getCurrentFileItem().getDeploybleServices().add(axisService); + engine.getCurrentFileItem().getDeployableServices().add(axisService); axisService.setParent(axisServiceGroup); axisService.setClassLoader(engine.getCurrentFileItem().getClassLoader()); ServiceBuilder serviceBuilder = new ServiceBuilder(engine,axisService); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListener.java Mon Oct 31 23:06:49 2005 @@ -17,7 +17,7 @@ package org.apache.axis2.deployment.listener; /** - * RepositaryListener is no listent to a specific folder whether the folder is + * RepositoryListener is listening to a specific folder whether the folder is * update eg: remove , added or modified files */ public interface RepositoryListener { Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java Mon Oct 31 23:06:49 2005 @@ -32,7 +32,7 @@ /** * Referance to a WSInfoList */ - private WSInfoList wsinfoList; + private WSInfoList wsInfoList; /** @@ -53,7 +53,7 @@ public RepositoryListenerImpl(String folderName, DeploymentEngine deploy_engine) { this.folderName = folderName; - wsinfoList = new WSInfoList(deploy_engine); + wsInfoList = new WSInfoList(deploy_engine); init(); } @@ -70,13 +70,13 @@ File file = files[i]; if (!file.isDirectory()) { if (ArchiveFileData.isServiceArchiveFile(file.getName())) { - wsinfoList.addWSInfoItem(file, MODULE); + wsInfoList.addWSInfoItem(file, MODULE); } } else { if ("lib".equals(file.getName()) || "Lib".equals(file.getName())) { // this is a lib file no need to take this as a sevice } else { - wsinfoList.addWSInfoItem(file, MODULE); + wsInfoList.addWSInfoItem(file, MODULE); } } } @@ -102,7 +102,7 @@ public void update() { //todo completet this // this call the update method of WSInfoList - wsinfoList.update(); + wsInfoList.update(); } /** @@ -112,7 +112,7 @@ * engine regsitry */ public void init() { - wsinfoList.init(); + wsInfoList.init(); checkModules(); checkServices(); update(); @@ -139,13 +139,13 @@ File file = files[i]; if (!file.isDirectory()) { if (ArchiveFileData.isServiceArchiveFile(file.getName())) { - wsinfoList.addWSInfoItem(file, SERVICE); + wsInfoList.addWSInfoItem(file, SERVICE); } } else { if ("lib".equals(file.getName()) || "Lib".equals(file.getName())) { // this is a lib file no need to take this as a sevice } else { - wsinfoList.addWSInfoItem(file, SERVICE); + wsInfoList.addWSInfoItem(file, SERVICE); } } } @@ -159,7 +159,7 @@ // for (int i = 0; i < fileList.length; i++) { // File file = fileList[i]; // if(file.isDirectory()){ -// wsinfoList.addWSInfoItem(file, SERVICE); +// wsInfoList.addWSInfoItem(file, SERVICE); // } // } // } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java Mon Oct 31 23:06:49 2005 @@ -19,12 +19,13 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.deployment.DeploymentClassLoader; import org.apache.axis2.deployment.DeploymentErrorMsgs; -import org.apache.axis2.deployment.util.Utils; import org.apache.axis2.description.AxisService; import org.apache.axis2.i18n.Messages; import java.io.File; +import java.net.MalformedURLException; import java.net.URL; +import java.net.URLClassLoader; import java.util.ArrayList; import java.util.HashMap; @@ -37,7 +38,7 @@ private ClassLoader classLoader; private File file = null; private int type; - private String messgeReceiver; + private String messageReceiver; private String moduleClass; private String name; @@ -47,19 +48,19 @@ //in this table private HashMap service = new HashMap(); - private ArrayList deploybleServices = new ArrayList(); + private ArrayList deployableServices = new ArrayList(); public ArchiveFileData(int type, String name) { this.type = type; this.name = name; } - public String getMessgeReceiver() { - return messgeReceiver; + public String getMessageReceiver() { + return messageReceiver; } - public void setMessgeReceiver(String messgeReceiver) { - this.messgeReceiver = messgeReceiver; + public void setMessageReceiver(String messageReceiver) { + this.messageReceiver = messageReceiver; } public ArchiveFileData(File file, int type) { @@ -106,8 +107,8 @@ this.moduleClass = moduleClass; } - public void setClassLoader(boolean extarctArichive, ClassLoader parent) throws AxisFault { -// ClassLoader parent = Thread.currentThread().getContextClassLoader(); + public void setClassLoader(boolean extarctArichive) throws AxisFault { + ClassLoader parent = Thread.currentThread().getContextClassLoader(); if (! extarctArichive) { // has to be craeted taking that file to the account if (file != null) { @@ -119,13 +120,54 @@ urlsToLoadFrom = new URL[]{file.toURL()}; classLoader = new DeploymentClassLoader(urlsToLoadFrom, parent); + // classLoader = new URLClassLoader(urlsToLoadFrom, parent); } catch (Exception e) { throw new AxisFault(e); } } } else { if (file != null) { - classLoader = Utils.getClassLoader(parent,file); + try { + ArrayList urls = new ArrayList(); + urls.add(file.toURL()); + + //if lib is simple + File libfiles = new File(file, "lib"); + if(libfiles.exists()){ + urls.add(libfiles.toURL()); + File jarfiles [] = libfiles.listFiles(); + for (int i = 0; i < jarfiles.length; i++) { + File jarfile = jarfiles[i]; + if(jarfile.getName().endsWith(".jar")){ + urls.add(jarfile.toURL()); + } + } + } + + //if lib is capital + libfiles = new File(file, "Lib"); + if(libfiles.exists()){ + urls.add(libfiles.toURL()); + File jarfiles [] = libfiles.listFiles(); + for (int i = 0; i < jarfiles.length; i++) { + File jarfile = jarfiles[i]; + if(jarfile.getName().endsWith(".jar")){ + urls.add(jarfile.toURL()); + } + } + } + + URL urllist [] = new URL[urls.size()]; + for (int i = 0; i < urls.size(); i++) { + urllist[i] = (URL) urls.get(i); + } + classLoader = new URLClassLoader(urllist,parent); + + + } catch (MalformedURLException e) { + throw new AxisFault(e); + } + } } @@ -158,11 +200,11 @@ return service; } - public ArrayList getDeploybleServices() { - return deploybleServices; + public ArrayList getDeployableServices() { + return deployableServices; } - public void setDeploybleServices(ArrayList deploybleServices) { - this.deploybleServices = deploybleServices; + public void setDeployableServices(ArrayList deployableServices) { + this.deployableServices = deployableServices; } } 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=329997&r1=329996&r2=329997&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 Mon Oct 31 23:06:49 2005 @@ -285,7 +285,7 @@ axisService.setClassLoader(engine.getCurrentFileItem().getClassLoader()); ServiceBuilder serviceBuilder = new ServiceBuilder(engine,axisService); serviceBuilder.populateService(services); - engine.getCurrentFileItem().getDeploybleServices().add(axisService); + engine.getCurrentFileItem().getDeployableServices().add(axisService); } else if(SERVICE_GROUP_ELEMENT.equals(rootelementName)){ ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(services,engine); groupBuilder.populateServiceGroup(axisServiceGroup); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java Mon Oct 31 23:06:49 2005 @@ -19,38 +19,38 @@ public class WSInfo { - private String filename; - private long lastmodifieddate; + private String fileName; + private long lastModifiedDate; /** * To check whether the file is a module or a servise */ private int type; public WSInfo(String filename, long lastmodifieddate) { - this.filename = filename; - this.lastmodifieddate = lastmodifieddate; + this.fileName = filename; + this.lastModifiedDate = lastmodifieddate; } public WSInfo(String filename, long lastmodifieddate, int type) { - this.filename = filename; - this.lastmodifieddate = lastmodifieddate; + this.fileName = filename; + this.lastModifiedDate = lastmodifieddate; this.type = type; } - public String getFilename() { - return filename; + public String getFileName() { + return fileName; } - public void setFilename(String filename) { - this.filename = filename; + public void setFileName(String fileName) { + this.fileName = fileName; } - public long getLastmodifieddate() { - return lastmodifieddate; + public long getLastModifiedDate() { + return lastModifiedDate; } public void setLastModifiedDate(long lastmodifieddate) { - this.lastmodifieddate = lastmodifieddate; + this.lastModifiedDate = lastmodifieddate; } public int getType() { Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Mon Oct 31 23:06:49 2005 @@ -28,12 +28,12 @@ /** * This is to store all the jar files in a specified folder (WEB_INF) */ - private static List jarlist = new ArrayList(); + private static List jarList = new ArrayList(); /** * All the curently updated jars */ - public List currentjars = new ArrayList(); + public List currentJars = new ArrayList(); /** * Referance to DeploymentEngine to make update @@ -48,14 +48,14 @@ * This method is used to initialize the vector */ public void init() { - jarlist.clear(); + jarList.clear(); } /** * First it check whether the file is already available in the * system call isFileExist , if it is not deployed yet then it will add - * that to jarlist and to the deployment engine as new service or module - * in adding new item to jarlist it first create optimice and requird object to + * that to jarList and to the deployment engine as new service or module + * in adding new item to jarList it first create optimice and requird object to * keep those infor call WSInfo and that will be added to jarist and actual * jar file will be added to DeploymentEngine *

@@ -74,7 +74,7 @@ WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), SERVICE); - jarlist.add(wsInfo); + jarList.add(wsInfo); ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE); deployer.addWSToDeploy(archiveFileData);//to inform that new web service is deployed } else { @@ -82,8 +82,8 @@ WSInfo tempWSInfo = getFileItem(file.getName()); if (isModified(file, tempWSInfo)) { // caheck whether file is updated tempWSInfo.setLastModifiedDate(file.lastModified()); - WSInfo wsInfo = new WSInfo(tempWSInfo.getFilename(), - tempWSInfo.getLastmodifieddate(), + WSInfo wsInfo = new WSInfo(tempWSInfo.getFileName(), + tempWSInfo.getLastModifiedDate(), SERVICE); deployer.addWSToUndeploy(wsInfo); // add entry to undeploy list ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE); @@ -100,7 +100,7 @@ WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), MODULE); - jarlist.add(wsInfo); + jarList.add(wsInfo); ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE); deployer.addWSToDeploy(archiveFileData);//to inform that new web service is deployed } else { @@ -108,8 +108,8 @@ WSInfo tempWSInfo = getFileItem(file.getName()); if (isModified(file, tempWSInfo)) { tempWSInfo.setLastModifiedDate(file.lastModified()); - WSInfo wsInfo = new WSInfo(tempWSInfo.getFilename(), - tempWSInfo.getLastmodifieddate(), + WSInfo wsInfo = new WSInfo(tempWSInfo.getFileName(), + tempWSInfo.getLastModifiedDate(), MODULE); deployer.addWSToUndeploy(wsInfo); // add entry to undeploy list ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE); @@ -122,7 +122,7 @@ } } String jarname = file.getName(); - currentjars.add(jarname); + currentJars.add(jarname); } /** @@ -132,10 +132,10 @@ * @param filename */ public WSInfo getFileItem(String filename) { - int sise = jarlist.size(); + int sise = jarList.size(); for (int i = 0; i < sise; i++) { - WSInfo wsInfo = (WSInfo) jarlist.get(i); - if (wsInfo.getFilename().equals(filename)) { + WSInfo wsInfo = (WSInfo) jarList.get(i); + if (wsInfo.getFileName().equals(filename)) { return wsInfo; } } @@ -150,7 +150,7 @@ * @param wsInfo */ public boolean isModified(File file, WSInfo wsInfo) { - return (wsInfo.getLastmodifieddate() != file.lastModified()); + return (wsInfo.getLastModifiedDate() != file.lastModified()); } /** @@ -170,8 +170,8 @@ * that is hot undeployment */ public void checkForUndeploye() { - Iterator iter = jarlist.listIterator(); - int size = currentjars.size(); + Iterator iter = jarList.listIterator(); + int size = currentJars.size(); List tempvector = new ArrayList(); tempvector.clear(); String filename; @@ -180,8 +180,8 @@ WSInfo fileitem = (WSInfo) iter.next(); exist = false; for (int i = 0; i < size; i++) { - filename = (String) currentjars.get(i); - if (filename.equals(fileitem.getFilename())) { + filename = (String) currentJars.get(i); + if (filename.equals(fileitem.getFileName())) { exist = true; break; } @@ -189,8 +189,8 @@ if (!exist) { tempvector.add(fileitem); - WSInfo wsInfo = new WSInfo(fileitem.getFilename(), - fileitem.getLastmodifieddate()); + WSInfo wsInfo = new WSInfo(fileitem.getFileName(), + fileitem.getLastModifiedDate()); deployer.addWSToUndeploy(wsInfo);//this is to be undeploye } @@ -198,10 +198,10 @@ for (int i = 0; i < tempvector.size(); i++) { WSInfo fileItem = (WSInfo) tempvector.get(i); - jarlist.remove(fileItem); + jarList.remove(fileItem); } tempvector.clear(); - currentjars.clear(); + currentJars.clear(); } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java?rev=329997&r1=329996&r2=329997&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java Mon Oct 31 23:06:49 2005 @@ -23,7 +23,7 @@ public class AxisOperationFactory implements WSDLConstants { - public static AxisOperation getOperetionDescription(int mepURI) throws AxisFault { + public static AxisOperation getAxisOperation(int mepURI) throws AxisFault { AxisOperation abOpdesc ; switch(mepURI){ case MEP_CONSTANT_IN_ONLY : {