svn commit: r1747645 - in /axis/axis2/java/core/branches/1_7: ./ modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java

[veithen]

Author: veithen
Date: Fri Jun 10 06:58:16 2016
New Revision: 1747645

URL: http://svn.apache.org/viewvc?rev=1747645&view=rev
Log:
AXIS2-5778: Merge r1747601 to the 1.7 branch.

Modified:
    axis/axis2/java/core/branches/1_7/   (props changed)
    
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java

Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 10 06:58:16 2016
@@ -1,4 +1,4 @@
 /axis/axis2/java/core/branches/1_6:1295540
 /axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
 
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601

Modified: 
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?rev=1747645&r1=1747644&r2=1747645&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
 (original)
+++ 
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
 Fri Jun 10 06:58:16 2016
@@ -204,14 +204,7 @@ public class ModuleDeployer extends Abst
             AxisModule module = new AxisModule();
             module.setModuleClassLoader(deploymentClassLoader);
             module.setParent(axisConfig);
-            int index = fileUrl.getPath().lastIndexOf(File.separator);
-            String moduleFile;
-            if(index > 0){
-                moduleFile = fileUrl.getPath().substring(index);               
 
-            } else {
-                moduleFile = fileUrl.getPath();                
-            }            
-            module.setArchiveName(moduleFile);
+            module.setArchiveName(deploymentFileData.getName());
             populateModule(module, fileUrl);
             module.setFileName(fileUrl);
             DeploymentEngine.addNewModule(module, axisConfig);