svn commit: r1806088 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java

[veithen]

Author: veithen
Date: Thu Aug 24 21:21:59 2017
New Revision: 1806088

URL: http://svn.apache.org/viewvc?rev=1806088&view=rev
Log:
AXIS2-5871: Use the DeploymentFileData.getName() method to compute the archive 
name in ServiceDeployer.

Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=1806088&r1=1806087&r2=1806088&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
 Thu Aug 24 21:21:59 2017
@@ -246,17 +246,10 @@ public class ServiceDeployer extends Abs
         }
         AxisServiceGroup serviceGroup = new AxisServiceGroup();
         StringWriter errorWriter = new StringWriter();
-        int index = servicesURL.getPath().lastIndexOf(File.separator);
-         String serviceFile;
-         if(index > 0){
-             serviceFile = servicesURL.getPath().substring(index);
-         } else {
-             serviceFile = servicesURL.getPath();
-         }
          ArrayList<AxisService> servicelist =
          populateService(serviceGroup,
          servicesURL,
-         serviceFile.substring(0, serviceFile.indexOf(".aar")));
+         DescriptionBuilder.getShortFileName(deploymentFileData.getName()));
          try {
             DeploymentEngine.addServiceGroup(serviceGroup, servicelist, 
servicesURL, null,
              axisConfig);