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:33:20 UTC
svn commit: r357239 - 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/deployment/listener/ src/org/apache/a...
Author: dims
Date: Fri Dec 16 13:32:59 2005
New Revision: 357239
URL: http://svn.apache.org/viewcvs?rev=357239&view=rev
Log:
Garbage collection, remove unused code and commented out lines
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.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/OperationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/SchedulerTask.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.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/PhaseRule.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/webapp/listService.jsp
webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp
webservices/axis2/trunk/java/modules/core/webapp/upload.jsp
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java Fri Dec 16 13:32:59 2005
@@ -141,8 +141,6 @@
return replyTo;
}
- // ------------------- Setters and Getters --------------------------------------
-
/**
* Method getTo
*/
@@ -216,6 +214,4 @@
public void setTo(EndpointReference to) {
this.to = to;
}
-
- // --------------------------------------------------------------------------------------------
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Fri Dec 16 13:32:59 2005
@@ -40,15 +40,8 @@
*/
public class Options {
- // ==========================================================================
- // ==========================================================================
- // Constants
- // ==========================================================================
public static final String COPY_PROPERTIES = "CopyProperties";
public static final int DEFAULT_TIMEOUT_MILLISECONDS = 5000;
-
- // ==========================================================================
-
private Options delegate = null;
private Map properties = new HashMap();
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=357239&r1=357238&r2=357239&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:32:59 2005
@@ -243,26 +243,4 @@
public void setIsoneway(boolean isoneway) {
this.isoneway = isoneway;
}
-
-// public static void main(String[] args) throws Exception{
-// WSDLMEPClientBuilder builder = new WSDLMEPClientBuilder("/home/hemapani/tools/axis2-0.93-SNAPSHOT-bin/repository/");
-// //builder.defineDescription(new URL("http://mssoapinterop.org/asmx/WSDL/InteropTestDocLit.wsdl"));
-// builder.defineDescription(new File("/home/hemapani/temp/InteropTestDocLit.wsdl").toURL());
-// InOutMEPClient mepclient = (InOutMEPClient)builder.createMEPClient("echoStruct");
-//
-// String message= "<echoStructParam xmlns=\"http://soapinterop.org/xsd\"><varFloat>23.4</varFloat>\"<varInt>35</varInt><varString>Hello1</varString></echoStructParam>";
-// XMLStreamReader in = XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(message.getBytes()));
-// StAXOMBuilder omb = new StAXOMBuilder(in);
-//
-// AxisOperation opDesc = AxisOperationFactory.getAxisOperation(AxisOperationFactory.MEP_CONSTANT_IN_OUT);
-// opDesc.setName(new QName("http://soapinterop.org","echoStruct"));
-// MessageContext msgctx= new MessageContext(mepclient.getServiceContext().getConfigurationContext());
-//
-// SOAPFactory soapFactory = new SOAP11Factory();
-// SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
-// envelope.getBody().setFirstChild(omb.getDocumentElement());
-// msgctx.setEnvelope(envelope);
-//
-// mepclient.invokeBlocking(opDesc,msgctx);
-// }
}
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=357239&r1=357238&r2=357239&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 Fri Dec 16 13:32:59 2005
@@ -41,9 +41,6 @@
public class OperationContext extends AbstractContext {
private boolean isComplete = false;
- // the in and out messages that may be present
- // private MessageContext inMessageContext;
- // private MessageContext outMessageContext;
// the AxisOperation of which this is a running instance. The MEP of this
// AxisOperation must be one of the 8 predefined ones in WSDL 2.0.
private transient AxisOperation axisOperation;
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=357239&r1=357238&r2=357239&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:32:59 2005
@@ -201,7 +201,6 @@
private void addNewModule(ModuleDescription modulemetadata) throws AxisFault {
- // currentArchiveFile.setClassLoader();
Flow inflow = modulemetadata.getInFlow();
ClassLoader moduleClassLoader = modulemetadata.getModuleClassLoader();
@@ -514,7 +513,6 @@
HashMap wsdlservice = archiveReader.processWSDLs(currentArchiveFile,
this);
- // AxisService service = archiveReader.generateService(currentArchiveFile.getAbsolutePath());
AxisServiceGroup sericeGroup = new AxisServiceGroup(axisConfig);
sericeGroup.setServiceGroupClassLoader(
@@ -629,9 +627,6 @@
* are exist , or they have deployed
*/
private void engageModules() throws AxisFault {
-
- // ArrayList modules = DeploymentData.getInstance().getModuleRefs();
- // PhaseResolver resolver = new PhaseResolver(axisConfig);
for (Iterator iterator = modulelist.iterator(); iterator.hasNext();) {
QName name = (QName) iterator.next();
@@ -773,7 +768,6 @@
serviceName = getAxisServiceName(wsInfo.getFileName());
// todo fix me deepal
- // axisConfig.removeService(new QName(serviceName));
log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
wsInfo.getFileName()));
}
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=357239&r1=357238&r2=357239&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 Fri Dec 16 13:32:59 2005
@@ -52,8 +52,6 @@
protected Log log = LogFactory.getLog(getClass());
protected AxisConfiguration axisConfig;
-// protected DeploymentEngine engine;
-
protected InputStream des_inputStream;
public DescriptionBuilder() {
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=357239&r1=357238&r2=357239&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:32:59 2005
@@ -178,7 +178,6 @@
String opname = op_name_att.getAttributeValue();
-// AxisOperation op_descrip = new AxisOperation();
op_descrip.setName(new QName(opname));
// Operation Parameters
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=357239&r1=357238&r2=357239&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:32:59 2005
@@ -223,10 +223,7 @@
if (op_mep_att != null) {
mepurl = op_mep_att.getAttributeValue();
-
- // todo value has to be validate
- // todo
- // op_descrip.setMessageExchangePattern(mep);
+ // todo value has to be validated
}
String opname = op_name_att.getAttributeValue();
@@ -240,7 +237,6 @@
op_descrip = AxisOperationFactory.getOperetionDescription(mepurl);
}
-// op_descrip = new AxisOperation();
op_descrip.setName(new QName(opname));
log.info(Messages.getMessage(DeploymentErrorMsgs.OP_NOT_FOUN_IN_WSDL, opname));
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=357239&r1=357238&r2=357239&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 Fri Dec 16 13:32:59 2005
@@ -105,8 +105,6 @@
public void init() {
wsInfoList.init();
checkModules();
-
-// checkServices();
deEngine.doDeploy();
}
@@ -141,9 +139,7 @@
/**
* this is the actual method that is call from scheduler
*/
- public void startListent() {
-
- // checkModules();
+ public void startListener() {
checkServices();
update();
}
@@ -154,81 +150,4 @@
public void update() {
wsInfoList.update();
}
-
-// private void searchExplodedDir(String rootDirName){
-// File rootDir = new File(rootDirName);
-// File [] fileList = rootDir.listFiles();
-// if (fileList !=null) {
-// for (int i = 0; i < fileList.length; i++) {
-// File file = fileList[i];
-// if(file.isDirectory()){
-// wsInfoList.addWSInfoItem(file, SERVICE);
-// }
-// }
-// }
-// }
-
- /**
- * To delete a given directory with its all childerns
- * @param dir
- * @return boolean
- */
-// private boolean deleteDir(File dir) {
-// if (dir.isDirectory()) {
-// String[] children = dir.list();
-// for (int i=0; i<children.length; i++) {
-// boolean success = deleteDir(new File(dir, children[i]));
-// if (!success) {
-// return false;
-// }
-// }
-// }
-// // The directory is now empty so delete it
-// return dir.delete();
-// }
-
- /**
- * Will extarct given file , into same dirctory with the name of archive file (removing file
- * extension)
- * @param infile <code>java.io.File</code> Archive file
- * @param outdirctory <code>java.io.File</code> output file
- */
-// public void extarctServiceArchive(File infile , File outdirctory ) {
-// try{
-// BufferedOutputStream dest;
-// FileInputStream fis = new FileInputStream(infile);
-// ZipInputStream zis = new
-// ZipInputStream(new BufferedInputStream(fis));
-// ZipEntry entry;
-//
-// outdirctory.mkdir();
-// File outFile ;
-// String outPath = outdirctory.getAbsolutePath() + "/";
-// while((entry = zis.getNextEntry()) != null) {
-// int count;
-// byte data[] = new byte[BUFFER];
-// // write the files to the disk
-// outFile = new File(outPath + entry.getName());
-// if(entry.isDirectory()){
-// if(!outFile.exists()){
-// outFile.mkdir();
-// }
-// continue;
-// }
-// FileOutputStream fos = new
-// FileOutputStream(outFile);
-// dest = new
-// BufferedOutputStream(fos, BUFFER);
-// while ((count = zis.read(data, 0, BUFFER))
-// != -1) {
-// dest.write(data, 0, count);
-// }
-// dest.flush();
-// dest.close();
-// }
-// zis.close();
-// } catch(Exception e) {
-// log.error(e);
-// }
-// }
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java Fri Dec 16 13:32:59 2005
@@ -37,7 +37,6 @@
private ClassLoader classLoader;
private String messgeReceiver;
-// private String moduleClass;
private String name;
private int type;
@@ -108,7 +107,6 @@
public void setClassLoader(boolean extractArichive, ClassLoader parent) throws AxisFault {
if (!extractArichive) {
- // has to be craeted taking that file to the account
if (file != null) {
URL[] urlsToLoadFrom;
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=357239&r1=357238&r2=357239&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 Fri Dec 16 13:32:59 2005
@@ -94,15 +94,11 @@
serviceList.add(service);
return serviceList;
-
-// engine.getCurrentFileItem().getDeploybleServices().add(axisService);
} else if (SERVICE_GROUP_ELEMENT.equals(rootelementName)) {
ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(services, wsdlServices,
axisConfig);
-
return groupBuilder.populateServiceGroup(axisServiceGroup);
}
-
return null;
}
@@ -220,8 +216,6 @@
return buildServiceGroup(zin, engine, axisServiceGroup, wsdls, axisConfig);
}
}
-
- // zin.close();
throw new DeploymentException(
Messages.getMessage(DeploymentErrorMsgs.SERVICE_XML_NOT_FOUND, filename));
} catch (Exception e) {
@@ -260,14 +254,6 @@
new AxisDescWSDLComponentFactory());
WSDLDescription womDescription = wsdlVersionWrapper.getDescription();
- // removing binding
- // Map bindings = wsdlVersionWrapper.getDefinition().getBindings();
- // Iterator binfingIterator = bindings.keySet().iterator();
- // while (binfingIterator.hasNext()) {
- // Object o = binfingIterator.next();
- // bindings.remove(o) ;
- //
- // }
Iterator iterator = womDescription.getServices().keySet().iterator();
if (iterator.hasNext()) {
@@ -282,8 +268,6 @@
service.setWSDLDefinition(wsdlVersionWrapper.getDefinition());
return service;
-
-// depengine.getCurrentFileItem().addService(service);
}
} catch (WSDLException e) {
throw new DeploymentException(e);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Fri Dec 16 13:32:59 2005
@@ -31,7 +31,7 @@
* This is to store all the jar files in a specified folder (WEB_INF)
*/
private static List jarList = new ArrayList();
- private boolean compair = false; // to check wheter the checking is dond
+ private boolean check = false;
/**
* All the curently updated jars
@@ -65,19 +65,19 @@
public void addWSInfoItem(File file, int type) {
switch (type) {
case SERVICE : {
- if (!isFileExist(file.getName())) { // chacking whether the file is already deployed
+ if (!isFileExist(file.getName())) { // checking whether the file is already deployed
WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), SERVICE);
jarList.add(wsInfo);
ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE);
- deployer.addWSToDeploy(archiveFileData); // to inform that new web service is deployed
+ deployer.addWSToDeploy(archiveFileData); // inform that new web service is deployed
} else {
if (deployer.isHotUpdate()) {
WSInfo tempWSInfo = getFileItem(file.getName());
- if (isModified(file, tempWSInfo)) { // caheck whether file is updated
+ if (isModified(file, tempWSInfo)) { // check whether file is updated
tempWSInfo.setLastModifiedDate(file.lastModified());
WSInfo wsInfo = new WSInfo(tempWSInfo.getFileName(),
@@ -96,30 +96,15 @@
}
case MODULE : {
- if (!isFileExist(file.getName())) { // chacking whether the file is already deployed
+ if (!isFileExist(file.getName())) { // checking whether the file is already deployed
WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), MODULE);
jarList.add(wsInfo);
ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE);
- deployer.addWSToDeploy(archiveFileData); // to inform that new web service is deployed
- } else {
-
-// if (deployer.isHotUpdate()) {
-// WSInfo tempWSInfo = getFileItem(file.getName());
-// if (isModified(file, tempWSInfo)) {
-// tempWSInfo.setLastModifiedDate(file.lastModified());
-// WSInfo wsInfo = new WSInfo(tempWSInfo.getFileName(),
-// tempWSInfo.getLastModifiedDate(),
-// MODULE);
-// deployer.addWSToUndeploy(wsInfo); // add entry to undeploy list
-// ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE);
-// deployer.addWSToDeploy(archiveFileData); // add entry to deploylist
-//
-// }
-// }
- }
+ deployer.addWSToDeploy(archiveFileData); // inform that new web service is deployed
+ }
break;
}
@@ -128,7 +113,7 @@
String jarname = file.getName();
currentJars.add(jarname);
- compair = true;
+ check = true;
}
/**
@@ -138,11 +123,11 @@
* list then it is assumed that the jar file has been removed
* that is hot undeployment
*/
- public void checkForUndeploye() {
- if (!compair) {
+ public void checkForUndeployedServices() {
+ if (!check) {
return;
} else {
- compair = false;
+ check = false;
}
Iterator iter = jarList.listIterator();
@@ -178,7 +163,7 @@
WSInfo wsInfo = new WSInfo(fileitem.getFileName(), fileitem.getLastModifiedDate());
- deployer.addWSToUndeploy(wsInfo); // this is to be undeploye
+ deployer.addWSToUndeploy(wsInfo); // this is to be undeployed
}
}
@@ -204,7 +189,7 @@
*/
public void update() {
synchronized (deployer) {
- checkForUndeploye();
+ checkForUndeployedServices();
if (deployer.isHotUpdate()) {
deployer.unDeploy();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/SchedulerTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/SchedulerTask.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/SchedulerTask.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/SchedulerTask.java Fri Dec 16 13:32:59 2005
@@ -59,7 +59,7 @@
}
private void checkRepositary() {
- ((RepositoryListenerImpl) wsListener).startListent();
+ ((RepositoryListenerImpl) wsListener).startListener();
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java Fri Dec 16 13:32:59 2005
@@ -190,7 +190,6 @@
if (PhaseMetadata.PHASE_POLICY_DETERMINATION.equals(phaseName)
|| PhaseMetadata.PHASE_MESSAGE_OUT.equals(phaseName)) {
-
// todo pls check this
} else {
oprationOUTPhases.add(copyPhase(phase));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java Fri Dec 16 13:32:59 2005
@@ -82,7 +82,7 @@
urls.add(file.toURL());
- // if lib is simple
+ // lower case directory name
File libfiles = new File(file, "lib");
if (libfiles.exists()) {
@@ -99,7 +99,7 @@
}
}
- // if lib is capital
+ // upper case directory name
libfiles = new File(file, "Lib");
if (libfiles.exists()) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java Fri Dec 16 13:32:59 2005
@@ -89,8 +89,6 @@
}
public WSDLOperation createOperation() {
-
-// return new AxisOperation(); // by Deepal
return new WSDLOperationImpl();
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java Fri Dec 16 13:32:59 2005
@@ -48,7 +48,6 @@
private QName name;
private ParameterInclude parameterInclude;
- // private WSDLOperationImpl wsdloperation;
private AxisService parent;
private ArrayList wsamappingList;
@@ -138,8 +137,6 @@
+ " module has alredy engaged to the operation"
+ " operation terminated !!!");
needToadd = false;
-
- // return;
}
}
@@ -170,7 +167,6 @@
} else {
// So this message is part of an ongoing MEP
- // operationContext =
ConfigurationContext configContext = msgContext.getConfigurationContext();
operationContext =
@@ -213,13 +209,12 @@
if (null == msgContext.getRelatesTo()) {
- // Its a new incomming message so get the factory to create a new
+ // Its a new incoming message so get the factory to create a new
// one
operationContext = new OperationContext(this, serviceContext);
} else {
// So this message is part of an ongoing MEP
- // operationContext =
ConfigurationContext configContext = msgContext.getConfigurationContext();
operationContext =
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Fri Dec 16 13:32:59 2005
@@ -51,7 +51,6 @@
private Log log = LogFactory.getLog(getClass());
private String fileName = "";
-// private WSDLService serviceimpl = null;
private HashMap operationsAliasesMap = null;
private HashMap operations = new HashMap();
@@ -244,8 +243,6 @@
+ " module has alredy been engaged on the service. "
+ " Operation terminated !!!");
needToadd = false;
-
- // return;
}
}
@@ -439,8 +436,6 @@
operation = (AxisOperation) operationsAliasesMap.get(soapAction);
return operation;
-
- // todo do we need to improve thise ?
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java Fri Dec 16 13:32:59 2005
@@ -140,8 +140,6 @@
+ " module has alredy been engaged on the service Group. "
+ " Operation terminated !!!");
needToadd = false;
-
- // return;
}
}
@@ -151,7 +149,7 @@
if (module != null) {
while (srevice.hasNext()) {
- // engagin per each service
+ // engaging each service
AxisService axisService = (AxisService) srevice.next();
try {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/InOnlyAxisOperation.java Fri Dec 16 13:32:59 2005
@@ -18,7 +18,7 @@
private AxisMessage inMessage;
private AxisMessage outFaultMessage;
- // this is just to stor the chain , there wont be any usage of this
+ // this is just to store the chain , we don't use it
private ArrayList outPhase;
public InOnlyAxisOperation() {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterInclude.java Fri Dec 16 13:32:59 2005
@@ -27,8 +27,6 @@
*/
public interface ParameterInclude {
- // parameters
-
/**
* Method addParameter
*
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=357239&r1=357238&r2=357239&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:32:59 2005
@@ -82,7 +82,7 @@
parameter.setName(paraName.getAttributeValue());
- // setting parameter Value (the chiled elemnt of the parameter)
+ // setting parameter Value (the chiled element of the parameter)
OMElement paraValue = parameterElement.getFirstElement();
if (paraValue != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PhaseRule.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PhaseRule.java?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PhaseRule.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/PhaseRule.java Fri Dec 16 13:32:59 2005
@@ -22,14 +22,10 @@
*/
public class PhaseRule {
- // can be either name of phase or handler
-
/**
* Field after
*/
private String after;
-
- // can be either name of phase or handler
/**
* Field before
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=357239&r1=357238&r2=357239&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:32:59 2005
@@ -81,24 +81,10 @@
private ArrayList inPhasesUptoAndIncludingPostDispatch;
protected HashMap messagReceivers;
- // ///////////////////// From AxisGlobal /////////////////////////////////////
-
private ClassLoader moduleClassLoader;
private HashMap moduleConfigmap;
private ArrayList outFaultPhases;
-
- /**
- * Field phases
- */
-
- // private ArrayList inPhases;
private ArrayList outPhases;
-
- // ///////////////////// From AxisGlobal /////////////////////////////////////
-
- /**
- * Field paramInclude
- */
protected final ParameterInclude paramInclude;
protected PhasesInfo phasesinfo;
private ClassLoader serviceClassLoader;
@@ -130,7 +116,6 @@
createDefaultChain();
}
- // //////////////////////// Form Axis Global
public void addMessageReceiver(String key, MessageReceiver messageReceiver) {
messagReceivers.put(key, messageReceiver);
}
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=357239&r1=357238&r2=357239&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:32:59 2005
@@ -64,7 +64,7 @@
private void checkMustUnderstand(MessageContext msgContext) throws AxisFault {
- // todo : need to move this to pre-condiftion of the MessageReciver-Phase
+ // todo : need to move this to pre-condition of the MessageReceiver Phase
SOAPEnvelope se = msgContext.getEnvelope();
if (se.getHeader() == null) {
@@ -166,9 +166,6 @@
envelope = OMAbstractFactory.getSOAP12Factory().getDefaultFaultEnvelope();
}
- // TODO do we need to set old Headers back?
- // body.addFault(new AxisFault(e.getMessage(), e));
- // body.getFault().setException(new AxisFault(e));
extractFaultInformationFromMessageContext(processingContext, envelope.getBody().getFault(),
e);
faultContext.setEnvelope(envelope);
Modified: webservices/axis2/trunk/java/modules/core/webapp/listService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/listService.jsp?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/listService.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/listService.jsp Fri Dec 16 13:32:59 2005
@@ -128,7 +128,6 @@
<%
}
}
- // request.getSession().removeAttribute(Constants.SERVICE_MAP);
status = true;
}if(!status){
%> There seems to be no services listed! Try hitting refresh <%
Modified: webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp Fri Dec 16 13:32:59 2005
@@ -86,7 +86,6 @@
<%
}
}
- // request.getSession().removeAttribute(Constants.SERVICE_MAP);
status = true;
}if(!status){
%> There seems to be no services listed! Try hitting refresh <%
Modified: webservices/axis2/trunk/java/modules/core/webapp/upload.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/upload.jsp?rev=357239&r1=357238&r2=357239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/upload.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/upload.jsp Fri Dec 16 13:32:59 2005
@@ -72,7 +72,6 @@
String fileName = item.getName();
String fileExtesion =fileName;
fileExtesion =fileExtesion.toLowerCase();
-// fileName = fileName.toLowerCase();
if (!(fileExtesion.endsWith(".jar")||fileExtesion.endsWith(".aar"))){
throw new Exception(" Wrong file type! ");
}