Author: veithen
Date: Sat Aug 26 16:05:44 2017
New Revision: 1806313
URL: http://svn.apache.org/viewvc?rev=1806313&view=rev
Log:
AXIS2-5793: Merge r1806309 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/jaxbri/pom.xml
axis/axis2/java/core/branches/1_7/modules/jibx/pom.xml
axis/axis2/java/core/branches/1_7/modules/json/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 26 16:05:44 2017
@@ -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,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,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,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806292,1806303-1806305
+/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,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,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,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806292,1806303-1806305,1806309
Modified: axis/axis2/java/core/branches/1_7/modules/jaxbri/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxbri/pom.xml?rev=1806313&r1=1806312&r2=1806313&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/jaxbri/pom.xml Sat Aug 26
16:05:44 2017
@@ -148,31 +148,31 @@
<tasks unless="maven.test.skip">
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-d jaxbri -ss -ssi -sd -o
${project.build.directory}/gen/Test01 -u -uri src/test/wsdl/Test01.wsdl" />
+ <arg line="-d jaxbri -ss -ssi -sd -o
'${project.build.directory}/gen/Test01' -u -uri src/test/wsdl/Test01.wsdl" />
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-d jaxbri -o
${project.build.directory}/gen/Test01 -u -uri src/test/wsdl/Test01.wsdl" />
+ <arg line="-d jaxbri -o
'${project.build.directory}/gen/Test01' -u -uri src/test/wsdl/Test01.wsdl" />
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
- <arg line="-d jaxbri -ss -ssi -sd -o
${project.build.directory}/gen/processor -u -uri src/test/wsdl/processor.wsdl
-ns2p
http://www.example.org/data=org.apache.axis2.jaxbri.processor.data,http://www.example.org/ws=org.apache.axis2.jaxbri.processor.service";
/>
+ <arg line="-d jaxbri -ss -ssi -sd -o
'${project.build.directory}/gen/processor' -u -uri src/test/wsdl/processor.wsdl
-ns2p
http://www.example.org/data=org.apache.axis2.jaxbri.processor.data,http://www.example.org/ws=org.apache.axis2.jaxbri.processor.service";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
- <arg line="-d jaxbri -o
${project.build.directory}/gen/processor -u -uri src/test/wsdl/processor.wsdl
-ns2p
http://www.example.org/data=org.apache.axis2.jaxbri.processor.data,http://www.example.org/ws=org.apache.axis2.jaxbri.processor.client";
/>
+ <arg line="-d jaxbri -o
'${project.build.directory}/gen/processor' -u -uri src/test/wsdl/processor.wsdl
-ns2p
http://www.example.org/data=org.apache.axis2.jaxbri.processor.data,http://www.example.org/ws=org.apache.axis2.jaxbri.processor.client";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
- <arg line="-d jaxbri -ss -ssi -sd -g -o
${project.build.directory}/gen/identityservice -u -uri
src/test/wsdl/identityService.wsdl -p org.apache.axis2.jaxbri.identityservice
-ns2p http://www.example.org/identity=org.apache.axis2.jaxbri.identityservice";
/>
+ <arg line="-d jaxbri -ss -ssi -sd -g -o
'${project.build.directory}/gen/identityservice' -u -uri
src/test/wsdl/identityService.wsdl -p org.apache.axis2.jaxbri.identityservice
-ns2p http://www.example.org/identity=org.apache.axis2.jaxbri.identityservice";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
- <arg line="-d jaxbri -ss -ssi -sd -g -o
${project.build.directory}/gen/mtom -u -uri src/test/wsdl/mtom.wsdl -p
org.apache.axis2.jaxbri.mtom -ns2p
http://www.example.org/mtom/=org.apache.axis2.jaxbri.mtom -EbindingFileName " />
+ <arg line="-d jaxbri -ss -ssi -sd -g -o
'${project.build.directory}/gen/mtom' -u -uri src/test/wsdl/mtom.wsdl -p
org.apache.axis2.jaxbri.mtom -ns2p
http://www.example.org/mtom/=org.apache.axis2.jaxbri.mtom -EbindingFileName " />
</java>
</tasks>
</configuration>
Modified: axis/axis2/java/core/branches/1_7/modules/jibx/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jibx/pom.xml?rev=1806313&r1=1806312&r2=1806313&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/jibx/pom.xml Sat Aug 26 16:05:44
2017
@@ -122,23 +122,23 @@
<tasks unless="maven.test.skip">
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl
-o ${project.build.directory}/gen/library-unwrapped -d jibx -uw -Ebindingfile
src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.client";
/>
+ <arg line="-uri src/test/wsdl/library.wsdl
-o '${project.build.directory}/gen/library-unwrapped' -d jibx -uw -Ebindingfile
src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.client";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl
-o ${project.build.directory}/gen/library-unwrapped -d jibx -ss -ssi -sd -uw
-Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.service";
/>
+ <arg line="-uri src/test/wsdl/library.wsdl
-o '${project.build.directory}/gen/library-unwrapped' -d jibx -ss -ssi -sd -uw
-Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.service";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl
-o ${project.build.directory}/gen/library-wrapped -d jibx -Ebindingfile
src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.client";
/>
+ <arg line="-uri src/test/wsdl/library.wsdl
-o '${project.build.directory}/gen/library-wrapped' -d jibx -Ebindingfile
src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.client";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri src/test/wsdl/library.wsdl
-o ${project.build.directory}/gen/library-wrapped -d jibx -ss -ssi -sd
-Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.service";
/>
+ <arg line="-uri src/test/wsdl/library.wsdl
-o '${project.build.directory}/gen/library-wrapped' -d jibx -ss -ssi -sd
-Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.service";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-uri
src/test/wsdl/customer-echo.wsdl -o
${project.build.directory}/gen/customer-echo -d jibx -Ebindingfile
src/test/binding/customer-binding.xml --noBuildXML -ns2p
http://ws.apache.org/axis2/jibx/customer/wsdl=org.apache.axis2.jibx.customer"; />
+ <arg line="-uri
src/test/wsdl/customer-echo.wsdl -o
'${project.build.directory}/gen/customer-echo' -d jibx -Ebindingfile
src/test/binding/customer-binding.xml --noBuildXML -ns2p
http://ws.apache.org/axis2/jibx/customer/wsdl=org.apache.axis2.jibx.customer"; />
</java>
</tasks>
</configuration>
Modified: axis/axis2/java/core/branches/1_7/modules/json/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/json/pom.xml?rev=1806313&r1=1806312&r2=1806313&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/json/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/json/pom.xml Sat Aug 26 16:05:44
2017
@@ -124,7 +124,7 @@
<tasks unless="maven.test.skip">
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.test.classpath" />
- <arg line="-ss -sd -u -or -o
${project.build.directory}/gen -uri test-wsdl/LibraryService.wsdl" />
+ <arg line="-ss -sd -u -or -o
'${project.build.directory}/gen' -uri test-wsdl/LibraryService.wsdl" />
</java>
<delete
file="${project.build.directory}/gen/src/org/apache/axis2/json/adb/LibraryServiceSkeleton.java"
/>
</tasks>
