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 2006/10/26 23:28:58 UTC
svn commit: r468144 -
/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Author: dims
Date: Thu Oct 26 14:28:57 2006
New Revision: 468144
URL: http://svn.apache.org/viewvc?view=rev&rev=468144
Log:
get weblogic 9.2 working in the normal (unexpanded) mode, just drop the war and you are done. basically the items listed in the services.list and modules.list is loaded as we can't really access the file system
Modified:
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=468144&r1=468143&r2=468144
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Thu Oct 26 14:28:57 2006
@@ -132,13 +132,16 @@
public void loadServicesFromUrl(URL repoURL) {
try {
- URL servicesDir = new URL(repoURL, servicesPath == null ? DeploymentConstants.SERVICE_PATH : servicesPath);
+ String path = servicesPath == null ? DeploymentConstants.SERVICE_PATH : servicesPath;
+ if(!path.endsWith("/")) {
+ path = path + "/";
+ }
+ URL servicesDir = new URL(repoURL, path);
URL filelisturl = new URL(servicesDir, "services.list");
ArrayList files = getFileList(filelisturl);
Iterator fileIterator = files.iterator();
while (fileIterator.hasNext()) {
String fileUrl = (String) fileIterator.next();
- fileUrl = fileUrl.trim();
if (fileUrl.endsWith(".aar")) {
AxisServiceGroup serviceGroup = new AxisServiceGroup();
URL servicesURL = new URL(servicesDir, fileUrl);
@@ -157,13 +160,16 @@
public void loadRepositoryFromURL(URL repoURL) throws DeploymentException {
try {
- URL moduleDir = new URL(repoURL, modulesPath == null ? DeploymentConstants.MODULE_PATH : modulesPath);
+ String path = modulesPath == null ? DeploymentConstants.MODULE_PATH : modulesPath;
+ if(!path.endsWith("/")) {
+ path = path + "/";
+ }
+ URL moduleDir = new URL(repoURL, path);
URL filelisturl = new URL(moduleDir, "modules.list");
ArrayList files = getFileList(filelisturl);
Iterator fileIterator = files.iterator();
while (fileIterator.hasNext()) {
String fileUrl = (String) fileIterator.next();
- fileUrl = fileUrl.trim();
if (fileUrl.endsWith(".mar")) {
URL moduleurl = new URL(moduleDir, fileUrl);
DeploymentClassLoader deploymentClassLoader =
@@ -181,6 +187,9 @@
addNewModule(module);
}
}
+ org.apache.axis2.util.Utils.calculateDefaultModuleVersion(
+ axisConfig.getModules(), axisConfig);
+ validateSystemPredefinedPhases();
} catch (MalformedURLException e) {
throw new DeploymentException(e);
} catch (IOException e) {
@@ -900,7 +909,10 @@
input = new BufferedReader(new InputStreamReader(in));
String line;
while ((line = input.readLine()) != null) {
- fileList.add(line);
+ line = line.trim();
+ if(line.length() > 0) {
+ fileList.add(line);
+ }
}
} catch (IOException ex) {
ex.printStackTrace();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org