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 di...@apache.org on 2005/12/16 22:59:40 UTC
svn commit: r357243 - in /webservices/axis2/trunk/java/modules/core:
src/org/apache/axis2/addressing/ src/org/apache/axis2/client/
src/org/apache/axis2/context/ src/org/apache/axis2/deployment/
src/org/apache/axis2/description/ src/org/apache/axis2/eng...
Author: dims
Date: Fri Dec 16 13:59:15 2005
New Revision: 357243
URL: http://svn.apache.org/viewcvs?rev=357243&view=rev
Log:
Garbage collection, remove unused code and commented out lines
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.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/DeploymentConstants.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/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/description/ParameterIncludeImpl.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisObserver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/OptionsParser.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadFactory.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java Fri Dec 16 13:59:15 2005
@@ -56,13 +56,10 @@
public static final String WSA_POLICIES = "Policies";
public static final String WSA_METADATA = "Metadata";
- // ==================================================================================
-
public static final String WSA_INTERFACE_NAME = "InterfaceName";
}
- // ======================================================================
public interface Submission {
// ====================== Addressing Submission Version Constants ===================
@@ -72,8 +69,6 @@
public static final String WSA_ANONYMOUS_URL =
"http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous";
public static final String EPR_SERVICE_NAME_PORT_NAME = "PortName";
-
- // ==================================================================================
public static final String EPR_REFERENCE_PROPERTIES = "ReferenceProperties";
public static final String EPR_PORT_TYPE = "PortType";
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java Fri Dec 16 13:59:15 2005
@@ -309,7 +309,6 @@
msgctx.setMessageID(messageID);
- // //
if (clientOptions.isUseSeparateListener()) {
// the invocation happen via a separate Channel, so we should set up the
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ListenerManager.java Fri Dec 16 13:59:15 2005
@@ -87,7 +87,6 @@
try {
return new ServerSocket(port + i);
} catch (IOException e) {
-
// What I'm gonna do here. Try again.
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Fri Dec 16 13:59:15 2005
@@ -69,7 +69,6 @@
*/
public void addSOAPHeader(OMElement soapHeaderBlock) {
if (soapHeaderBlock == null) {
-
// what are you trying to do here. You wanna set null to a header ??
return;
}
@@ -201,7 +200,7 @@
AxisConfiguration axisConf =
serviceContext.getConfigurationContext().getAxisConfiguration();
- // if it is already engeged do not engege it agaien
+ // if it is already engeged do not engage it again
if (!axisConf.isEngaged(name)) {
axisConf.engageModule(name);
}
@@ -224,7 +223,7 @@
msgCtx.setProperty(Constants.Configuration.IS_USING_SEPARATE_LISTENER,
new Boolean(clientOptions.isUseSeparateListener()));
- // I'm not setting the properties here. Those will be set, when we
+ // we are not setting the properties here. Those will be set, when we
// create the operation context
}
@@ -266,9 +265,8 @@
protected void inferTransportOutDescription(MessageContext msgCtx) throws AxisFault {
// user can set the transport by giving a TransportOutDescription or we
- // will deduce that from the
- // to epr information
- // if user has not set the TransportOutDescription, lets infer that
+ // will deduce that from the "to" epr information, if user has not set the
+ // TransportOutDescription, lets infer that
if (clientOptions.getSenderTransport() == null) {
AxisConfiguration axisConfig =
this.serviceContext.getConfigurationContext().getAxisConfiguration();
@@ -281,8 +279,7 @@
if ((senderTrasportProtocol == null) || "".equals(senderTrasportProtocol)) {
// by this time we have passed all the information we
- // collected via Options to the
- // message context
+ // collected via Options to the message context
clientOptions.setSenderTransport(inferTransport(msgCtx.getTo()));
} else {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java Fri Dec 16 13:59:15 2005
@@ -115,7 +115,7 @@
serviceDesc.addOperation(axisOp);
}
- // This part is compelte mess .. I think we need to look closly at the ServiceGroups ..time been this works
+ // TODO: This part is compelte mess .. I think we need to look closly at the ServiceGroups ..time been this works
configurationContext.getAxisConfiguration().addService(serviceDesc);
AxisServiceGroup serviceGroup =
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java Fri Dec 16 13:59:15 2005
@@ -109,7 +109,7 @@
public void initTransports(ConfigurationContext configContext) {
AxisConfiguration axisConf = configContext.getAxisConfiguration();
- // Initzialize Transport Ins
+ // Initialize Transport Ins
HashMap transportIns = axisConf.getTransportsIn();
Iterator values = transportIns.values().iterator();
@@ -127,7 +127,7 @@
}
}
- // Initzialize Transport Outs
+ // Initialize Transport Outs
HashMap transportOuts = axisConf.getTransportsOut();
values = transportOuts.values().iterator();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Fri Dec 16 13:59:15 2005
@@ -514,7 +514,7 @@
return obj;
}
- // The context hirachy might not have constructed fully, the check should
+ // The context hierarchy might not have constructed fully, the check should
// look for the disconnected grandparents
// Search in Operation Context
if (operationContext != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java Fri Dec 16 13:59:15 2005
@@ -82,12 +82,12 @@
processModuleRefs(moduleitr);
- // Proccessing Transport Sennders
+ // Proccessing Transport Senders
Iterator trs_senders = config_element.getChildrenWithName(new QName(TRANSPORTSENDER));
processTransportSenders(trs_senders);
- // Proccessing Transport Recivers
+ // Proccessing Transport Receivers
Iterator trs_Reivers = config_element.getChildrenWithName(new QName(TRANSPORTRECEIVER));
processTransportReceivers(trs_Reivers);
@@ -205,7 +205,7 @@
processParameters(itr, observer, axisConfiguration);
- // initilization
+ // initialization
observer.init();
axisConfiguration.addObservers(observer);
} catch (ClassNotFoundException e) {
@@ -288,7 +288,7 @@
TransportInDescription transportIN;
OMElement transport = (OMElement) trs_senders.next();
- // getting trsnport Name
+ // getting transport Name
OMAttribute trsName = transport.getAttribute(new QName(ATTNAME));
if (trsName != null) {
@@ -296,7 +296,7 @@
transportIN = new TransportInDescription(new QName(name));
- // tranport impl class
+ // transport impl class
OMAttribute trsClas = transport.getAttribute(new QName(CLASSNAME));
if (trsClas != null) {
@@ -373,7 +373,7 @@
TransportOutDescription transportout;
OMElement transport = (OMElement) trs_senders.next();
- // getting trsnport Name
+ // getting transport Name
OMAttribute trsName = transport.getAttribute(new QName(ATTNAME));
if (trsName != null) {
@@ -381,7 +381,7 @@
transportout = new TransportOutDescription(new QName(name));
- // tranport impl class
+ // transport impl class
OMAttribute trsClas = transport.getAttribute(new QName(CLASSNAME));
if (trsClas == null) {
@@ -459,7 +459,6 @@
return new Phase();
}
-// Class phaseClass = Class.forName(className);
Class phaseClass = axisConfiguration.getSystemClassLoader().loadClass(className);
return (Phase) phaseClass.newInstance();
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=357243&r1=357242&r2=357243&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 Fri Dec 16 13:59:15 2005
@@ -206,8 +206,7 @@
zin.close();
}
} catch (IOException e) {
-
- // what to do, better to log
+ // TODO: what to do, better to log
}
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Fri Dec 16 13:59:15 2005
@@ -23,7 +23,7 @@
public interface DeploymentConstants {
public static String META_INF = "META-INF";
public static final String SERVICE_WSDL_NAME = "service.wsdl";
- int SERVICE = 0; // if it is a servise
+ int SERVICE = 0; // if it is a service
int MODULE = 1; // if it is a module
String SERVICEXML = "META-INF/services.xml";
String SERVICE_WSDL_WITH_FOLDER = "META-INF/service.wsdl";
@@ -45,7 +45,7 @@
String TRANSPORTSENDER = "transportSender";
String TRANSPORTRECEIVER = "transportReceiver";
- // for serviemetadat
+ // for servicemetadata
String STYLENAME = "style";
String SERVICE_PATH = "/services/";
String SERVICE_GROUP_ELEMENT = "serviceGroup";
@@ -64,7 +64,6 @@
String ORDER = "order"; // to resolve the order tag
String OPRATIONST = "operation"; // operation start tag
- // String FOLDE_NAME = "D:/Axis 2.0/projects/Deployement/test-data";
String MODULE_PATH = "/modules/";
String MESSAGERECEIVER = "messageReceiver";
String MEP = "mep";
@@ -90,7 +89,7 @@
String ATTNAME = "name";
String ATTLOCKED = "locked";
- // for operatiins
+ // for operations
String ATQNAME = "name";
String AFTER = "after";
}
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=357243&r1=357242&r2=357243&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 Fri Dec 16 13:59:15 2005
@@ -168,7 +168,6 @@
try {
out.close();
} catch (IOException e) {
-
// ignore
}
}
@@ -176,7 +175,6 @@
try {
in.close();
} catch (IOException e) {
-
// ignore
}
}
@@ -226,7 +224,6 @@
Utils.addFlowHandlers(faultOutFlow, moduleClassLoader);
}
-// modulemetadata.setModuleClassLoader(currentArchiveFile.getClassLoader());
axisConfig.addModule(modulemetadata);
log.info(Messages.getMessage(DeploymentErrorMsgs.ADDING_NEW_MODULE));
}
@@ -373,7 +370,6 @@
Utils.addFlowHandlers(faultOutFlow, moduleClassLoader);
}
-// loadModuleClass(axismodule);
} catch (AxisFault axisFault) {
throw new DeploymentException(axisFault);
}
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=357243&r1=357242&r2=357243&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 Fri Dec 16 13:59:15 2005
@@ -197,7 +197,7 @@
op_descrip.setMessageReceiver(messageReceiver);
} else {
- // setting default message reciver
+ // setting default message receiver
MessageReceiver msgReceiver = loadDefaultMessageReceiver();
op_descrip.setMessageReceiver(msgReceiver);
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=357243&r1=357242&r2=357243&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 Fri Dec 16 13:59:15 2005
@@ -96,7 +96,7 @@
}
}
- // processing servicewide modules which required to engage gloabbly
+ // processing servicewide modules which required to engage gloabally
Iterator moduleRefs = service_element.getChildrenWithName(new QName(MODULEST));
processModuleRefs(moduleRefs);
@@ -256,7 +256,7 @@
op_descrip.setMessageReceiver(messageReceiver);
} else {
- // setting default message reciver
+ // setting default message receiver
MessageReceiver msgReceiver = loadDefaultMessageReceiver();
op_descrip.setMessageReceiver(msgReceiver);
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=357243&r1=357242&r2=357243&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 Fri Dec 16 13:59:15 2005
@@ -61,7 +61,7 @@
processServiceModuleConfig(moduleConfigs, axisServiceGroup.getParent(),
axisServiceGroup);
- // processing servicewide modules which required to engage gloabbly
+ // processing servicewide modules which required to engage gloabally
Iterator moduleRefs = servcice.getChildrenWithName(new QName(MODULEST));
processModuleRefs(moduleRefs, axisServiceGroup);
@@ -83,7 +83,7 @@
axisService = new AxisService(serviceName);
}
- // the service that has to be deploy
+ // the service that has to be deployed
axisService.setParent(axisServiceGroup);
axisService.setClassLoader(axisServiceGroup.getServiceGroupClassLoader());
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java Fri Dec 16 13:59:15 2005
@@ -136,7 +136,7 @@
return para_list;
}
- // to check whether the parameter is locked at any levle
+ // to check whether the parameter is locked at any level
public boolean isParameterLocked(String parameterName) {
return false;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java Fri Dec 16 13:59:15 2005
@@ -131,7 +131,7 @@
return receiver;
}
- // to check whether the parameter is locked at any levle
+ // to check whether the parameter is locked at any level
public boolean isParameterLocked(String parameterName) {
return paramInclude.isParameterLocked(parameterName);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java Fri Dec 16 13:59:15 2005
@@ -123,7 +123,7 @@
return sender;
}
- // to check whether the parameter is locked at any levle
+ // to check whether the parameter is locked at any level
public boolean isParameterLocked(String parameterName) {
return paramInclude.isParameterLocked(parameterName);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java Fri Dec 16 13:59:15 2005
@@ -73,7 +73,6 @@
*/
public abstract AxisService findService(MessageContext messageContext) throws AxisFault;
- // just to put the parent
public abstract void initDispatcher();
/**
@@ -92,7 +91,6 @@
}
msgctx.setAxisService(axisService);
-
// TODO Chinthaka : set the Service Group Context to the message Context
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Fri Dec 16 13:59:15 2005
@@ -45,7 +45,7 @@
"AddressingBasedDispatcher");
private Log log = LogFactory.getLog(getClass());
- // TODO this logic needed to be improved, as the Dispatching is almost garentnee to fail
+ // TODO this logic needed to be improved, as the Dispatching is almost guaranteed to fail
public AxisOperation findOperation(AxisService service, MessageContext messageContext)
throws AxisFault {
log.debug("Checking for Operation using WSAAction : " + messageContext.getWSAAction());
@@ -59,7 +59,7 @@
return null;
}
- // TODO this logic needed to be improved, as the Dispatching is almost garentnee to fail
+ // TODO this logic needed to be improved, as the Dispatching is almost guaranteed to fail
public AxisService findService(MessageContext messageContext) throws AxisFault {
EndpointReference toEPR = messageContext.getTo();
AxisService service = null;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Fri Dec 16 13:59:15 2005
@@ -75,7 +75,7 @@
*/
private Hashtable faultyServices;
- // to store hots configuration if any
+ // to store host configuration if any
HostConfiguration hostConfiguration;
private ArrayList inFaultPhases;
private ArrayList inPhasesUptoAndIncludingPostDispatch;
@@ -109,8 +109,8 @@
serviceClassLoader = Thread.currentThread().getContextClassLoader();
moduleClassLoader = Thread.currentThread().getContextClassLoader();
- // setting the dafualt flow , if some one creat AxisConfig programatically
- // most requird handles will be there in the flow.
+ // setting the default flow , if some one creating AxisConfig programatically
+ // most required handles will be there in the flow.
// todo we need to fix this , we know that we are doing wrong thing here
createDefaultChain();
@@ -385,7 +385,7 @@
return (ModuleDescription) modules.get(name);
}
- // the class loder that become the paranet of all the moduels
+ // the class loder that become the parent of all the modules
public ClassLoader getModuleClassLoader() {
return this.moduleClassLoader;
}
@@ -441,7 +441,7 @@
return (AxisService) allservices.get(name);
}
- // the class loder that become the paranet of all the services
+ // the class loder that become the parent of all the services
public ClassLoader getServiceClassLoader() {
return this.serviceClassLoader;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Fri Dec 16 13:59:15 2005
@@ -99,7 +99,7 @@
SOAP11Constants.FAULT_CODE_MUST_UNDERSTAND);
}
- // TODO what should be do with the Ulitmate Receiver? Axis2 is ultimate Receiver most of the time
+ // TODO what should be do with the Ultimate Receiver? Axis2 is ultimate Receiver most of the time
// should we support that as well
} else {
@@ -228,7 +228,6 @@
soapException = (SOAPProcessingException) e.getCause();
}
} else {
-
// we have recd an instance of just the Exception class
}
@@ -339,7 +338,6 @@
* @throws AxisFault
*/
public void receiveFault(MessageContext msgContext) throws AxisFault {
-
// TODO : rationalize fault handling!
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisObserver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisObserver.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisObserver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisObserver.java Fri Dec 16 13:59:15 2005
@@ -25,6 +25,4 @@
void init();
void update(AxisEvent event);
-
- // there can be parameters for the Observers
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java Fri Dec 16 13:59:15 2005
@@ -75,7 +75,6 @@
} else { // 2. if null, create new opCtxt
operationContext = new OperationContext(axisOperation);
-// operationContext = OperationContextFactory.createOrFindOperationContext(axisOperation.getAxisSpecifMEPConstant(), axisOperation);
axisOperation.registerOperationContext(msgContext, operationContext);
// fill the service group context and service context info
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java Fri Dec 16 13:59:15 2005
@@ -128,11 +128,6 @@
HandlerDescription handlerDesc = hand.getHandlerDesc();
if (handler.getName().getLocalPart().equals(handlerDesc.getName().getLocalPart())) {
-
-// if (handler.equals(handlerDesc)) {
- // tryting to add the same handler twice to the phase
- // this is can happen due to we are allowing service specifc module
- // to add hndlers into gloal chain
return;
}
}
@@ -188,12 +183,12 @@
public void cleanup() throws AxisFault {
- // To change body of implemented methods use File | Settings | File Templates.
+ // Default version does nothing
}
public void init(HandlerDescription handlerdesc) {
- // To change body of implemented methods use File | Settings | File Templates.
+ // Default version does nothing
}
/**
@@ -397,8 +392,6 @@
return this.getPhaseName();
}
- // ////////////////////////////////////////////////////////////// FROM PhaseMetaData //////////
-
/**
* Method getBeforeAfter.
*
@@ -432,7 +425,7 @@
}
public HandlerDescription getHandlerDesc() {
- return null; // To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
/**
@@ -449,7 +442,7 @@
}
public Parameter getParameter(String name) {
- return null; // To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/modules/Module.java Fri Dec 16 13:59:15 2005
@@ -39,8 +39,6 @@
// initialize the module
public void init(AxisConfiguration axisSystem) throws AxisFault;
- // TODO figure out how to get the engage() concept done
- // public void engage(ExecutionChain exeChain) throws AxisFault;
// shutdown the module
public void shutdown(AxisConfiguration axisSystem) throws AxisFault;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/AbstractTransportSender.java Fri Dec 16 13:59:15 2005
@@ -119,7 +119,7 @@
}
// TODO fix this, we do not set the value if the operation context is
- // not avalible
+ // not available
if (msgContext.getOperationContext() != null) {
msgContext.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN,
Constants.VALUE_TRUE);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/TransportUtils.java Fri Dec 16 13:59:15 2005
@@ -131,8 +131,7 @@
public static String getCharSetEncoding(String contentType) {
int index = contentType.indexOf(HTTPConstants.CHAR_SET_ENCODING);
- if (index == -1) { // Charset encoding not found in the contect-type header
-
+ if (index == -1) { // Charset encoding not found in the content-type header
// Using the default UTF-8
return MessageContext.DEFAULT_CHAR_SET_ENCODING;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java Fri Dec 16 13:59:15 2005
@@ -85,8 +85,6 @@
domain = split[1];
passwd = split[2];
- //
-
OMElement proxyParamElement = proxyParam.getParameterElement();
Iterator ite = proxyParamElement.getAllAttributes();
@@ -340,7 +338,7 @@
public void writeRequest(OutputStream out) throws IOException {
try {
- if (doingMTOM) { // chagened ..
+ if (doingMTOM) {
if (chuncked) {
this.handleOMOutput(out, doingMTOM);
} else {
@@ -374,7 +372,7 @@
public long getContentLength() {
try {
- if (doingMTOM) { // chagened
+ if (doingMTOM) {
if (chuncked) {
return -1;
} else {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Fri Dec 16 13:59:15 2005
@@ -149,7 +149,6 @@
Object contextWritten =
msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
- // Getting the
res.setContentType("text/xml; charset="
+ msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING));
@@ -194,7 +193,6 @@
lister = new ListingAgent(configContext);
context.setAttribute(CONFIGURATION_CONTEXT, configContext);
-// servletContext = getServletContext();
} catch (Exception e) {
throw new ServletException(e);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Fri Dec 16 13:59:15 2005
@@ -66,7 +66,7 @@
protected OMElement outputMessage;
public CommonsHTTPTransportSender() {
- } // default
+ }
public void cleanUp(MessageContext msgContext) throws AxisFault {
HttpMethod httpMethod = (HttpMethod) msgContext.getProperty(HTTP_METHOD);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java Fri Dec 16 13:59:15 2005
@@ -32,9 +32,6 @@
public static final String MEDIA_TYPE_APPLICATION_XML = "application/xml";
public static final String MEDIA_TYPE_APPLICATION_SOAP_XML = "application/soap+xml";
- // public static final String HTTP_GET = "HTTP_GET";
- // public static final String HTTP_POST = "HTTP_POST";
-
/**
* Field REQUEST_URI
*/
@@ -300,7 +297,7 @@
/**
* Field HEADER_CONNECTION_KEEPALIVE
*/
- public static final String HEADER_CONNECTION_KEEPALIVE = "Keep-Alive".intern(); // The default don't send.
+ public static final String HEADER_CONNECTION_KEEPALIVE = "Keep-Alive".intern();
/**
* Field HEADER_CONNECTION_CLOSE
@@ -388,8 +385,6 @@
* Default content encoding chatset
*/
public static final String HTTP_ELEMENT_CHARSET = "US-ASCII";
-
- // HTTP prefix
/**
* Field HTTP[]
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java Fri Dec 16 13:59:15 2005
@@ -176,17 +176,6 @@
break;
- // case END_OF_LINE :
- // if (buf[i] == '\n') {
- // state = END;
- // break;
- // } else {
- // state = BEFORE_SEPERATOR;
- // str.append(buf[i]);
- // }
- // break;
- // case END:
- // break;
default :
throw new AxisFault("Error Occured Unknown state " + state);
}
@@ -236,7 +225,6 @@
protected int readLine(InputStream is, byte[] b) throws java.io.IOException {
int count = 0, c;
- // System.out.println("inside here");
if (lastRead == -1) {
c = is.read();
} else {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Fri Dec 16 13:59:15 2005
@@ -211,11 +211,6 @@
} else if (contentType.indexOf(SOAP11Constants.SOAP_11_CONTENT_TYPE) > -1) {
soap11 = true;
- // it is SOAP 1.1
-
-// msgContext.getProperty(
-// Constants.Configuration.ENABLE_REST);
-
/**
* Configuration via Deployment
*/
@@ -277,8 +272,6 @@
} catch (SOAPProcessingException e) {
throw new AxisFault(e);
} catch (AxisFault e) {
-
- // rethrow
throw e;
} catch (OMException e) {
throw new AxisFault(e);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java Fri Dec 16 13:59:15 2005
@@ -155,8 +155,6 @@
HostConfiguration hostConfig = this.getHostConfiguration(httpClient, msgContext, url);
- // this.getHostConfiguration(msgContext, url);
-
// Get the timeout values set in the runtime
getTimeoutValues(msgContext);
@@ -196,13 +194,10 @@
private void sendViaPost(MessageContext msgContext, OMElement dataout, URL url,
String soapActionString) {
- // execuite the HtttpMethodBase - a connection manager can be given for
+ // execute the HtttpMethodBase - a connection manager can be given for
// handle multiple
httpClient = new HttpClient();
- // hostConfig handles the socket functions..
- // HostConfiguration hostConfig = getHostConfiguration(msgContext, url);
-
// Get the timeout values set in the runtime
getTimeoutValues(msgContext);
@@ -234,7 +229,6 @@
// if POST as application/x-www-form-urlencoded
RequestData reqData;
- // System.out.print((String)msgContext.);
if (httpContentType.equalsIgnoreCase(HTTPConstants.MEDIA_TYPE_X_WWW_FORM)) {
reqData = createRequest(msgContext, dataout);
postMethod.setPath(url.getPath() + ((reqData.urlRequest) != null
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java Fri Dec 16 13:59:15 2005
@@ -37,9 +37,6 @@
// handle multiple
httpClient = new HttpClient();
- // hostConfig handles the socket functions..
- // HostConfiguration hostConfig = getHostConfiguration(msgContext, url);
-
// Get the timeout values set in the runtime
getTimeoutValues(msgContext);
@@ -179,7 +176,7 @@
public void writeRequest(OutputStream out) throws IOException {
try {
- if (doingMTOM) { // chagened ..
+ if (doingMTOM) {
if (chuncked) {
this.handleOMOutput(out, doingMTOM);
} else {
@@ -213,7 +210,7 @@
public long getContentLength() {
try {
- if (doingMTOM) { // chagened
+ if (doingMTOM) {
if (chuncked) {
return -1;
} else {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Fri Dec 16 13:59:15 2005
@@ -194,18 +194,6 @@
}
/**
- * stop the server if not already told to.
- *
- * @throws Throwable
- */
-
- // todo : Deepal , this is not the properway to handle , pls fix
- // protected void finalize() throws Throwable {
- // stop();
- // super.finalize();
- // }
-
- /**
* Start this server as a NON-daemon.
*/
public void start() throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java Fri Dec 16 13:59:15 2005
@@ -70,7 +70,6 @@
protected OutputStream openTheConnection(EndpointReference epr, MessageContext msgContext)
throws AxisFault {
- // out = new PipedOutputStream();
out = new ByteArrayOutputStream();
return out;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java Fri Dec 16 13:59:15 2005
@@ -40,13 +40,7 @@
public MailTransportSender() {
}
- /*
- * (non-Javadoc)
- * @see org.apache.axis2.transport.TransportSender#cleanUp()
- */
public void cleanUp(MessageContext msgContext) throws AxisFault {
-
- // TODO Auto-generated method stub
}
public void finalizeSendWithOutputStreamFromIncomingConnection(MessageContext msgContext,
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java Fri Dec 16 13:59:15 2005
@@ -168,8 +168,6 @@
*/
public void run() {
- // log.info(Message.getMessage("start00", "SimpleMailListner", host + ":" +
- // port)); TODO Issue #1 CT 07-Feb-2005.
// Accept and process requests from the socket
if (!stopped) {
String logMessage = "Mail listner is being setup to listen to the address " + user
@@ -208,18 +206,13 @@
Thread.sleep(3000);
} catch (Exception e) {
- // log.debug(Messages.getMessage("exception00"), e); TODO Issue
- // #1 CT 07-Feb-2005.
log.debug("An error occured when running the mail listner." + e.getMessage(), e);
break;
}
}
- log.info("Mail listner has been stoped.");
-
- // log.info(Messages.getMessage("quit00", "SimpleMailListner")); TODO Issue #1
- // CT 07-Feb-2005.
+ log.info("Mail listener has been stoped.");
}
/**
@@ -272,9 +265,6 @@
* socket is closing.
*/
stopped = true;
-
- // log.info(Messages.getMessage("quit00", "SimpleMailListner")); TODO Issue #1
- // CT 07-Feb-2005.
log.info("Quiting the mail listner");
}
@@ -287,8 +277,6 @@
* @see org.apache.axis2.transport.TransportListener#replyToEPR(java.lang.String)
*/
public EndpointReference getReplyToEPR(String serviceName) throws AxisFault {
-
- // TODO Auto-generated method stub
return new EndpointReference(replyTo + "/services/" + serviceName);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java Fri Dec 16 13:59:15 2005
@@ -114,9 +114,6 @@
m.writeTo(socket.getOutputStream());
- // System.out.println("\n\n\n\n ========This is the mail========");
- // m.writeTo(System.out);//socket.getOutputStream());
- // System.out.println("\n\n\n\n ========This is the mail========");
socket.getOutputStream().write(CR_LF_DOT_CR_LF); // This is a bit of a hack to get it working. Have to find a bette way to handle this.
socket.getOutputStream().flush();
} catch (NumberFormatException e) {
@@ -160,7 +157,6 @@
printWriter.println(MailSrvConstants.OK + " POP3 server ready");
String s;
- String ps; // ProcessedString
while (!doneProcess) {
s = bufferedReader.readLine();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java Fri Dec 16 13:59:15 2005
@@ -134,8 +134,6 @@
mail.addFrom(mailFrom);
} catch (MessagingException e) {
log.info(e.getMessage());
-
- // TODO Auto-generated catch block
}
}
@@ -147,8 +145,6 @@
} else if (input.startsWith("RCPT")) {
String domain = MailSrvConstants.SERVER_DOMAIN;
- // System.out.println("RCPT:" + input);
- // temp += input + "\n"; TODO Check this
int start = input.indexOf("<") + 1;
int end;
@@ -176,8 +172,6 @@
receivers.add(toStr);
} catch (MessagingException e) {
log.info(e.getMessage());
-
- // TODO Auto-generated catch block
}
return MailSrvConstants.RCPT_OK;
@@ -208,8 +202,6 @@
}
} catch (MessagingException e) {
log.info(e.getMessage());
-
- // TODO Auto-generated catch block
}
return null;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java Fri Dec 16 13:59:15 2005
@@ -114,7 +114,5 @@
protected void writeTransportHeaders(Writer out, URL url, MessageContext msgContext,
int contentLength)
throws IOException {
-
- // TCP no headers :)
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/OptionsParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/OptionsParser.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/OptionsParser.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/OptionsParser.java Fri Dec 16 13:59:15 2005
@@ -34,11 +34,6 @@
String args[] = null;
Vector usedArgs = null;
- // ////////////////////////////////////////////////////////////////////////
- // SOASS (Start of Axis Specific Stuff)
- // EOASS
- // ////////////////////////////////////////////////////////////////////////
-
/**
* Constructor - just pass in the <b>args</b> from the command line.
*/
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Fri Dec 16 13:59:15 2005
@@ -93,14 +93,6 @@
return newmsgCtx;
}
- // public static ServiceContext createServiceContext(
- // AxisService service,
- // ConfigurationContext engineContext)
- // throws AxisFault {
- // ServiceContext serviceContext = new ServiceContext(service, engineContext);
- // createExecutionChains(serviceContext);
- // return serviceContext;
- // }
public static AxisService createSimpleService(QName serviceName, String className, QName opName)
throws AxisFault {
return createSimpleService(serviceName, new RawXMLINOutMessageReceiver(), className,
@@ -165,8 +157,6 @@
// 2. if null, create new opCtxt
OperationContext operationContext = new OperationContext(axisOperation);
-
-// OperationContext operationContext = OperationContextFactory.createOrFindOperationContext(axisOperation.getAxisSpecifMEPConstant(), axisOperation);
// fill the service group context and service context info
return fillServiceContextAndServiceGroupContext(axisService, configurationContext);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadFactory.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadFactory.java Fri Dec 16 13:59:15 2005
@@ -1,7 +1,5 @@
package org.apache.axis2.util.threadpool;
public interface ThreadFactory {
-
- // public void newThread(java.lang.Runnable runnable);
public void execute(java.lang.Runnable runnable);
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java Fri Dec 16 13:59:15 2005
@@ -57,7 +57,7 @@
serviceContext);
msgctx.setServiceContext(serviceContext);
- // test the complte Hisracy built
+ // test the complte Hierarchy built
assertEquals(msgctx.getParent(), opContext);
assertEquals(opContext.getParent(), serviceContext);
assertEquals(serviceContext.getParent(), serviceGroupContext);
@@ -86,7 +86,7 @@
MessageContext msgctx = new MessageContext(configurationContext);
- // test the complte Hisracy built
+ // test the complete Hierarchy built
assertEquals(msgctx.getParent(), null);
String key1 = "key1";
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java Fri Dec 16 13:59:15 2005
@@ -50,9 +50,6 @@
assertNotNull(cl);
Class.forName("org.apache.axis2.Echo2", true, cl);
assertNotNull(service.getName());
- //no style for the service
- // assertEquals(service.getStyle(),"rpc");
- //no need the following since
assertNotNull(service.getParameter("para2"));
AxisOperation op = service.getOperation(new QName("opname"));
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Fri Dec 16 13:59:15 2005
@@ -74,10 +74,6 @@
OperationContext opCOntext = new OperationContext(axisOp);
-// mc.setOperationContext(OperationContextFactory.createOrFindOperationContext(
-// WSDLConstants.MEP_CONSTANT_IN_OUT,
-// axisOp
-// ));
mc.setOperationContext(opCOntext);
mc.setTransportOut(transport);
mc.setProperty(MessageContext.TRANSPORT_OUT, System.out);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java Fri Dec 16 13:59:15 2005
@@ -93,7 +93,6 @@
ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
inPhase.add("global");
-// ((AxisConfigurationImpl) axisSytem).setInPhases(inPhase);
((AxisConfiguration) axisSytem).setInFaultPhases(inPhase);
((AxisConfiguration) axisSytem).setOutFaultPhases(inPhase);
((AxisConfiguration) axisSytem).setGlobalOutPhase(inPhase);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/SimpleMailListnerTest.java Fri Dec 16 13:59:15 2005
@@ -26,63 +26,10 @@
super(testName);
}
-// public void setUp(){
-// Thread thread = new Thread(new Runnable() {
-// public void run() {
-// boolean optDoThreads = true;
-// String optHostName = "localhost";
-// boolean optUseCustomPort = false;
-// int optCustomPortToUse = 0;
-// String optDir = "FIX_ME_PLS";
-// String optUserName = "server";
-// String optPassword = "server";
-// System.out.println("Starting the mail listner");
-// try {
-// String host = optHostName;
-// int port = ((optUseCustomPort) ? optCustomPortToUse : 110);
-// POP3Client pop3 = new POP3Client();
-// sas = new SimpleMailListner(host, port, optUserName,
-// optPassword, optDir);
-// sas.setDoThreads(optDoThreads);
-// sas.setPOP3(pop3);
-// sas.start();
-// } catch (Exception e) {
-// System.out.println("An error occured in the main method of SimpleMailListner. TODO Detailed error message needs to be inserted here.");
-// return;
-// }
-//
-//
-// }
-// });
-// thread.start();
-//
-// }
-
public void testSendViaMailAndReceive() throws Exception {
-// // CREATE CLIENT INSTANCE MailClient(String user, String host, String password)
-// MailClient mailclient = new MailClient("client", "localhost", "client");
-//
-// String fileContents = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"> <soapenv:Header></soapenv:Header> <soapenv:Body> <samples:echo xmlns:samples=\"http://apache.ws.apache.org/samples\"> <samples:param1 xmlns:arrays=\"http://axis.apache.org/encoding/Arrays\"> <arrays:item>Hello testing1</arrays:item> <arrays:item>Hello testing2</arrays:item> <arrays:item>Hello testing3</arrays:item> <arrays:item>Hello testing4</arrays:item> <arrays:item>Hello testing5</arrays:item> </samples:param1> </samples:echo> </soapenv:Body></soapenv:Envelope>";
-// String soapService = "sample1";
-//
-// // SEND A MESSAGE TO THE SERVER
-// mailclient.sendMessage(
-// "server@localhost",
-// "Testing SOAP with service - " + soapService,
-// fileContents, soapService);
-//
-// int count =0;
-// boolean success = false;
-//
-// while (count<10 && !success) {
-// Thread.sleep(10000);
-// success = (mailclient.checkInbox(3)>0);
-// }
-//
}
public void tearDown() throws Exception {
-// sas.stop();
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java?rev=357243&r1=357242&r2=357243&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java Fri Dec 16 13:59:15 2005
@@ -29,45 +29,11 @@
public class TCPTransportTest extends TestCase {
public TCPTransportTest(String arg0) {
super(arg0);
- // TODO Auto-generated constructor stub
}
public void testTransportSender() throws AxisFault {
-// Thread thead = new Thread(new Runnable() {
-// public void run() {
-// try {
-// ServerSocket serverSocket = new ServerSocket(45678);
-// Socket s = serverSocket.accept();
-// assertNotNull(createSOAPEnvelope(s.getInputStream()));
-// } catch (AxisFault e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// } catch (IOException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-// }
-// });
-// thead.start();
-//
-// TCPTransportSender ts = new TCPTransportSender();
-// MessageContext msgctx = new MessageContext(null, null, null, null);
-// msgctx.setTo(new EndpointReference(AddressingConstants.WSA_TO,"http://127.0.0.1:45679"));
-//
-// msgctx.setEnvelope(createSOAPEnvelope(Thread.currentThread().getContextClassLoader().getResourceAsStream("org/apache/axis2/transport/sample.xml")));
-// ts.invoke(msgctx);
-
-
}
-// public void testTransportReceiver(){
-// ConfigurationContext configContext = new ConfigurationContext(new AxisConfigurationImpl());
-// AxisService serviceDesc = new AxisService(new QName("TempService"));
-// AxisOperation opDesc = new AxisOperation();
-// TCPServer tcpServer = new TCPServer();
-// }
-
-
public SOAPEnvelope createSOAPEnvelope(InputStream in) throws AxisFault {
try {
XMLStreamReader xmlreader =