Author: veithen
Date: Sat Jun 4 18:50:20 2016
New Revision: 1746847
URL: http://svn.apache.org/viewvc?rev=1746847&view=rev
Log:
Merge r1739493 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/utility/SimpleServer.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 18:50:20 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,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109
+/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,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109
Modified: axis/axis2/java/core/branches/1_7/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/pom.xml?rev=1746847&r1=1746846&r2=1746847&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/jaxws-integration/pom.xml
(original)
+++ axis/axis2/java/core/branches/1_7/modules/jaxws-integration/pom.xml Sat Jun
4 18:50:20 2016
@@ -1386,10 +1386,6 @@
<value>0</value>
</property>
<property>
- <name>build.repository</name>
- <value>${project.build.directory}/repo</value>
- </property>
- <property>
<name>javax.xml.soap.MessageFactory</name>
<value>org.apache.axis2.saaj.MessageFactoryImpl</value>
</property>
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/utility/SimpleServer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/utility/SimpleServer.java?rev=1746847&r1=1746846&r2=1746847&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/utility/SimpleServer.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/utility/SimpleServer.java
Sat Jun 4 18:50:20 2016
@@ -31,8 +31,8 @@ import org.apache.log4j.BasicConfigurato
public class SimpleServer {
private static SimpleHTTPServer server;
- private String repositoryDir = System.getProperty("build.repository","");
- private String axis2xml = System.getProperty("axis2.config");
+ private String repositoryDir = "target/repo";
+ private String axis2xml = null;
private int port = 6060;
public SimpleServer() {}
