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 az...@apache.org on 2007/03/29 13:48:10 UTC
svn commit: r523677 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Author: azeez
Date: Thu Mar 29 04:48:08 2007
New Revision: 523677
URL: http://svn.apache.org/viewvc?view=rev&rev=523677
Log:
Add a / to the repo URL, if it is not specified
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=523677&r1=523676&r2=523677
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Thu Mar 29 04:48:08 2007
@@ -28,12 +28,10 @@
import org.apache.axis2.deployment.scheduler.SchedulerTask;
import org.apache.axis2.deployment.util.Utils;
import org.apache.axis2.description.*;
-import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.util.JavaUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -162,28 +160,34 @@
try {
String path = servicesPath == null ? DeploymentConstants.SERVICE_PATH : servicesPath;
if (!path.endsWith("/")) {
- path = path + "/";
+ path += "/";
+ }
+ String repoPath = repoURL.getPath();
+ if (!repoPath.endsWith("/")) {
+ repoPath += "/";
+ repoURL = new URL(repoURL.getProtocol() + "://" + repoPath);
}
URL servicesDir = new URL(repoURL, path);
URL filelisturl = new URL(servicesDir, "services.list");
ArrayList files = getFileList(filelisturl);
- Iterator fileIterator = files.iterator();
- while (fileIterator.hasNext()) {
+
+ for (Iterator fileIterator = files.iterator();
+ fileIterator.hasNext();) {
String fileUrl = (String) fileIterator.next();
if (fileUrl.endsWith(".aar")) {
AxisServiceGroup serviceGroup = new AxisServiceGroup();
URL servicesURL = new URL(servicesDir, fileUrl);
- ArrayList servicelist = populateService(serviceGroup,
- servicesURL,
- fileUrl.substring(0, fileUrl.indexOf(
- ".aar")));
+ ArrayList servicelist =
+ populateService(serviceGroup,
+ servicesURL,
+ fileUrl.substring(0, fileUrl.indexOf(".aar")));
addServiceGroup(serviceGroup, servicelist, servicesURL, null, axisConfig);
}
}
} catch (MalformedURLException e) {
- log.info(e.getMessage());
+ log.error(e.getMessage());
} catch (IOException e) {
- log.info(e.getMessage());
+ log.error(e.getMessage());
}
}
@@ -193,6 +197,11 @@
if (!path.endsWith("/")) {
path = path + "/";
}
+ String repoPath = repoURL.getPath();
+ if (!repoPath.endsWith("/")) {
+ repoPath += "/";
+ repoURL = new URL(repoURL.getProtocol() + "://" + repoPath);
+ }
URL moduleDir = new URL(repoURL, path);
URL filelisturl = new URL(moduleDir, "modules.list");
ArrayList files = getFileList(filelisturl);
@@ -418,8 +427,7 @@
ArrayList serviceList,
URL serviceLocation,
DeploymentFileData currentDeploymentFile,
- AxisConfiguration axisConfiguration)
- throws AxisFault {
+ AxisConfiguration axisConfiguration) throws AxisFault {
fillServiceGroup(serviceGroup, serviceList, serviceLocation, axisConfiguration);
axisConfiguration.addServiceGroup(serviceGroup);
if (currentDeploymentFile != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org