You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by gd...@apache.org on 2005/08/08 04:44:10 UTC
svn commit: r230732 [1/2] - in /webservices/axis/trunk/java:
modules/common/src/org/apache/axis2/i18n/
modules/core/src/org/apache/axis2/clientapi/
modules/core/src/org/apache/axis2/context/
modules/core/src/org/apache/axis2/deployment/ modules/core/sr...
Author: gdaniels
Date: Sun Aug 7 19:43:27 2005
New Revision: 230732
URL: http://svn.apache.org/viewcvs?rev=230732&view=rev
Log:
* Fix spelling errors
* A little cleanup (remove unused stuff, etc)
* Fix probs in TCP tests pointing to wrong SOAP12Constants
* Check in XmlSchema jar (just for now - will eventually be a separate dependency)
* Can only be a single attribute with a given QName for OMElements
* Introduce getChildElements (need to finish implementing)
Added:
webservices/axis/trunk/java/modules/wsdl/lib/
webservices/axis/trunk/java/modules/wsdl/lib/XmlSchema.jar (with props)
Modified:
webservices/axis/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/ListenerManager.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/MessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
webservices/axis/trunk/java/modules/core/test-resources/deployment/echo/org/apache/axis/echo/Echo.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextInjectionTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java
webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java
webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java
webservices/axis/trunk/java/modules/wsdl/project.xml
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
webservices/axis/trunk/java/xdocs/mail-transport.html
Modified: webservices/axis/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties (original)
+++ webservices/axis/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties Sun Aug 7 19:43:27 2005
@@ -29,7 +29,7 @@
inputstreamNull=Input stream is Null while reading for the incomming message
unknownTransport=Unknown transport {0}
paramIsNotSpecified={0} parameter is not specified
-groovryNoanswer=No answer recieved from groovy side!!!!
+groovryNoanswer=No answer received from groovy side!!!!
outMessageNull=The OUTPUT message is Null, nothing to write
canNotBeNull={0} can not be Null
notFound={0} not found
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java Sun Aug 7 19:43:27 2005
@@ -27,7 +27,7 @@
callbackstore.put(MsgID, callback);
}
- public void recieve(MessageContext messgeCtx) throws AxisFault {
+ public void receive(MessageContext messgeCtx) throws AxisFault {
RelatesTo relatesTO = messgeCtx.getMessageInformationHeaders()
.getRelatesTo();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOutMEPClient.java Sun Aug 7 19:43:27 2005
@@ -216,7 +216,7 @@
//information need to correlated the response message and invoke the call back
String messageID = String.valueOf(System.currentTimeMillis());
msgctx.setMessageID(messageID);
- axisop.setMessageReciever(callbackReceiver);
+ axisop.setMessageReceiver(callbackReceiver);
callbackReceiver.addCallback(messageID, callback);
//set the replyto such that the response will arrive at the transport listener started
msgctx.setReplyTo(ListenerManager.replyToEPR(serviceContext
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/ListenerManager.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/ListenerManager.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/ListenerManager.java Sun Aug 7 19:43:27 2005
@@ -64,7 +64,7 @@
TransportInDescription tranportIn =
configurationContext.getAxisConfiguration().getTransportIn(
new QName(transport));
- TransportListener listener = tranportIn.getReciever();
+ TransportListener listener = tranportIn.getReceiver();
listener.start();
tsState = new TransportListnerState(listener);
listeners.put(transport, tsState);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java Sun Aug 7 19:43:27 2005
@@ -152,7 +152,7 @@
while (values.hasNext()) {
TransportInDescription transportIn =
(TransportInDescription) values.next();
- TransportListener listener = transportIn.getReciever();
+ TransportListener listener = transportIn.getReceiver();
if (listener != null) {
listener.init(configContext, transportIn);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Sun Aug 7 19:43:27 2005
@@ -516,14 +516,14 @@
/**
* @param file
*/
- public void addtowsToDeploy(ArchiveFileData file) {
+ public void addWSToDeploy(ArchiveFileData file) {
wsToDeploy.add(file);
}
/**
* @param file
*/
- public void addtowstoUnDeploy(WSInfo file) {
+ public void addWSToUndeploy(WSInfo file) {
wsToUnDeploy.add(file);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java Sun Aug 7 19:43:27 2005
@@ -429,10 +429,10 @@
PhasesInfo info = dpengine.getPhasesinfo();
info.setOperationPhases(operation);
// DeploymentData.getInstance().setOperationPhases(operation);
- if (operation.getMessageReciever() == null) {
+ if (operation.getMessageReceiver() == null) {
try {
/**
- * Setting default Message Recive as Message Reciever
+ * Setting default Message Recive as Message Receiver
*/
ClassLoader loader1 =
Thread.currentThread()
@@ -441,7 +441,7 @@
Class.forName("org.apache.axis2.receivers.RawXMLINOutMessageReceiver",
true,
loader1);
- operation.setMessageReciever((MessageReceiver) messageReceiver.newInstance());
+ operation.setMessageReceiver((MessageReceiver) messageReceiver.newInstance());
} catch (ClassNotFoundException e) {
throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.ERROR_IN_LOADING_MR,
"ClassNotFoundException",
@@ -840,7 +840,7 @@
Class.forName(attvalue,
true,
loader1);
- operation.setMessageReciever((MessageReceiver) messageReceiver.newInstance());
+ operation.setMessageReceiver((MessageReceiver) messageReceiver.newInstance());
}
} catch (ClassNotFoundException e) {
throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.ERROR_IN_LOADING_MR,
@@ -970,10 +970,10 @@
PhasesInfo info = dpengine.getPhasesinfo();
info.setOperationPhases(operation);
// DeploymentData.getInstance().setOperationPhases(operation);
- if (operation.getMessageReciever() == null) {
+ if (operation.getMessageReceiver() == null) {
try {
/**
- * Setting default Message Recive as Message Reciever
+ * Setting default Message Recive as Message Receiver
*/
ClassLoader loader1 =
Thread.currentThread()
@@ -982,7 +982,7 @@
Class.forName("org.apache.axis2.receivers.RawXMLINOutMessageReceiver",
true,
loader1);
- operation.setMessageReciever((MessageReceiver) messageReceiver.newInstance());
+ operation.setMessageReceiver((MessageReceiver) messageReceiver.newInstance());
} catch (ClassNotFoundException e) {
throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.ERROR_IN_LOADING_MR,
"ClassNotFoundException",
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfo.java Sun Aug 7 19:43:27 2005
@@ -49,7 +49,7 @@
return lastmodifieddate;
}
- public void setLastmodifieddate(long lastmodifieddate) {
+ public void setLastModifiedDate(long lastmodifieddate) {
this.lastmodifieddate = lastmodifieddate;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Sun Aug 7 19:43:27 2005
@@ -38,10 +38,10 @@
/**
* Referance to DeploymentEngine to make update
*/
- private DeploymentEngine deplorer;
+ private DeploymentEngine deployer;
public WSInfoList(DeploymentEngine deploy_engine) {
- deplorer = deploy_engine;
+ deployer = deploy_engine;
}
/**
@@ -76,18 +76,18 @@
SERVICE);
jarlist.add(wsInfo);
ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE);
- deplorer.addtowsToDeploy(archiveFileData);//to inform that new web service is deployed
+ deployer.addWSToDeploy(archiveFileData);//to inform that new web service is deployed
} else {
- if (deplorer.isHotUpdate()) {
+ if (deployer.isHotUpdate()) {
WSInfo tempWSInfo = getFileItem(file.getName());
if (isModified(file, tempWSInfo)) { // caheck whether file is updated
- tempWSInfo.setLastmodifieddate(file.lastModified());
+ tempWSInfo.setLastModifiedDate(file.lastModified());
WSInfo wsInfo = new WSInfo(tempWSInfo.getFilename(),
tempWSInfo.getLastmodifieddate(),
SERVICE);
- deplorer.addtowstoUnDeploy(wsInfo); // add entry to undeploy list
+ deployer.addWSToUndeploy(wsInfo); // add entry to undeploy list
ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE);
- deplorer.addtowsToDeploy(archiveFileData); // add entry to deploylist
+ deployer.addWSToDeploy(archiveFileData); // add entry to deploylist
}
}
@@ -102,18 +102,18 @@
MODULE);
jarlist.add(wsInfo);
ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE);
- deplorer.addtowsToDeploy(archiveFileData);//to inform that new web service is deployed
+ deployer.addWSToDeploy(archiveFileData);//to inform that new web service is deployed
} else {
- if (deplorer.isHotUpdate()) {
+ if (deployer.isHotUpdate()) {
WSInfo tempWSInfo = getFileItem(file.getName());
if (isModified(file, tempWSInfo)) {
- tempWSInfo.setLastmodifieddate(file.lastModified());
+ tempWSInfo.setLastModifiedDate(file.lastModified());
WSInfo wsInfo = new WSInfo(tempWSInfo.getFilename(),
tempWSInfo.getLastmodifieddate(),
MODULE);
- deplorer.addtowstoUnDeploy(wsInfo); // add entry to undeploy list
+ deployer.addWSToUndeploy(wsInfo); // add entry to undeploy list
ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE);
- deplorer.addtowsToDeploy(archiveFileData); // add entry to deploylist
+ deployer.addWSToDeploy(archiveFileData); // add entry to deploylist
}
}
@@ -197,7 +197,7 @@
tempvector.add(fileitem);
WSInfo wsInfo = new WSInfo(fileitem.getFilename(),
fileitem.getLastmodifieddate());
- deplorer.addtowstoUnDeploy(wsInfo);//this is to be undeploye
+ deployer.addWSToUndeploy(wsInfo);//this is to be undeploye
}
}
@@ -216,10 +216,10 @@
*/
public void update() {
checkForUndeploye();
- if (deplorer.isHotUpdate()) {
- deplorer.unDeploy();
+ if (deployer.isHotUpdate()) {
+ deployer.unDeploy();
}
- deplorer.doDeploy();
+ deployer.doDeploy();
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java Sun Aug 7 19:43:27 2005
@@ -220,11 +220,11 @@
}
- public MessageReceiver getMessageReciever() {
+ public MessageReceiver getMessageReceiver() {
return messageReceiver;
}
- public void setMessageReciever(MessageReceiver messageReceiver) {
+ public void setMessageReceiver(MessageReceiver messageReceiver) {
this.messageReceiver = messageReceiver;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java Sun Aug 7 19:43:27 2005
@@ -52,7 +52,7 @@
protected QName name;
- protected TransportListener reciever;
+ protected TransportListener receiver;
//to store handler in inFlow
private Phase inPhase;
@@ -128,15 +128,15 @@
/**
* @return
*/
- public TransportListener getReciever() {
- return reciever;
+ public TransportListener getReceiver() {
+ return receiver;
}
/**
* @param receiver
*/
public void setReceiver(TransportListener receiver) {
- reciever = receiver;
+ this.receiver = receiver;
}
public Phase getInPhase() {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java Sun Aug 7 19:43:27 2005
@@ -15,7 +15,6 @@
*/
package org.apache.axis2.engine;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.description.HandlerDescription;
@@ -44,8 +43,6 @@
/**
* Constructor Dispatcher
*/
- private ConfigurationContext engineContext;
-
public AbstractDispatcher() {
init(new HandlerDescription(NAME));
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Sun Aug 7 19:43:27 2005
@@ -91,7 +91,7 @@
//to store AxisObserver Objects
private ArrayList observersList = null;
- protected HashMap messagRecievers;
+ protected HashMap messagReceivers;
/////////////////////// From AxisGlobal /////////////////////////////////////
/**
* Constructor EngineRegistryImpl
@@ -99,7 +99,7 @@
public AxisConfigurationImpl() {
paramInclude = new ParameterIncludeImpl();
engagedModules = new ArrayList();
- messagRecievers = new HashMap();
+ messagReceivers = new HashMap();
inPhases = new ArrayList();
outPhases = new ArrayList();
@@ -302,11 +302,11 @@
public void addMessageReceiver(String key,
MessageReceiver messageReceiver) {
- messagRecievers.put(key, messageReceiver);
+ messagReceivers.put(key, messageReceiver);
}
public MessageReceiver getMessageReceiver(String key) {
- return (MessageReceiver) messagRecievers.get(key);
+ return (MessageReceiver) messagReceivers.get(key);
}
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Sun Aug 7 19:43:27 2005
@@ -137,8 +137,8 @@
if (msgContext.isServerSide() && !msgContext.isPaused()) {
// invoke the Message Receivers
MessageReceiver receiver =
- operationDescription.getMessageReciever();
- receiver.recieve(msgContext);
+ operationDescription.getMessageReceiver();
+ receiver.receive(msgContext);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/MessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/MessageReceiver.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/MessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/MessageReceiver.java Sun Aug 7 19:43:27 2005
@@ -25,5 +25,5 @@
* Message Receiver to decide.
*/
public interface MessageReceiver {
- public void recieve(MessageContext messgeCtx) throws AxisFault;
+ public void receive(MessageContext messgeCtx) throws AxisFault;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java Sun Aug 7 19:43:27 2005
@@ -36,7 +36,7 @@
new QName("http://axis.ws.apache.org",
"RequestURIBasedDispatcher");
QName serviceName = null;
- QName operatoinName = null;
+ QName operationName = null;
/**
* Constructor Dispatcher
@@ -48,8 +48,8 @@
public OperationDescription findOperation(ServiceDescription service,
MessageContext messageContext)
throws AxisFault {
- if (operatoinName != null) {
- OperationDescription axisOp = service.getOperation(operatoinName);
+ if (operationName != null) {
+ OperationDescription axisOp = service.getOperation(operationName);
return axisOp;
}
return null;
@@ -66,7 +66,7 @@
String[] values = Utils.parseRequestURLForServiceAndOperation(
filePart);
if (values[1] != null) {
- operatoinName = new QName(values[1]);
+ operationName = new QName(values[1]);
}
if (values[0] != null) {
serviceName = new QName(values[0]);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java Sun Aug 7 19:43:27 2005
@@ -38,7 +38,7 @@
new QName("http://axis.ws.apache.org",
"SOAPMessageBodyBasedDispatcher");
QName serviceName = null;
- QName operatoinName = null;
+ QName operationName = null;
/**
* Constructor Dispatcher
@@ -52,9 +52,9 @@
throws AxisFault {
OMElement bodyFirstChild = messageContext.getEnvelope().getBody()
.getFirstElement();
- operatoinName = new QName(bodyFirstChild.getLocalName());
+ operationName = new QName(bodyFirstChild.getLocalName());
- OperationDescription axisOp = service.getOperation(operatoinName);
+ OperationDescription axisOp = service.getOperation(operationName);
return axisOp;
}
@@ -62,7 +62,6 @@
* @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext)
*/
public ServiceDescription findService(MessageContext messageContext) throws AxisFault {
- final String URI_ID_STRING = "/services";
OMElement bodyFirstChild = messageContext.getEnvelope().getBody().getFirstElement();
if(bodyFirstChild != null){
@@ -73,7 +72,7 @@
String[] values = Utils.parseRequestURLForServiceAndOperation(
filePart);
if (values[1] != null) {
- operatoinName = new QName(values[1]);
+ operationName = new QName(values[1]);
}
if (values[0] != null) {
serviceName = new QName(values[0]);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java Sun Aug 7 19:43:27 2005
@@ -29,7 +29,7 @@
public abstract void invokeBusinessLogic(MessageContext inMessage) throws AxisFault;
- public final void recieve(final MessageContext messgeCtx) throws AxisFault {
+ public final void receive(final MessageContext messgeCtx) throws AxisFault {
invokeBusinessLogic(messgeCtx);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Sun Aug 7 19:43:27 2005
@@ -34,7 +34,7 @@
public abstract void invokeBusinessLogic(MessageContext inMessage, MessageContext outMessage, ServerCallback callback)
throws AxisFault;
- public final void recieve(final MessageContext messgeCtx) throws AxisFault {
+ public final void receive(final MessageContext messgeCtx) throws AxisFault {
final ServerCallback callback = new ServerCallback() {
public void handleResult(MessageContext result) throws AxisFault {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java Sun Aug 7 19:43:27 2005
@@ -32,7 +32,7 @@
MessageContext outMessage)
throws AxisFault;
- public final void recieve(MessageContext messgeCtx) throws AxisFault {
+ public final void receive(MessageContext messgeCtx) throws AxisFault {
MessageContext newmsgCtx =
new MessageContext(messgeCtx.getSystemContext(),
messgeCtx.getSessionContext(),
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java Sun Aug 7 19:43:27 2005
@@ -29,7 +29,7 @@
public abstract void invokeBusinessLogic(MessageContext inMessage) throws AxisFault;
- public final void recieve(final MessageContext messgeCtx) throws AxisFault {
+ public final void receive(final MessageContext messgeCtx) throws AxisFault {
try {
invokeBusinessLogic(messgeCtx);
} catch (AxisFault e) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java Sun Aug 7 19:43:27 2005
@@ -37,12 +37,12 @@
/**
* Field END
*/
- private static final int END = 1;
+// private static final int END = 1;
/**
* Field END_OF_LINE
*/
- private static final int END_OF_LINE = 2;
+// private static final int END_OF_LINE = 2;
/**
* Field BEFORE_SEPERATOR
@@ -100,7 +100,7 @@
* Server: Apache-Coyote/1.1
* Connection: close
*
- * @param reader
+ * @param in
* @param serverSide
* @return
* @throws AxisFault
@@ -113,7 +113,6 @@
int state = BEFORE_SEPERATOR;
String key = null;
String value = null;
- int start = 0;
length = readLine(in, buf);
if (serverSide) {
if ((buf[0] == 'P')
@@ -235,8 +234,6 @@
*
* @param is inputstream to read from
* @param b byte array to read into
- * @param off starting offset into the byte array
- * @param len maximum number of bytes to read
* @return
* @throws java.io.IOException
*/
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Sun Aug 7 19:43:27 2005
@@ -21,7 +21,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.util.Iterator;
import java.util.Map;
@@ -85,7 +84,8 @@
//fill up the Message Contexts
msgContext.setWSAAction(soapActionHeader);
msgContext.setSoapAction(soapActionHeader);
- msgContext.setTo(new EndpointReference(requestURI));
+ msgContext.setTo(new EndpointReference(
+ requestURI.substring(1, requestURI.length())));
msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
msgContext.setServerSide(true);
@@ -99,8 +99,6 @@
builder = selectBuilderForMIME(msgContext, in, contentType);
envelope = (SOAPEnvelope) builder.getDocumentElement();
} else {
- Reader reader = new InputStreamReader(in);
-
XMLStreamReader xmlreader;
//Figure out the char set encoding and create the reader
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java Sun Aug 7 19:43:27 2005
@@ -81,7 +81,7 @@
}else if(HTTPConstants.HEADER_PROTOCOL_11.equals(httpVersion)){
httpVersion = HTTPConstants.HEADER_PROTOCOL_11;
}else{
- throw new AxisFault("Unknown protocol versoin "+ httpVersion);
+ throw new AxisFault("Unknown protocol version "+ httpVersion);
}
String transferEncoding = (String) map.get(HTTPConstants.HEADER_TRANSFER_ENCODING);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Sun Aug 7 19:43:27 2005
@@ -62,7 +62,6 @@
*/
private boolean stopped = false;
- private boolean chuncked = false;
private int port;
public SimpleHTTPServer() {
@@ -157,8 +156,6 @@
/**
* Start this server as a NON-daemon.
- *
- * @throws Exception
*/
public void start() throws AxisFault {
if (serverSocket == null) {
@@ -227,6 +224,7 @@
public static void main(String[] args) throws Exception {
if (args.length != 2) {
System.out.println("SimpleHTTPServer repositoryLocation port");
+ System.exit(1);
}
ServerSocket serverSoc = null;
serverSoc = new ServerSocket(Integer.parseInt(args[1]));
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Sun Aug 7 19:43:27 2005
@@ -91,7 +91,7 @@
className));
OperationDescription axisOp = new OperationDescription(opName);
- axisOp.setMessageReciever(messageReceiver);
+ axisOp.setMessageReceiver(messageReceiver);
axisOp.setStyle(WSDLService.STYLE_RPC);
service.addOperation(axisOp);
return service;
Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/echo/org/apache/axis/echo/Echo.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/echo/org/apache/axis/echo/Echo.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/echo/org/apache/axis/echo/Echo.java (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/echo/org/apache/axis/echo/Echo.java Sun Aug 7 19:43:27 2005
@@ -34,7 +34,6 @@
* Time: 1:12:11 PM
*/
public class Echo {
-
public Echo() {
}
public OMElement viewVersion(OMElement omEle) {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java Sun Aug 7 19:43:27 2005
@@ -30,7 +30,7 @@
}
- public void recieve(MessageContext msgContext) throws AxisFault {
+ public void receive(MessageContext msgContext) throws AxisFault {
log.info("I am Speaking Provider Running :)");
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java Sun Aug 7 19:43:27 2005
@@ -67,8 +67,8 @@
engineContext.getAxisConfiguration().addService(service);
OperationDescription axisOp = new OperationDescription(operationName);
- axisOp.setMessageReciever(new MessageReceiver() {
- public void recieve(MessageContext messgeCtx) throws AxisFault {
+ axisOp.setMessageReceiver(new MessageReceiver() {
+ public void receive(MessageContext messgeCtx) throws AxisFault {
}
});
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Sun Aug 7 19:43:27 2005
@@ -67,8 +67,8 @@
axisOp = new OperationDescription(opearationName);
service = new ServiceDescription(serviceName);
- axisOp.setMessageReciever(new MessageReceiver() {
- public void recieve(MessageContext messgeCtx) throws AxisFault {
+ axisOp.setMessageReceiver(new MessageReceiver() {
+ public void receive(MessageContext messgeCtx) throws AxisFault {
// TODO Auto-generated method stub
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextInjectionTest.java Sun Aug 7 19:43:27 2005
@@ -78,7 +78,7 @@
MessageContextEnabledEcho.class.getName()));
OperationDescription operation = new OperationDescription(
operationName);
- operation.setMessageReciever(new RawXMLINOnlyMessageReceiver());
+ operation.setMessageReceiver(new RawXMLINOnlyMessageReceiver());
service.addOperation(operation);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
LocalTransportReceiver.CONFIG_CONTEXT.getAxisConfiguration()
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java Sun Aug 7 19:43:27 2005
@@ -57,7 +57,7 @@
//
// }
- public void testSendViaMailAndRecieve() throws Exception {
+ public void testSendViaMailAndReceive() throws Exception {
// // CREATE CLIENT INSTANCE MailClient(String user, String host, String password)
// MailClient mailclient = new MailClient("client", "localhost", "client");
//
Modified: webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java Sun Aug 7 19:43:27 2005
@@ -27,7 +27,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.soap.*;
import org.apache.axis2.soap.impl.llom.SOAPProcessingException;
-import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
+import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMNamespace;
Modified: webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java (original)
+++ webservices/axis/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java Sun Aug 7 19:43:27 2005
@@ -26,7 +26,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.soap.*;
import org.apache.axis2.soap.impl.llom.SOAPProcessingException;
-import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
+import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMNamespace;
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java Sun Aug 7 19:43:27 2005
@@ -70,8 +70,8 @@
ServiceDescription service = new ServiceDescription(serviceName);
OperationDescription operation = new OperationDescription(
operationName);
- operation.setMessageReciever(new MessageReceiver() {
- public void recieve(MessageContext messgeCtx) throws AxisFault {
+ operation.setMessageReceiver(new MessageReceiver() {
+ public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
TestingUtils.campareWithCreatedOMElement(
envelope.getBody().getFirstElement());
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java Sun Aug 7 19:43:27 2005
@@ -33,7 +33,7 @@
private static ConfigurationContext configurationContext;
public static final int TESTING_PORT = 5555;
- public static final String FAILURE_MESSAGE = "Intentional Faliure";
+ public static final String FAILURE_MESSAGE = "Intentional Failure";
private Log log = LogFactory.getLog(getClass());
public static synchronized void deployService(ServiceDescription service)
@@ -57,7 +57,7 @@
File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY);
System.out.println(file.getAbsoluteFile());
if (!file.exists()) {
- throw new Exception("repository directory does not exists");
+ throw new Exception("Repository directory does not exist");
}
configurationContext =
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java Sun Aug 7 19:43:27 2005
@@ -79,8 +79,8 @@
ServiceDescription service = new ServiceDescription(serviceName);
OperationDescription operation = new OperationDescription(
operationName);
- operation.setMessageReciever(new MessageReceiver() {
- public void recieve(MessageContext messgeCtx) throws AxisFault {
+ operation.setMessageReceiver(new MessageReceiver() {
+ public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
}
});
@@ -111,8 +111,8 @@
ServiceDescription service = new ServiceDescription(serviceName);
OperationDescription operation = new OperationDescription(
operationName);
- operation.setMessageReciever(new MessageReceiver() {
- public void recieve(MessageContext messgeCtx) throws AxisFault {
+ operation.setMessageReceiver(new MessageReceiver() {
+ public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
}
});
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Sun Aug 7 19:43:27 2005
@@ -116,8 +116,8 @@
ServiceDescription service = new ServiceDescription(serviceName);
OperationDescription operation = new OperationDescription(
operationName);
- operation.setMessageReciever(new MessageReceiver() {
- public void recieve(MessageContext messgeCtx) throws AxisFault {
+ operation.setMessageReceiver(new MessageReceiver() {
+ public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
}
});
@@ -189,7 +189,7 @@
// new ParameterImpl("transport.mail.replyToAddress",
// "foo@127.0.0.1"));
// transportIn.setReceiver(new SimpleMailListener());
-// transportIn.getReciever().init(configContext, transportIn);
+// transportIn.getReceiver().init(configContext, transportIn);
//
// TransportOutDescription transportOut =
// new TransportOutDescription(
@@ -231,7 +231,7 @@
// new ParameterImpl("transport.mail.replyToAddress",
// "bar@127.0.0.1"));
// transportIn.setReceiver(new SimpleMailListener());
-// transportIn.getReciever().init(configContext, transportIn);
+// transportIn.getReceiver().init(configContext, transportIn);
//
// TransportOutDescription transportOut =
// new TransportOutDescription(
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java Sun Aug 7 19:43:27 2005
@@ -113,8 +113,8 @@
ServiceDescription service = new ServiceDescription(serviceName);
OperationDescription operation = new OperationDescription(
operationName);
- operation.setMessageReciever(new MessageReceiver() {
- public void recieve(MessageContext messgeCtx) throws AxisFault {
+ operation.setMessageReceiver(new MessageReceiver() {
+ public void receive(MessageContext messgeCtx) throws AxisFault {
envelope = messgeCtx.getEnvelope();
}
});
@@ -188,7 +188,7 @@
// new ParameterImpl("transport.mail.replyToAddress",
// "foo@127.0.0.1"));
// transportIn.setReceiver(new SimpleMailListener());
-// transportIn.getReciever().init(configContext, transportIn);
+// transportIn.getReceiver().init(configContext, transportIn);
//
// TransportOutDescription transportOut =
// new TransportOutDescription(
@@ -231,7 +231,7 @@
// new ParameterImpl("transport.mail.replyToAddress",
// "client@127.0.0.1"));
// transportIn.setReceiver(new SimpleMailListener());
-// transportIn.getReciever().init(configContext, transportIn);
+// transportIn.getReceiver().init(configContext, transportIn);
//
// TransportOutDescription transportOut =
// new TransportOutDescription(
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java Sun Aug 7 19:43:27 2005
@@ -80,7 +80,7 @@
.getName()));
OperationDescription axisOp = new OperationDescription(operationName);
- axisOp.setMessageReciever(new RawXMLINOutMessageReceiver());
+ axisOp.setMessageReceiver(new RawXMLINOutMessageReceiver());
axisOp.setStyle(WSDLService.STYLE_DOC);
service.addOperation(axisOp);
UtilServer.deployService(service);
Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java Sun Aug 7 19:43:27 2005
@@ -32,7 +32,7 @@
/**
* This class implements the onComplete method extended by call back
- * recieves the Response
+ * receives the Response
* process the soap with OM to extract the data
* Find the <NavigationURL> element and get the text from it
*
@@ -104,10 +104,10 @@
String opLocalName = operation.getLocalName();
if (opLocalName.equals("Fault")) {
log.info(
- "A Fault message recieved, Check your Licence key");
+ "A Fault message received, Check your Licence key");
strURL =
strURL +
- "A Fault message recieved, Check your Licence key. Else you have reached the " +
+ "A Fault message received, Check your Licence key. Else you have reached the " +
"daily limit of 1000 requests";
} else {
log.info("this is opera: " + operation.getLocalName());
Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java Sun Aug 7 19:43:27 2005
@@ -27,7 +27,7 @@
/**
* This class implements the onComplete method extended by call back
- * recieves the Response
+ * receives the Response
* process the soap with OM to extract the data
* Find the <NavigationURL> element and get the text from it
*
@@ -114,7 +114,7 @@
if (body.hasFault()) {
snippet =
snippet +
- "A Fault message recieved, Check your Licence key. Else you have reached the" +
+ "A Fault message received, Check your Licence key. Else you have reached the" +
" daily limit of 1000 requests";
} else {
OMElement part = operation.getFirstElement();
Added: webservices/axis/trunk/java/modules/wsdl/lib/XmlSchema.jar
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/lib/XmlSchema.jar?rev=230732&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/axis/trunk/java/modules/wsdl/lib/XmlSchema.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/axis/trunk/java/modules/wsdl/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/project.xml?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/project.xml (original)
+++ webservices/axis/trunk/java/modules/wsdl/project.xml Sun Aug 7 19:43:27 2005
@@ -33,7 +33,17 @@
<artifactId>axis2-common</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
-
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>axis</groupId>-->
+<!-- <artifactId>axis2-databinding</artifactId>-->
+<!-- <version>${pom.currentVersion}</version>-->
+<!-- </dependency>-->
+
<!-- external JARs -->
<dependency>
<groupId>commons-logging</groupId>
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java Sun Aug 7 19:43:27 2005
@@ -98,7 +98,7 @@
private Definition wsdl4jParsedDefinition;
- private WSDLComponentFactory wsdlComponenetFactory;
+ private WSDLComponentFactory wsdlComponentFactory;
private List resolvedMultipartMessageList = new LinkedList();
@@ -113,7 +113,7 @@
WSDLComponentFactory wsdlComponentFactory) {
this.womDefinition = womDefinition;
this.wsdl4jParsedDefinition = wsdl4jParsedDefinition;
- this.wsdlComponenetFactory = wsdlComponentFactory;
+ this.wsdlComponentFactory = wsdlComponentFactory;
}
public void pump() {
@@ -153,7 +153,7 @@
Types wsdl4jTypes = wsdl4JDefinition.getTypes();
if (null != wsdl4jTypes) {
- WSDLTypes wsdlTypes = this.wsdlComponenetFactory.createTypes();
+ WSDLTypes wsdlTypes = this.wsdlComponentFactory.createTypes();
this.copyExtensibleElements(wsdl4jTypes.getExtensibilityElements(),
wsdlTypes);
this.womDefinition.setTypes(wsdlTypes);
@@ -168,10 +168,9 @@
// }
// There can be types that are imported. Check the imports and
- // These schemas are needed for the XMLBeans for code generation
+ // These schemas are needed for code generation
Map wsdlImports = wsdl4JDefinition.getImports();
- Stack schemaStack = null;
if (null != wsdlImports && !wsdlImports.isEmpty()){
Collection importsCollection = wsdlImports.values();
@@ -183,7 +182,7 @@
if (wsdlImport.getDefinition()!=null){
Definition importedDef = wsdlImport.getDefinition();
//add the imported types
- WSDLTypes wsdlTypes = this.wsdlComponenetFactory.createTypes();
+ WSDLTypes wsdlTypes = this.wsdlComponentFactory.createTypes();
this.copyExtensibleElements(importedDef.getTypes().
getExtensibilityElements(),
wsdlTypes);
@@ -203,7 +202,7 @@
WSDLInterface wsdlInterface;
PortType portType;
while (portTypeIterator.hasNext()) {
- wsdlInterface = this.wsdlComponenetFactory.createInterface();
+ wsdlInterface = this.wsdlComponentFactory.createInterface();
portType = (PortType) portTypeIterator.next();
this.populateInterfaces(wsdlInterface, portType);
this.copyExtensibilityAttribute(portType.getExtensionAttributes(),
@@ -221,7 +220,7 @@
WSDLBinding wsdlBinding;
Binding wsdl4jBinding;
while (bindingIterator.hasNext()) {
- wsdlBinding = this.wsdlComponenetFactory.createBinding();
+ wsdlBinding = this.wsdlComponentFactory.createBinding();
wsdl4jBinding = (Binding) bindingIterator.next();
this.populateBindings(wsdlBinding, wsdl4jBinding);
this.copyExtensibleElements(
@@ -238,7 +237,7 @@
WSDLService wsdlService;
Service wsdl4jService;
while (serviceIterator.hasNext()) {
- wsdlService = this.wsdlComponenetFactory.createService();
+ wsdlService = this.wsdlComponentFactory.createService();
wsdl4jService = (Service) serviceIterator.next();
this.populateServices(wsdlService, wsdl4jService);
this.copyExtensibleElements(
@@ -273,7 +272,7 @@
WSDLOperation wsdloperation;
Operation wsdl4jOperation;
while (wsdl4JOperationsIterator.hasNext()) {
- wsdloperation = this.wsdlComponenetFactory.createOperation();
+ wsdloperation = this.wsdlComponentFactory.createOperation();
wsdl4jOperation = (Operation) wsdl4JOperationsIterator.next();
this.populateOperations(wsdloperation,
wsdl4jOperation,
@@ -306,7 +305,7 @@
BindingOperation wsdl4jBindingOperation;
while (bindingoperationsIterator.hasNext()) {
wsdlBindingOperation =
- this.wsdlComponenetFactory.createWSDLBindingOperation();
+ this.wsdlComponentFactory.createWSDLBindingOperation();
wsdl4jBindingOperation =
(BindingOperation) bindingoperationsIterator.next();
this.populateBindingOperation(wsdlBindingOperation,
@@ -332,7 +331,7 @@
WSDLEndpoint wsdlEndpoint;
Port wsdl4jPort;
while (wsdl4jportsIterator.hasNext()) {
- wsdlEndpoint = this.wsdlComponenetFactory.createEndpoint();
+ wsdlEndpoint = this.wsdlComponentFactory.createEndpoint();
wsdl4jPort = (Port) wsdl4jportsIterator.next();
this.populatePorts(wsdlEndpoint,
wsdl4jPort,
@@ -381,7 +380,7 @@
Input wsdl4jInputMessage = wsdl4jOperation.getInput();
if (null != wsdl4jInputMessage) {
- MessageReference wsdlInputMessage = this.wsdlComponenetFactory
+ MessageReference wsdlInputMessage = this.wsdlComponentFactory
.createMessageReference();
wsdlInputMessage.setDirection(
WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
@@ -406,7 +405,7 @@
Output wsdl4jOutputMessage = wsdl4jOperation.getOutput();
if (null != wsdl4jOutputMessage) {
MessageReference wsdlOutputMessage =
- this.wsdlComponenetFactory.createMessageReference();
+ this.wsdlComponentFactory.createMessageReference();
wsdlOutputMessage.setDirection(
WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
wsdlOutputMessage.setMessageLabel(
@@ -433,7 +432,7 @@
while (faultKeyIterator.hasNext()) {
Fault fault = (Fault) faults.get(faultKeyIterator.next());
- faultReference = wsdlComponenetFactory.createFaultReference();
+ faultReference = wsdlComponentFactory.createFaultReference();
faultReference.setDirection(
WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
Message faultMessage = fault.getMessage();
@@ -457,8 +456,22 @@
private QName generateReferenceQname(Message wsdl4jMessage) {
QName referenceQName = null;
if (wsdl4jMessage.getParts().size() > 1) {
+ Map parts = wsdl4jMessage.getParts();
+ Iterator i = parts.keySet().iterator();
+ Part thisPart = (Part)(parts.get(i.next()));
+ if (thisPart.getElementName() != null) {
+ throw new RuntimeException(
+ "We don't support multiple element parts in a WSDL message");
+ }
+
// Multipart Message
+ // NOTE (gdaniels) : It appears this code is taking multiple
+ // part declarations and "wrapping" them into a single schema
+ // type. This is fine for RPC style stuff, but should not be
+ // happening for document style.
+ // TODO : sanity check
+
// Check whether this message parts have been made to a type
Iterator multipartListIterator = this.resolvedMultipartMessageList.iterator();
boolean multipartAlreadyResolved = false;
@@ -477,7 +490,6 @@
} else {
//Get the list of multiparts of the message and create a new Element
//out of it and add it to the schema.
- Map parts = wsdl4jMessage.getParts();
Element schemaElement = null;
WSDLTypes types = womDefinition.getTypes();
@@ -493,8 +505,8 @@
Document newDoc = documentBuilder.newDocument();
Element newSchemaElement = newDoc.createElementNS("http://www.w3.org/2001/XMLSchema", "schema");
- types = wsdlComponenetFactory.createTypes();
- ExtensionFactory extensionFactory = wsdlComponenetFactory.createExtensionFactory();
+ types = wsdlComponentFactory.createTypes();
+ ExtensionFactory extensionFactory = wsdlComponentFactory.createExtensionFactory();
org.apache.wsdl.extensions.Schema typesElement = (org.apache.wsdl.extensions.Schema) extensionFactory.getExtensionElement(
ExtensionConstants.SCHEMA);
typesElement.setElelment(newSchemaElement);
@@ -533,17 +545,14 @@
elementName = part.getTypeName();
}
-
NodeList allSchemaElements = schemaElement.getChildNodes();
- for(int i=0; i< allSchemaElements.getLength(); i++){
- if(allSchemaElements.item(i).getNodeType() == Node.ELEMENT_NODE &&
- allSchemaElements.item(i).getLocalName().equals(WSDLPump.XSD_ELEMENT)
- && elementName.getLocalPart().equals(((Element)allSchemaElements.item(i)).getAttribute(WSDLPump.XSD_NAME))){
- relaventElementInSchemaReferedByPart = (Element)allSchemaElements.item(i);
+ for(int idx = 0; idx < allSchemaElements.getLength(); idx++){
+ if(allSchemaElements.item(idx).getNodeType() == Node.ELEMENT_NODE &&
+ allSchemaElements.item(idx).getLocalName().equals(WSDLPump.XSD_ELEMENT)
+ && elementName.getLocalPart().equals(((Element)allSchemaElements.item(idx)).getAttribute(WSDLPump.XSD_NAME))){
+ relaventElementInSchemaReferedByPart = (Element)allSchemaElements.item(idx);
break;
}
-
-
}
child = doc.createElementNS(WSDLPump.NAMESPACE_XMLSCHEMA, WSDLPump.XSD_ELEMENT);
child.setAttribute(WSDLPump.XSD_NAME, elementName.getLocalPart());
@@ -611,7 +620,7 @@
wsdl4jBindingOperation.getBindingInput();
if (null != wsdl4jInputBinding) {
WSDLBindingMessageReference wsdlInputBinding =
- this.wsdlComponenetFactory.createWSDLBindingMessageReference();
+ this.wsdlComponentFactory.createWSDLBindingMessageReference();
wsdlInputBinding.setDirection(
WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
this.copyExtensibleElements(
@@ -623,7 +632,7 @@
BindingOutput wsdl4jOutputBinding = wsdl4jBindingOperation
.getBindingOutput();
if (null != wsdl4jOutputBinding) {
- WSDLBindingMessageReference wsdlOutputBinding = this.wsdlComponenetFactory
+ WSDLBindingMessageReference wsdlOutputBinding = this.wsdlComponentFactory
.createWSDLBindingMessageReference();
wsdlOutputBinding.setDirection(
WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
@@ -640,7 +649,7 @@
while (keyIterator.hasNext()) {
BindingFault bindingFault = (BindingFault) bindingFaults.get(
keyIterator.next());
- WSDLBindingFault womBindingFault = this.wsdlComponenetFactory.createBindingFault();
+ WSDLBindingFault womBindingFault = this.wsdlComponentFactory.createBindingFault();
this.copyExtensibleElements(
bindingFault.getExtensibilityElements(), womBindingFault);
wsdlBindingOperation.addOutFault(womBindingFault);
@@ -722,7 +731,7 @@
private void copyExtensibleElements(List wsdl4jExtensibleElements,
Component component) {
Iterator iterator = wsdl4jExtensibleElements.iterator();
- ExtensionFactory extensionFactory = this.wsdlComponenetFactory
+ ExtensionFactory extensionFactory = this.wsdlComponentFactory
.createExtensionFactory();
while (iterator.hasNext()) {
@@ -826,7 +835,7 @@
QName attributeName = (QName) iterator.next();
QName value = (QName) wsdl4jExtensibilityAttributes
.get(attributeName);
- WSDLExtensibilityAttribute attribute = this.wsdlComponenetFactory
+ WSDLExtensibilityAttribute attribute = this.wsdlComponentFactory
.createWSDLExtensibilityAttribute();
attribute.setKey(attributeName);
attribute.setValue(value);
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Sun Aug 7 19:43:27 2005
@@ -30,7 +30,8 @@
import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
import org.apache.axis2.wsdl.codegen.extension.PackageFinder;
import org.apache.axis2.wsdl.codegen.extension.WSDLValidatorExtension;
-import org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension;
+import org.apache.axis2.wsdl.codegen.extension.AbstractCodeGenerationExtension;
+import org.apache.axis2.wsdl.codegen.extension.SimpleDBExtension;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.wsdl.WSDLDescription;
@@ -38,15 +39,16 @@
* @author chathura@opensource.lk
*/
public class CodeGenerationEngine {
-
private List moduleEndpoints = new ArrayList();
+ private AbstractCodeGenerationExtension dbExt = new SimpleDBExtension();
private CodeGenConfiguration configuration;
public CodeGenerationEngine(CodeGenConfiguration config) throws CodeGenerationException{
this.configuration = config;
- loadExtensions();
+ loadExtensions(dbExt);
}
+
public CodeGenerationEngine(CommandLineOptionParser parser) throws CodeGenerationException {
WSDLDescription wom;
try {
@@ -58,12 +60,10 @@
}
this.configuration = new CodeGenConfiguration(wom, parser);
- loadExtensions();
-
-
+ loadExtensions(dbExt);
}
- private void loadExtensions() {
+ private void loadExtensions(AbstractCodeGenerationExtension dbExt) {
AxisBindingBuilder axisBindingBuilder = new AxisBindingBuilder();
axisBindingBuilder.init(this.configuration);
axisBindingBuilder.engage();
@@ -76,9 +76,8 @@
packageFinder.init(this.configuration);
this.moduleEndpoints.add(packageFinder);
- XMLBeansExtension xmlBeanExtension = new XMLBeansExtension();
- xmlBeanExtension.init(this.configuration);
- this.moduleEndpoints.add(xmlBeanExtension);
+ dbExt.init(this.configuration);
+ this.moduleEndpoints.add(dbExt);
}
public void generate() throws CodeGenerationException {
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl Sun Aug 7 19:43:27 2005
@@ -20,14 +20,13 @@
<xsl:for-each select="method">
<xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
- <xsl:variable name="inputtype"><xsl:value-of select="input/param/@type"></xsl:value-of></xsl:variable> <!-- this needs to change-->
- <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable> <!-- this needs to change-->
-
/**
* Auto generated method signature
- *<xsl:if test="$inputtype!=''">@param <xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>
+ <xsl:for-each select="input/param">
+ * @param <xsl:value-of select="@name"/>
+ </xsl:for-each>
*/
- public <xsl:if test="$outputtype=''">void</xsl:if><xsl:if test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/>(<xsl:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>){
+ public <xsl:if test="$outputtype=''">void</xsl:if><xsl:if test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/>(<xsl:for-each select="input/param"><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"></xsl:value-of><xsl:if test="not(position()=last())">, </xsl:if></xsl:for-each>){
//Todo fill this with the necessary business logic
<xsl:if test="$outputtype!=''">
//Returns an simple om element
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/Component.java Sun Aug 7 19:43:27 2005
@@ -17,6 +17,7 @@
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author chathura@opensource.lk
@@ -80,4 +81,12 @@
* @param attribute <code>ExtensibilityAttribute</code>
*/
public void addExtensibleAttributes(WSDLExtensibilityAttribute attribute);
+
+ /**
+ * Get access to the metadata bag associated with this component (which
+ * contains anything we feel like hanging off it)
+ *
+ * @return the metadata Map.
+ */
+ public Map getMetadataBag();
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java Sun Aug 7 19:43:27 2005
@@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
/**
* @author Chathura Herath
@@ -35,11 +36,6 @@
protected HashMap componentProperties = new HashMap();
/**
- * List of Element
- */
- protected List elments;
-
- /**
* Field documentation
*/
protected Document documentation = null;
@@ -56,6 +52,11 @@
private List attributes = null;
/**
+ * Metadata
+ */
+ private HashMap metadata = null;
+
+ /**
* Returns the Documentation Element as a <code>Document</code>.
*
* @return documentation
@@ -163,5 +164,17 @@
this.attributes = new LinkedList();
}
return this.attributes;
+ }
+
+ /**
+ * Get access to the metadata bag associated with this component (which
+ * contains anything we feel like hanging off it)
+ *
+ * @return the metadata Map.
+ */
+ public Map getMetadataBag() {
+ if (metadata == null)
+ metadata = new HashMap();
+ return metadata;
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java?rev=230732&r1=230731&r2=230732&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMElement.java Sun Aug 7 19:43:27 2005
@@ -64,6 +64,13 @@
public Iterator getChildren();
/**
+ * Returns a filtered list of children - just the elements.
+ *
+ * @return an iterator over the child elements
+ */
+ public Iterator getChildElements();
+
+ /**
* THis will create a namespace in the current element scope
*
* @param uri
@@ -115,10 +122,12 @@
public Iterator getAttributes();
/**
- * @param qname
- * @return
+ * Return a named attribute if present
+ *
+ * @param qname the qualified name to search for
+ * @return an OMAttribute with the given name if found, or null
*/
- public Iterator getAttributes(QName qname);
+ public OMAttribute getAttribute(QName qname);
/**
* This will insert attribute to this element. Implementor can decide as to insert this