Author: veithen
Date: Thu Apr 14 21:24:28 2016
New Revision: 1739200
URL: http://svn.apache.org/viewvc?rev=1739200&view=rev
Log:
AXIS2-5747: Merge r1735795 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/deployment/repository/
- copied from r1735795,
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/deployment/repository/
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/kernel/pom.xml
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
axis/axis2/java/core/branches/1_7/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 14 21:24:28 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,1736512,1736543,1737030,1737567,1739001
+/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
Modified: axis/axis2/java/core/branches/1_7/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/pom.xml?rev=1739200&r1=1739199&r2=1739200&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/kernel/pom.xml Thu Apr 14
21:24:28 2016
@@ -96,10 +96,20 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>
Modified:
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java?rev=1739200&r1=1739199&r2=1739200&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
Thu Apr 14 21:24:28 2016
@@ -82,7 +82,12 @@ public class DeploymentFileData {
* @return the name of the referenced file
*/
public String getName() {
- return file.getName(); // No need to check for null due to constructor
check
+ if (file != null) {
+ return file.getName();
+ } else {
+ String path = url.getPath();
+ return path.substring(path.lastIndexOf('/') + 1);
+ }
}
Modified: axis/axis2/java/core/branches/1_7/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/pom.xml?rev=1739200&r1=1739199&r2=1739200&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Thu Apr 14 21:24:28 2016
@@ -728,11 +728,21 @@
<version>${axiom.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <version>0.28</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>xml-truth</artifactId>
<version>${axiom.version}</version>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
<version>${xmlschema.version}</version>
