You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/09/30 04:42:25 UTC
svn commit: r292602 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: clientapi/
context/ deployment/ deployment/listener/ deployment/repository/util/
description/ engine/ storage/impl/ transport/http/ transport/mail/
transport/mail...
Author: dims
Date: Thu Sep 29 19:42:06 2005
New Revision: 292602
URL: http://svn.apache.org/viewcvs?rev=292602&view=rev
Log:
Remove JUNK!!!!!!!!!! Please don't comment code. Remove it and rely on svn for history.
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.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/context/OperationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentClassLoader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.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/AxisConfigurationImpl.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.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/HTTPTransportReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.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/TCPWorker.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java Thu Sep 29 19:42:06 2005
@@ -36,8 +36,6 @@
*/
public class Call extends InOutMEPClient {
-// Unused? --GD
-// private HashMap properties;
protected static OperationDescription operationTemplate;
private MessageContext lastResponseMessage;
@@ -209,7 +207,6 @@
QName assumedServiceName = new QName("AnonymousService");
ServiceDescription axisService = new ServiceDescription(assumedServiceName);
operationTemplate = new OperationDescription(new QName("TemplateOperation"));
-// ServiceGroupDescription serviceGroupDescription = new ServiceGroupDescription(sysContext.getAxisConfiguration());
PhasesInfo info =((AxisConfigurationImpl)sysContext.getAxisConfiguration()).getPhasesinfo();
//to set the operation flows
@@ -218,15 +215,8 @@
}
axisService.addOperation(operationTemplate);
sysContext.getAxisConfiguration().addService(axisService);
-// serviceGroupDescription.addService(axisService);
-// serviceGroupDescription.getServiceGroupContext(sysContext);
-// serviceGroupDescription.setServiceGroupName(assumedServiceName.getLocalPart());
-// sysContext.getAxisConfiguration().addServiceGroup(serviceGroupDescription);
-
-// return sysContext.createServiceContext(assumedServiceName);
- return axisService.getParent().getServiceGroupContext(sysContext).getServiceContext(assumedServiceName.getLocalPart());
-// return serviceGroupDescription.getServiceGroupContext(sysContext).getServiceContext(
-// assumedServiceName.getLocalPart());
+
+ return axisService.getParent().getServiceGroupContext(sysContext).getServiceContext(assumedServiceName.getLocalPart());
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MessageSender.java Thu Sep 29 19:42:06 2005
@@ -91,8 +91,5 @@
ServiceGroupContext serviceGroupContext = axisService.getParent().getServiceGroupContext(sysContext);
return serviceGroupContext.getServiceContext(assumedServiceName.getLocalPart());
- //todo fixme Chinthaka
-// return sysContext.createServiceContext(
-// assumedServiceName);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Thu Sep 29 19:42:06 2005
@@ -240,10 +240,6 @@
serviceContext = serviceGroupContext.getServiceContext(messageContext.getServiceDescription().getName().
getLocalPart());
-// if (serviceContext == null) {
-// serviceContext = new ServiceContext(messageContext.getServiceDescription(), serviceGroupContext);
-// serviceGroupContext.registerServiceContext(serviceContext);
-// }
} else {
// either the key is null or no SGC is found from the give key
if (isNull(serviceGroupContextId)) {
@@ -251,11 +247,8 @@
messageContext.setServiceGroupContextId(serviceGroupContextId);
}
if (messageContext.getServiceDescription() != null) {
-// String servicName = messageContext.getServiceDescription().getName().getLocalPart();
ServiceGroupDescription servicGroupDescription =
messageContext.getServiceDescription().getParent();
-// ServiceGroupDescription servicGroupDescription =
-// this.getAxisConfiguration().getServiceGroup(servicName);
serviceGroupContext = servicGroupDescription.getServiceGroupContext(this);
serviceContext = serviceGroupContext.getServiceContext(
messageContext.getServiceDescription().getName().
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -72,7 +72,6 @@
if(configurationContext == null){
configurationContext = new ConfigurationContext(configuration);
}
-// configurationContext = new ConfigurationContext(configuration);
phaseResolver.buildTranspotsChains();
initModules(configurationContext);
initTransports(configurationContext);
@@ -118,7 +117,6 @@
engineContext = new ConfigurationContext(configuration);
}
-// engineContext = new ConfigurationContext(configuration);
phaseResolver.buildTranspotsChains();
initModules(engineContext);
initTransports(engineContext);
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -770,34 +770,6 @@
// search in Configuration Context
obj = configurationContext.getProperty(key, persistent);
}
-
-//
-// if (obj == null
-// && operationContext == null
-// && serviceContext != null) {
-// obj = serviceContext.getProperty(key, persistent);
-// }
-// if (obj == null && operationContext == null) {
-// obj = configurationContext.getProperty(key, persistent);
-// }
- //Search the configurations
-// Parameter param = null;
-// if (obj == null && operationContext != null) {
-// OperationDescription opDesc = operationContext.getAxisOperation();
-// param = opDesc.getParameter(key);
-// }
-// if (param == null && serviceContext != null) {
-// ServiceDescription serviceDesc = serviceContext.getServiceConfig();
-// param = serviceDesc.getParameter(key);
-// }
-// if (param == null && configurationContext != null) {
-// AxisConfiguration baseConfig =
-// configurationContext.getAxisConfiguration();
-// param = baseConfig.getParameter(key);
-// }
-// if (param != null) {
-// obj = param.getValue();
-// }
return obj;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java Thu Sep 29 19:42:06 2005
@@ -242,11 +242,6 @@
}
}
-
-// public MessageContext createMessageContext(AxisM){
-//
-// }
-
public void setParent(AbstractContext context) {
super.setParent(context);
this.operationContextMap = getServiceContext().getEngineContext()
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ServiceGroupContext.java Thu Sep 29 19:42:06 2005
@@ -92,18 +92,6 @@
}
}
-
-
-// public void registerServiceContext(ServiceContext serviceContext) throws AxisFault {
-// String serviceName = serviceContext.getServiceConfig().
-// getName().getLocalPart();
-// ServiceContext serviceContextAlreadyRegistered = (ServiceContext) serviceContextMap.get(serviceName);
-// if (serviceContextAlreadyRegistered == null) {
-// serviceContextMap.put(serviceName, serviceContext);
-// serviceContext.setParent(this);
-// }
-// }
-
public ServiceGroupDescription getDescription() {
return description;
}
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -131,7 +131,6 @@
return cla;
}
if (!foundClass) {
-// throw new ClassNotFoundException("Class Not found : " + name);
throw new ClassNotFoundException(Messages.getMessage(
DeploymentErrorMsgs.CLASS_NOT_FOUND, name));
}
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -95,16 +95,8 @@
private String engineConfigName;
- /**
- * This to keep a referance to serverMetaData object
- */
- // private static ServerMetaData axisGlobal = new ServerMetaData();
-
private ArchiveFileData currentArchiveFile;
- //tobuild chains
-// private ConfigurationContextFactory factory;
-
/**
* To store the module specified in the server.xml at the document parsing time
*/
@@ -190,7 +182,6 @@
throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.CONFIG_NOT_FOUND));
}
}
-// factory = new ConfigurationContextFactory();
this.engineConfigName = repositoryName + '/' + serverXMLFile;
}
@@ -243,8 +234,6 @@
axisConfig = createEngineConfig();
AxisConfigBuilder builder =new AxisConfigBuilder(in,this,axisConfig);
builder.populateConfig();
-// DeploymentParser parser = new DeploymentParser(in, this);
- // parser.processGlobalConfig(((AxisConfigurationImpl) axisConfig), AXIS2CONFIG);
} catch (FileNotFoundException e) {
throw new DeploymentException(e);
}
@@ -275,7 +264,6 @@
checkClientHome(clientHome);
isRepositoryExist = true;
try {
-// engineConfigName = axis2repository + "/axis2.xml";
File tempfile = new File(engineConfigName);
in = new FileInputStream(tempfile);
} catch (FileNotFoundException e) {
@@ -289,9 +277,6 @@
axisConfig = createEngineConfig();
AxisConfigBuilder builder =new AxisConfigBuilder(in,this,axisConfig);
builder.populateConfig();
-// DeploymentParser parser = new DeploymentParser(in, this);
-// parser.processGlobalConfig(((AxisConfigurationImpl) axisConfig),
-// AXIS2CONFIG);
if (isRepositoryExist) {
hotDeployment = false;
hotUpdate = false;
@@ -345,7 +330,6 @@
throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.CONFIG_NOT_FOUND));
}
}
-// factory = new ConfigurationContextFactory();
this.engineConfigName = clientHome + '/' + clientXML;
}
@@ -601,16 +585,12 @@
archiveReader.processServiceGroup(currentArchiveFile.getAbsolutePath(),
this,
sericeGroup,explodedDir);
-// archiveReader.readServiceArchive(currentArchiveFile.getAbsolutePath(),
-// this,
-// service);
addnewService(sericeGroup);
log.info(Messages.getMessage(
DeploymentErrorMsgs.DEPLOYING_WS, currentArchiveFile.getName()));
} catch (DeploymentException de) {
log.info(Messages.getMessage(DeploymentErrorMsgs.IN_VALID_SERVICE,
currentArchiveFile.getName(),de.getMessage()));
-// log.info("DeploymentException " + de);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
de.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" +
@@ -618,7 +598,6 @@
} catch (AxisFault axisFault) {
log.info(Messages.getMessage(DeploymentErrorMsgs.IN_VALID_SERVICE,
currentArchiveFile.getName(),axisFault.getMessage()));
-// log.info("AxisFault " + axisFault);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
axisFault.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" +
@@ -626,7 +605,6 @@
} catch (Exception e) {
log.info(Messages.getMessage(DeploymentErrorMsgs.IN_VALID_SERVICE,
currentArchiveFile.getName(),e.getMessage()));
-// log.info("Exception " + e);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" +
@@ -652,23 +630,14 @@
addNewModule(metaData);
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
metaData.getName().getLocalPart()));
-// "Moduel WS Name " +
-// currentArchiveFile.getName() +
-// " modulename :" +
-// metaData.getName());
} catch (DeploymentException e) {
-// e.printStackTrace();
log.info(Messages.getMessage(
DeploymentErrorMsgs.INVALID_MODULE, currentArchiveFile.getName(),
e.getMessage()));
-// "Invalid module" +
-// currentArchiveFile.getName());
-// log.info("DeploymentException " + e);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
} catch (AxisFault axisFault) {
-// axisFault.printStackTrace();
log.info(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE, currentArchiveFile.getName(),
axisFault.getMessage()));
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
@@ -686,7 +655,6 @@
}
} catch (AxisFault axisFault) {
log.info(Messages.getMessage(DeploymentErrorMsgs.SETTING_CL, axisFault.getMessage()));
-// continue;
}
}
@@ -798,12 +766,7 @@
ServiceBuilder builder = new ServiceBuilder(serviceInputStream,this,axisService);
builder.populateService(builder.buildOM());
-
-// DeploymentParser schme = new DeploymentParser(serviceInputStream,
-// this);
-// schme.parseServiceXML(axisService);
loadServiceProperties(axisService);
-// axisConfig.addService(axisService);
} catch (AxisFault axisFault) {
throw new DeploymentException(axisFault);
} catch (XMLStreamException e) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Thu Sep 29 19:42:06 2005
@@ -165,34 +165,6 @@
return handler;
}
-
- /**
- * To get the list og modules that is requird to be engage globally
- * @param moduleRefs <code>java.util.Iterator</code>
- * @throws DeploymentException <code>DeploymentException</code>
- */
-// protected void processModuleRefs(Iterator moduleRefs) throws DeploymentException {
-// try {
-// while (moduleRefs.hasNext()) {
-// OMElement moduleref = (OMElement) moduleRefs.next();
-// OMAttribute moduleRefAttribute = moduleref.getAttribute(
-// new QName(REF));
-// if(moduleRefAttribute !=null){
-// String refName = moduleRefAttribute.getValue();
-// if(engine.getModule(new QName(refName)) == null) {
-// throw new DeploymentException(Messages.getMessage(
-// DeploymentErrorMsgs.MODEULE_NOT_FOUND, refName));
-// } else {
-// engine.getCurrentFileItem().addModule(new QName(refName));
-// }
-// }
-// }
-// }catch (AxisFault axisFault) {
-// throw new DeploymentException(axisFault);
-// }
-// }
-
-
/**
* To get the Paramter object out from the OM
* @param paramters <code>Parameter</code>
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java Thu Sep 29 19:42:06 2005
@@ -126,11 +126,6 @@
searchExplodedDir(modulepath);
//service archives
searchWS(modulepath, SERVICE);
-// if(extarctServiceArchive){
-// searchExploedServies(modulepath);
-// }else {
-// searchWS(modulepath, SERVICE);
-// }
}
/**
@@ -207,75 +202,6 @@
}
}
}
-
-// private void searchExploedServies(String rootDirName){
-// File rootDir = new File(rootDirName);
-// File [] fileList = rootDir.listFiles();
-// ArrayList tobedelete = new ArrayList();
-// ArrayList tobeextarct = new ArrayList();
-// ArrayList allFiles = new ArrayList();
-// for (int i = 0; fileList != null && i < fileList.length; i++) {
-// File file_first = fileList[i];
-// boolean isservice = ArchiveFileData.isServiceArchiveFile(file_first.getName());
-// boolean found = false;
-// if(isservice){
-// for (int j = 0; j < fileList.length; j++) {
-// File file_second = fileList[j];
-// if(file_second.getName().equalsIgnoreCase(
-// getShortFileName(file_first.getName()))){
-// if(file_second.lastModified() >= file_first.lastModified()){
-// found = true;
-// allFiles.add(file_second);
-// break;
-// } else if (file_second.lastModified() < file_first.lastModified()){
-// tobedelete.add(file_second);
-// tobeextarct.add(file_first);
-// found = true;
-// }
-// }
-// }
-// if(!found){
-// tobeextarct.add(file_first);
-// }
-// }
-// }
-// for (int i = 0; i < tobedelete.size(); i++) {
-// File file1 = (File) tobedelete.get(i);
-// deleteDir(file1);
-// }
-//
-// for (int i = 0; i < tobeextarct.size(); i++) {
-// File file1 = (File) tobeextarct.get(i);
-// File outFile = new File(rootDirName,getShortFileName(file1.getName()));
-// if(!outFile.exists()){
-// outFile.mkdir();
-// }
-// extarctServiceArchive(file1,outFile);
-// allFiles.add(outFile);
-// }
-//
-// for (int i = 0; fileList != null && i < fileList.length; i++) {
-// File file = fileList[i];
-// boolean found = false;
-// boolean todo = ArchiveFileData.isServiceArchiveFile(file.getName());
-// if (!todo) {
-// for (int j = 0; j < allFiles.size(); j++) {
-// File file1 = (File) allFiles.get(j);
-// if(file1.getName().equals(file.getName())){
-// found = true;
-// }
-// }
-// if(!found){
-// allFiles.add(file);
-// }
-// }
-// }
-//
-// for (int i = 0; i < allFiles.size(); i++) {
-// File file = (File) allFiles.get(i);
-// wsinfoList.addWSInfoItem(file, SERVICE);
-// }
-// }
/**
* To delete a given directory with its all childerns
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Thu Sep 29 19:42:06 2005
@@ -79,9 +79,6 @@
WSDLServiceImpl serviceimpl = (WSDLServiceImpl) womDescription.getServices().get(iterator.next());
service = new ServiceDescription(serviceimpl);
-// service =
-// (ServiceDescription) womDescription.getServices()
-// .get(iterator.next());
}
if (!foundservice) {
service = new ServiceDescription();
@@ -92,8 +89,6 @@
service = new ServiceDescription();
log.info(Messages.getMessage(DeploymentErrorMsgs.WSDL_FILE_NOT_FOUND,
file.getName()));
-// "WSDL file not found for the service : " +
-// file.getName());
}
} catch (Exception e) {
throw new DeploymentException(e);
@@ -345,36 +340,14 @@
File userHomedir = new File(userHome);
File repository = new File(userHomedir, ".axis2home");
modules = new File(repository, "modules");
-
-//
-//
-// if (!repository.exists()) {
-// repository.mkdirs();
-// modules = new File(repository, "modules");
-// modules.mkdirs();
-// } else {
-// modules = new File(repository, "modules");
-// if (!modules.exists()) {
-// modules.mkdirs();
-// }
-// }
} else {
modules = new File(axis2repository, "modules");
-// if (!modules.exists()) {
-// modules = new File(axis2repository, "modules");
-// modules.mkdirs();
-// }
}
String modulearchiveName = moduleName + ".mar";
modulearchiveFile = new File(modules, modulearchiveName);
if (modulearchiveFile.exists()) {
return modulearchiveFile;
}
-//
-// else {
-// modulearchiveFile.createNewFile();
-// }
-//
ClassLoader cl = Thread.currentThread().getContextClassLoader();
InputStream in = cl.getResourceAsStream("modules/" + moduleName + ".mar");
if (in == null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java Thu Sep 29 19:42:06 2005
@@ -72,13 +72,6 @@
//to keep the time that last update time of the service
private long lastupdate ;
- /**
- * TODO this should be in the WSDLInterface, yet we want it to have in the
- * the Services, so we put this here for M1 until we foud better way to do
- * that
- */
-// protected final HashMap operationsMap = new HashMap();
-
private String serviceDescription ;
private String fileName = "";
@@ -650,13 +643,6 @@
try {
Definition wsdlDefinition = this.getWSDLDefinition();
if (wsdlDefinition != null) {
-// Iterator sreviceitr = wsdlDefinition.getServices().keySet()
-// .iterator();
-// while (sreviceitr.hasNext()) {
-// wsdlDefinition.removeService((QName) sreviceitr.next());
-// }
-
- // wsdlDefinition.removeService(this.getName());
Collection services = wsdlDefinition.getServices().values();
for (Iterator iterator = services.iterator(); iterator.hasNext();) {
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -97,26 +97,6 @@
msgctx.setOperationDescription(operationDescription);
}
}
-
-// if (msgctx.getServiceContext() == null) {
-// ServiceDescription axisService = findService(msgctx);
-// if (axisService != null) {
-// msgctx.setServiceContext(
-// axisService.findServiceContext(msgctx));
-// }
-// }
-//
-// if (msgctx.getServiceContext() != null &&
-// msgctx.getOperationContext() == null) {
-// OperationDescription axisOperation = findOperation(
-// msgctx.getServiceContext().getServiceConfig(), msgctx);
-// if (axisOperation != null) {
-// OperationContext operationContext = axisOperation.findOperationContext(
-// msgctx, msgctx.getServiceContext());
-// msgctx.setOperationContext(operationContext);
-// }
-// }
-
}
/**
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -38,10 +38,6 @@
new QName("http://axis.ws.apache.org",
"AddressingBasedDispatcher");
-// public AddressingBasedDispatcher() {
-// init(new HandlerDescription(NAME));
-// }
-
public void initDispatcher() {
init(new HandlerDescription(NAME));
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Thu Sep 29 19:42:06 2005
@@ -59,11 +59,6 @@
*/
private final HashMap modules = new HashMap();
- /**
- * Field services
- */
-// private final HashMap services = new HashMap();
-
private final HashMap serviceGroups = new HashMap();
private final HashMap transportsIn = new HashMap();
@@ -126,33 +121,6 @@
new Phase(PhaseMetadata.PHASE_TRANSPORTIN));
inPhasesUptoAndIncludingPostDispatch.add(
new Phase(PhaseMetadata.PHASE_PRE_DISPATCH));
-
-// Phase dispatch = new Phase(PhaseMetadata.PHASE_DISPATCH);
-// AddressingBasedDispatcher add_dispatch = new AddressingBasedDispatcher();
-// add_dispatch.getHandlerDesc().setParent(this);
-// dispatch.addHandler(add_dispatch, 0);
-//
-// RequestURIBasedDispatcher uri_diaptch = new RequestURIBasedDispatcher();
-// uri_diaptch.getHandlerDesc().setParent(this);
-// dispatch.addHandler(uri_diaptch, 1);
-//
-// SOAPActionBasedDispatcher soapActionBased_dispatch = new SOAPActionBasedDispatcher();
-// soapActionBased_dispatch.getHandlerDesc().setParent(this);
-// dispatch.addHandler(soapActionBased_dispatch, 2);
-//
-// SOAPMessageBodyBasedDispatcher soapMessageBodybased_dispatch =
-// new SOAPMessageBodyBasedDispatcher();
-// soapMessageBodybased_dispatch.getHandlerDesc().setParent(this);
-// dispatch.addHandler(soapMessageBodybased_dispatch, 3);
-//
-// inPhasesUptoAndIncludingPostDispatch.add(dispatch);
-//
-// Phase postDispatch = new Phase(PhaseMetadata.PHASE_POST_DISPATCH);
-// DispatchingChecker dispatchingChecker = new DispatchingChecker();
-// dispatchingChecker.getHandlerDesc().setParent(this);
-//
-// postDispatch.addHandler(dispatchingChecker);
-// inPhasesUptoAndIncludingPostDispatch.add(postDispatch);
}
@@ -479,9 +447,6 @@
tobeEnaged = false;
//Instead of throwing the error, we can just log this problem
log.info("Attempt to engage an already engaged module "+ qName);
-// throw new AxisFault(moduleref.getLocalPart() +
-// " module has alredy engaged globally" +
-// " operation terminated !!!");
}
}
} else {
@@ -557,28 +522,4 @@
public ModuleConfiguration getModuleConfig(QName moduleName){
return (ModuleConfiguration)moduleConfigmap.get(moduleName);
}
-
-
-// /**
-// * To split a given service name into it serviceGroupName and Service Name
-// * if the service Name is foo:bar then serviceGroupName ="foo" and ServiceName ="bar"
-// * but if the service name is only the foo we asume ServiceGroupName="foo" ans ServiceName="foo"
-// * meaning foo := foo:foo
-// * @param serviceName
-// * @return String [] <code>String</code>
-// */
-// public static String [] splitServiceName(String serviceName){
-// String namePart [] = new String[2];
-// int index = serviceName.indexOf(Constants.SERVICE_NAME_SPLIT_CHAR);
-// if(index > 0){
-// namePart[0] = serviceName.substring(0,index);
-// namePart[1] = serviceName.substring(index +1 ,serviceName.length());
-// } else {
-// namePart[0] = serviceName;
-// namePart[1] = serviceName;
-// }
-// return namePart;
-// }
-
-
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java Thu Sep 29 19:42:06 2005
@@ -35,10 +35,6 @@
new QName("http://axis.ws.apache.org",
"SOAPActionBasedDispatcher");
-// public SOAPActionBasedDispatcher() {
-// init(new HandlerDescription(NAME));
-// }
-
public void initDispatcher() {
init(new HandlerDescription(NAME));
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java Thu Sep 29 19:42:06 2005
@@ -41,13 +41,6 @@
String serviceName = null;
QName operationName = null;
- /**
- * Constructor Dispatcher
- */
-// public SOAPMessageBodyBasedDispatcher() {
-// init(new HandlerDescription(NAME));
-// }
-
public void initDispatcher() {
init(new HandlerDescription(NAME));
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/storage/impl/AxisFileStorage.java Thu Sep 29 19:42:06 2005
@@ -92,9 +92,6 @@
}
private void updateFileState() throws IOException {
-// ObjectOutput out = new ObjectOutputStream(fos);
-// out.writeObject(map);
-// out.close();
}
public boolean clean() {
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -610,17 +610,6 @@
if (getMethod.getStatusCode() == HttpStatus.SC_OK) {
processResponse(getMethod, msgContext);
-
-// obatainHTTPHeaderInformation(getMethod, msgContext);
-//
-// InputStream in = getMethod.getResponseBodyAsStream();
-// if (in == null) {
-// throw new AxisFault(
-// Messages.getMessage("canNotBeNull", "InputStream"));
-// }
-// msgContext.getOperationContext().setProperty(
-// MessageContext.TRANSPORT_IN,
-// in);
} else if (getMethod.getStatusCode() == HttpStatus.SC_ACCEPTED) {
return;
}else if (getMethod.getStatusCode() == HttpStatus.SC_INTERNAL_SERVER_ERROR){
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -30,16 +30,6 @@
*/
public class HTTPTransportReceiver {
/**
- * Field END
- */
-// private static final int END = 1;
-
- /**
- * Field END_OF_LINE
- */
-// private static final int END_OF_LINE = 2;
-
- /**
* Field BEFORE_SEPERATOR
*/
private static final int BEFORE_SEPERATOR = 3;
@@ -289,72 +279,6 @@
public static String getServicesHTML(
ConfigurationContext configurationContext) {
String temp = "";
- //todo Ruchith please fix me
-// Map services =configurationContext.getAxisConfiguration().getServices();
-// Hashtable erroneousServices =
-// configurationContext.getAxisConfiguration().getFaulytServices();
-// boolean status = false;
-//
-// if (services != null && !services.isEmpty()) {
-// status = true;
-// Collection serviceCollection = services.values();
-// temp += "<h2>" + "Deployed services" + "</h2>";
-// for (Iterator it = serviceCollection.iterator(); it.hasNext();) {
-// Map operations;
-// Collection operationsList;
-// ServiceDescription axisService = (ServiceDescription) it.next();
-// operations = axisService.getOperations();
-// operationsList = operations.values();
-//
-// temp += "<h3>" + axisService.getName().getLocalPart() +
-// "</h3>";
-// if (operationsList.size() > 0) {
-// temp += "Available operations <ul>";
-// for (Iterator iterator1 = operationsList.iterator();
-// iterator1.hasNext();
-// ) {
-// OperationDescription axisOperation =
-// (OperationDescription) iterator1.next();
-// temp += "<li>"
-// + axisOperation.getName().getLocalPart()
-// + "</li>";
-// }
-// temp += "</ul>";
-// } else {
-// temp += "No operations speficied for this service";
-// }
-// }
-// }
-//
-// if (erroneousServices != null && !erroneousServices.isEmpty()) {
-//
-// temp += "<hr><h2><font color=\"blue\">Faulty Services</font></h2>";
-// status = true;
-// Enumeration faultyservices = erroneousServices.keys();
-// while (faultyservices.hasMoreElements()) {
-// String faultyserviceName =
-// (String) faultyservices.nextElement();
-// temp += "<h3><font color=\"blue\">"
-// + faultyserviceName
-// + "</font></h3>";
-// }
-// }
-//
-// if (!status) {
-// temp = "<h2>There are no services deployed</h2>";
-// }
-//
-// temp =
-// "<html><head><title>Axis2: Services</title></head>"
-// + "<body>"
-// + temp
-// + "</body></html>";
-// Map services =
-// configurationContext.getAxisConfiguration().getServices();
-// Hashtable erroneousServices =
-// configurationContext.getAxisConfiguration().getFaultyServices();
-// boolean status = false;
-
return temp;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Thu Sep 29 19:42:06 2005
@@ -273,11 +273,6 @@
req.getSession().setAttribute(Constants.LOGGED, "Yes");
res.sendRedirect(ADMIN_JSP_NAME);
} else {
-// res.setContentType("text/css");
-// PrintWriter out_writer = new PrintWriter(out);
-// out_writer.println("Invalid user name password");
-// out_writer.flush();
-// out_writer.close();
throw new AdminAppException(Messages.getMessage("invaliduser"));
}
}
@@ -508,21 +503,7 @@
if (req.getParameter("submit") != null) {
String serviceName = req.getParameter("service");
String turnoff = req.getParameter("turnoff") ;
-// String remove = req.getParameter("remove");
if(serviceName !=null){
-// if (remove !=null){
-// ServiceDescription service = configContext.getAxisConfiguration().
-// getService(new QName(serviceName));
-// if(service != null ){
-// File servicefile = new File(service.getFileName());
-// if(servicefile.exists()){
-// configContext.getAxisConfiguration().removeService(
-// new QName(serviceName));
-// servicefile.delete();
-// }
-//
-// }
-// }
if(turnoff !=null){
configContext.getAxisConfiguration().removeService(serviceName);
res.setContentType("text/css");
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java Thu Sep 29 19:42:06 2005
@@ -108,8 +108,6 @@
for (int i = 0; i < msgs.length; i++) {
MimeMessage msg = (MimeMessage) msgs[i];
if (msg != null) {
-// System.out.println(msg.getSender());
-// System.out.println(msg.getContent());
}
msg.setFlag(Flags.Flag.DELETED, true);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java Thu Sep 29 19:42:06 2005
@@ -153,7 +153,6 @@
}
} catch (AxisFault e1) {
log.error(e);
-// e1.printStackTrace();
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java Thu Sep 29 19:42:06 2005
@@ -67,7 +67,6 @@
}
} catch (IOException ex) {
log.info(ex.getMessage());
-// ex.printStackTrace();
}
while (running) {
@@ -85,7 +84,6 @@
} catch (IOException ex) {
if (running) {
log.info(ex.getMessage());
-// ex.printStackTrace();
}
}
}
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=292602&r1=292601&r2=292602&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 Thu Sep 29 19:42:06 2005
@@ -88,7 +88,6 @@
.getOutputStream()));
} catch (IOException ex) {
log.info(ex.getMessage());
-// ex.printStackTrace();
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java?rev=292602&r1=292601&r2=292602&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java Thu Sep 29 19:42:06 2005
@@ -102,8 +102,6 @@
try {
this.socket.close();
} catch (IOException e1) {
- // TODO Auto-generated catch block
-// e1.printStackTrace();
}
}
}