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 az...@apache.org on 2006/07/19 13:42:13 UTC
svn commit: r423441 -
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Author: azeez
Date: Wed Jul 19 04:42:12 2006
New Revision: 423441
URL: http://svn.apache.org/viewvc?rev=423441&view=rev
Log:
Changed ArrayList modulelist to List moduleList
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=423441&r1=423440&r2=423441&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 Wed Jul 19 04:42:12 2006
@@ -68,7 +68,7 @@
/**
* Stores the module specified in the server.xml at the document parsing time.
*/
- private ArrayList modulelist = new ArrayList();
+ private List moduleList = new ArrayList();
//to keep the web resource location if any
private String webLocationString = null;
@@ -130,7 +130,7 @@
engageModules();
} catch (AxisFault axisFault) {
log.info(Messages.getMessage(DeploymentErrorMsgs.MODULE_VALIDATION_FAILED,
- axisFault.getMessage()));
+ axisFault.getMessage()));
throw new DeploymentException(axisFault);
}
}
@@ -147,8 +147,8 @@
AxisServiceGroup serviceGroup = new AxisServiceGroup();
URL servicesURL = new URL(servicesDir, "services/" + fileUrl);
ArrayList servicelist = populateService(serviceGroup,
- servicesURL,
- fileUrl.substring(0, fileUrl.indexOf(".aar")));
+ servicesURL,
+ fileUrl.substring(0, fileUrl.indexOf(".aar")));
addServiceGroup(serviceGroup, servicelist, servicesURL);
}
}
@@ -261,7 +261,7 @@
return serviceList;
} else if (TAG_SERVICE_GROUP.equals(elementName)) {
ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(rootElement, new HashMap(),
- axisConfig);
+ axisConfig);
ArrayList servicList = groupBuilder.populateServiceGroup(serviceGroup);
Iterator serviceIterator = servicList.iterator();
while (serviceIterator.hasNext()) {
@@ -318,7 +318,7 @@
* @param moduleName <code>QName</code>
*/
public void addModule(QName moduleName) {
- modulelist.add(moduleName);
+ moduleList.add(moduleName);
}
private void addNewModule(AxisModule modulemetadata) throws AxisFault {
@@ -383,8 +383,8 @@
if (Constants.SCOPE_TRANSPORT_SESSION.equals(scope)) {
if (!axisConfig.isManageTransportSession()) {
throw new DeploymentException("You can not deploy the service " +
- "in transport session , since transport session management" +
- " disabled in axis2.xml change manageTransportSession parameter value to true");
+ "in transport session , since transport session management" +
+ " disabled in axis2.xml change manageTransportSession parameter value to true");
}
}
axisService.setUseDefaultChains(false);
@@ -440,7 +440,7 @@
axisConfig.addServiceGroup(serviceGroup);
if (currentArchiveFile != null) {
addAsWebResources(currentArchiveFile.getFile(),
- serviceGroup.getServiceGroupName());
+ serviceGroup.getServiceGroupName());
}
}
@@ -464,7 +464,7 @@
if (zip.getName().toUpperCase().startsWith("WWW")) {
String fileName = zip.getName();
fileName = fileName.substring("WWW/".length(),
- fileName.length());
+ fileName.length());
if (zip.isDirectory()) {
new File(out, fileName).mkdirs();
} else {
@@ -521,7 +521,7 @@
currentArchiveFile.setClassLoader(false, config.getModuleClassLoader());
axismodule.setModuleClassLoader(currentArchiveFile.getClassLoader());
archiveReader.readModuleArchive(currentArchiveFile.getAbsolutePath(), this, axismodule,
- false, axisConfig);
+ false, axisConfig);
ClassLoader moduleClassLoader = axismodule.getModuleClassLoader();
Flow inflow = axismodule.getInFlow();
@@ -575,7 +575,7 @@
currentArchiveFile.setClassLoader(classLoader);
ServiceBuilder builder = new ServiceBuilder(serviceInputStream, axisConfig,
- axisService);
+ axisService);
builder.populateService(builder.buildOM());
} catch (AxisFault axisFault) {
@@ -599,7 +599,7 @@
switch (type) {
case TYPE_SERVICE :
currentArchiveFile.setClassLoader(explodedDir,
- axisConfig.getServiceClassLoader());
+ axisConfig.getServiceClassLoader());
archiveReader = new ArchiveReader();
String serviceStatus = "";
try {
@@ -624,20 +624,20 @@
axisConfig);
addServiceGroup(sericeGroup, serviceList, currentArchiveFile.getFile().toURL());
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_WS,
- currentArchiveFile.getName()));
+ currentArchiveFile.getName()));
} catch (DeploymentException de) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
- currentArchiveFile.getName(),
- de.getMessage()),
- de);
+ currentArchiveFile.getName(),
+ de.getMessage()),
+ de);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
de.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
} catch (AxisFault axisFault) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
- currentArchiveFile.getName(),
- axisFault.getMessage()),
- axisFault);
+ currentArchiveFile.getName(),
+ axisFault.getMessage()),
+ axisFault);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
axisFault.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
@@ -670,14 +670,14 @@
} finally {
if (serviceStatus.startsWith("Error:")) {
axisConfig.getFaultyServices().put(currentArchiveFile.getFile().getAbsolutePath(),
- serviceStatus);
+ serviceStatus);
}
currentArchiveFile = null;
}
break;
case TYPE_MODULE :
currentArchiveFile.setClassLoader(explodedDir,
- axisConfig.getModuleClassLoader());
+ axisConfig.getModuleClassLoader());
archiveReader = new ArchiveReader();
String moduleStatus = "";
try {
@@ -685,33 +685,33 @@
metaData.setModuleClassLoader(currentArchiveFile.getClassLoader());
metaData.setParent(axisConfig);
archiveReader.readModuleArchive(currentArchiveFile.getAbsolutePath(),
- this, metaData, explodedDir,
- axisConfig);
+ this, metaData, explodedDir,
+ axisConfig);
metaData.setFileName(currentArchiveFile.getFile().toURL());
addNewModule(metaData);
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
- metaData.getName().getLocalPart()));
+ metaData.getName().getLocalPart()));
} catch (DeploymentException e) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
- currentArchiveFile.getName(),
- e.getMessage()),
- e);
+ currentArchiveFile.getName(),
+ e.getMessage()),
+ e);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
} catch (AxisFault axisFault) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
- currentArchiveFile.getName(),
- axisFault.getMessage()),
- axisFault);
+ currentArchiveFile.getName(),
+ axisFault.getMessage()),
+ axisFault);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
axisFault.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
} catch (MalformedURLException e) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
- currentArchiveFile.getName(),
- e.getMessage()),
- e);
+ currentArchiveFile.getName(),
+ e.getMessage()),
+ e);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
@@ -726,8 +726,8 @@
}
} catch (AxisFault axisFault) {
log.info(Messages.getMessage(DeploymentErrorMsgs.ERROR_SETTING_CLIENT_HOME,
- axisFault.getMessage()),
- axisFault);
+ axisFault.getMessage()),
+ axisFault);
}
}
}
@@ -739,7 +739,7 @@
* Checks if the modules, referred by server.xml, exist or that they are deployed.
*/
public void engageModules() throws AxisFault {
- for (Iterator iterator = modulelist.iterator(); iterator.hasNext();) {
+ for (Iterator iterator = moduleList.iterator(); iterator.hasNext();) {
QName name = (QName) iterator.next();
axisConfig.engageModule(name);
}
@@ -798,7 +798,7 @@
fileName = getAxisServiceName(wsInfo.getFileName());
axisConfig.removeServiceGroup(fileName);
log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
- wsInfo.getFileName()));
+ wsInfo.getFileName()));
}
}
}
@@ -910,7 +910,7 @@
if (modules.exists()) {
axisConfig.setModuleClassLoader(Utils.getClassLoader(axisConfig.getSystemClassLoader(),
- modules));
+ modules));
} else {
axisConfig.setModuleClassLoader(axisConfig.getSystemClassLoader());
}
@@ -1010,7 +1010,7 @@
this.webLocationString = webLocationString;
}
- public ArrayList getModulelist() {
- return modulelist;
+ public List getModuleList() {
+ return moduleList;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org