Author: veithen
Date: Sun Oct 16 13:11:31 2016
New Revision: 1765150
URL: http://svn.apache.org/viewvc?rev=1765150&view=rev
Log:
AXIS2-5816: Merge r1765132 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 16 13:11:31 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,1747601,1747773,1747920,1751057,1752039
+/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,1747773,1747920,1751057,1752039,1765132
Modified:
axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1765150&r1=1765149&r2=1765150&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml
Sun Oct 16 13:11:31 2016
@@ -215,10 +215,15 @@
<outputDirectory>webapp</outputDirectory>
<unpackOptions>
<includes>
- <include>WEB-INF/classes/**/*</include>
- <include>WEB-INF/web.xml</include>
+ <include>WEB-INF/**/*</include>
<include>axis2-web/**/*</include>
</includes>
+ <excludes>
+ <exclude>WEB-INF/conf/**/*</exclude>
+ <exclude>WEB-INF/lib/**/*</exclude>
+ <exclude>WEB-INF/services/**/*</exclude>
+ <exclude>WEB-INF/modules/**/*</exclude>
+ </excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
