You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2018/12/12 20:20:56 UTC
svn commit: r1848791 - in /axis/axis2/java/core/branches/1_7: ./
code-coverage/ modules/fastinfoset/ modules/integration/
modules/jaxws-integration/ modules/jaxws/
modules/kernel/test/org/apache/axis2/engine/ modules/metadata/
modules/saaj/ modules/tra...
Author: veithen
Date: Wed Dec 12 20:20:55 2018
New Revision: 1848791
URL: http://svn.apache.org/viewvc?rev=1848791&view=rev
Log:
Merge r1821809 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/code-coverage/
- copied from r1821809, axis/axis2/java/core/trunk/code-coverage/
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/code-coverage/pom.xml
axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/1_7/modules/integration/pom.xml
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/1_7/modules/jaxws/pom.xml
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
axis/axis2/java/core/branches/1_7/modules/metadata/pom.xml
axis/axis2/java/core/branches/1_7/modules/saaj/pom.xml
axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml
axis/axis2/java/core/branches/1_7/modules/transport/mail/pom.xml
axis/axis2/java/core/branches/1_7/pom.xml (contents, props changed)
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 12 20:20:55 2018
@@ -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,1733225,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,1780684,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1
799068,1800495,1803414,1805563,1806088,1806288,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350,1806577,1806581,1806719,1807643,1807837,1807941,1807943,1808789,1809384-1809385,1809411,1809504,1809507,1809514,1809517,1810596,1810600,1810603,1815035,1815137,1815139,1817866,1817872,1819265,1820601,1821801,1823604,1823614,1823712,1826036,1831475,1831477,1831917,1832205,1835900,1836506,1837506-1837507,1837540,1838336,1843339,1843344,1848535,1848643-1848644,1848708,1848721
+/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,1733225,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,1780684,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1
799068,1800495,1803414,1805563,1806088,1806288,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350,1806577,1806581,1806719,1807643,1807837,1807941,1807943,1808789,1809384-1809385,1809411,1809504,1809507,1809514,1809517,1810596,1810600,1810603,1815035,1815137,1815139,1817866,1817872,1819265,1820601,1821801,1821809,1823604,1823614,1823712,1826036,1831475,1831477,1831917,1832205,1835900,1836506,1837506-1837507,1837540,1838336,1843339,1843344,1848535,1848643-1848644,1848708,1848721
Modified: axis/axis2/java/core/branches/1_7/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/code-coverage/pom.xml?rev=1848791&r1=1821809&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/code-coverage/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/code-coverage/pom.xml Wed Dec 12 20:20:55 2018
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.10-SNAPSHOT</version>
</parent>
<artifactId>code-coverage</artifactId>
<packaging>pom</packaging>
@@ -194,4 +194,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml?rev=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml Wed Dec 12 20:20:55 2018
@@ -250,7 +250,7 @@
because the test server doesn't shut down properly :-(
Should be removed if possible -->
<forkMode>pertest</forkMode>
- <argLine>-Xms256m -Xmx512m</argLine>
+ <argLine>${argLine} -Xms256m -Xmx512m</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
<includes>
Modified: axis/axis2/java/core/branches/1_7/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/integration/pom.xml?rev=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/integration/pom.xml Wed Dec 12 20:20:55 2018
@@ -481,7 +481,7 @@
because the test server doesn't shut down properly :-(
Should be removed if possible -->
<forkMode>pertest</forkMode>
- <argLine>-Xms256m -Xmx512m</argLine>
+ <argLine>${argLine} -Xms256m -Xmx512m</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
<includes>
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=1848791&r1=1848790&r2=1848791&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 Wed Dec 12 20:20:55 2018
@@ -1287,7 +1287,7 @@
<inherited>true</inherited>
<configuration>
<forkMode>pertest</forkMode>
- <argLine>-Xms256m -Xmx512m -Xbootclasspath/p:${jaxws.bootclasspath}</argLine>
+ <argLine>${argLine} -Xms256m -Xmx512m -Xbootclasspath/p:${jaxws.bootclasspath}</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
<includes>
Modified: axis/axis2/java/core/branches/1_7/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/pom.xml?rev=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/jaxws/pom.xml Wed Dec 12 20:20:55 2018
@@ -360,7 +360,7 @@
<inherited>true</inherited>
<configuration>
<forkMode>once</forkMode>
- <argLine>-Xms256m -Xmx512m -Xbootclasspath/p:${jaxws.bootclasspath}</argLine>
+ <argLine>${argLine} -Xms256m -Xmx512m -Xbootclasspath/p:${jaxws.bootclasspath}</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
<includes>
Modified: axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java?rev=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java Wed Dec 12 20:20:55 2018
@@ -23,7 +23,9 @@ import junit.framework.TestCase;
import org.apache.axis2.context.MessageContext;
import java.lang.reflect.Field;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
public class MessageContextChangeTest extends TestCase {
private FieldDescription[] knownList = {
@@ -127,7 +129,15 @@ public class MessageContextChangeTest ex
Class mcClass = mc.getClass();
- Field [] fields = mcClass.getDeclaredFields();
+ List<Field> fieldList = new ArrayList<Field>();
+ for (Field field : mcClass.getDeclaredFields()) {
+ // Ignore fields added by instrumentation (such as JaCoCo)
+ if (!field.getName().startsWith("$")) {
+ fieldList.add(field);
+ }
+ }
+ Field[] fields = fieldList.toArray(new Field[fieldList.size()]);
+
int numberFields = fields.length;
int numberKnownFields = knownList.length;
Modified: axis/axis2/java/core/branches/1_7/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/pom.xml?rev=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/metadata/pom.xml Wed Dec 12 20:20:55 2018
@@ -282,7 +282,7 @@
<inherited>true</inherited>
<configuration>
<argLine>
- -Xbootclasspath/p:${jaxws.bootclasspath}
+ ${argLine} -Xbootclasspath/p:${jaxws.bootclasspath}
</argLine>
<includes>
<include>**/*Tests.java</include>
Modified: axis/axis2/java/core/branches/1_7/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/saaj/pom.xml?rev=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/saaj/pom.xml Wed Dec 12 20:20:55 2018
@@ -180,7 +180,7 @@
presence of jaxp-ri on the classpath.
* Please leave this on a single line. Adding a newline between the two
options causes a build failure. -->
- <argLine>-Xbootclasspath/p:${surefire.bootclasspath} -Dcom.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration=com.sun.org.apache.xerces.internal.parsers.XIncludeParserConfiguration</argLine>
+ <argLine>${argLine} -Xbootclasspath/p:${surefire.bootclasspath} -Dcom.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration=com.sun.org.apache.xerces.internal.parsers.XIncludeParserConfiguration</argLine>
<systemProperties>
<!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
<property>
Modified: axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml?rev=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml Wed Dec 12 20:20:55 2018
@@ -76,7 +76,7 @@
<value>file:../../log4j.properties</value>
</property>
</systemProperties>
- <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
+ <argLine>${argLine} -javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
</configuration>
</plugin>
<plugin>
Modified: axis/axis2/java/core/branches/1_7/modules/transport/mail/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/mail/pom.xml?rev=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/mail/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/mail/pom.xml Wed Dec 12 20:20:55 2018
@@ -102,7 +102,7 @@
<value>target/cobertura.ser</value>
</property>
</systemProperties>
- <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
+ <argLine>${argLine} -javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
</configuration>
</plugin>
</plugins>
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=1848791&r1=1848790&r2=1848791&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Wed Dec 12 20:20:55 2018
@@ -97,6 +97,7 @@
<module>modules/distribution</module>
<module>modules/samples</module>
<module>systests</module>
+ <module>code-coverage</module>
</modules>
<profiles>
<profile>
@@ -1329,6 +1330,24 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.0</version>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>org.apache.axis2.*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -1353,6 +1372,18 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.veithen.phos</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-data-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.github.veithen.maven</groupId>
<artifactId>jacoco-report-maven-plugin</artifactId>
<version>0.1.0</version>
Propchange: axis/axis2/java/core/branches/1_7/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 12 20:20:55 2018
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6/pom.xml:1295540
/axis/axis2/java/core/branches/AXIOM-420/pom.xml:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318/pom.xml:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk/pom.xml: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,1733225,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,1780684,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1
797823,1799068,1800495,1803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350,1806577,1806581,1806719,1807643,1807837,1807941,1807943,1808789,1809384-1809385,1809411,1809504,1809507,1809514,1809517,1810596,1810600,1810603,1815035,1815137,1815139,1817866,1817872,1819265,1820601,1823386,1823712,1826036,1831475,1837506,1837540,1843339,1843344,1848708,1848721
+/axis/axis2/java/core/trunk/pom.xml: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,1733225,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,1780684,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1
797823,1799068,1800495,1803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350,1806577,1806581,1806719,1807643,1807837,1807941,1807943,1808789,1809384-1809385,1809411,1809504,1809507,1809514,1809517,1810596,1810600,1810603,1815035,1815137,1815139,1817866,1817872,1819265,1820601,1821809,1823386,1823712,1826036,1831475,1837506,1837540,1843339,1843344,1848708,1848721