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 2015/12/26 09:58:40 UTC
svn commit: r1721714 - in /axis/axis2/java/rampart/branches/1_6: ./
code-coverage/ modules/rampart-samples/ modules/rampart-samples/basic/
modules/rampart-samples/policy/
modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/
Author: veithen
Date: Sat Dec 26 08:58:40 2015
New Revision: 1721714
URL: http://svn.apache.org/viewvc?rev=1721714&view=rev
Log:
Instrument the samples using JaCoCo.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 26 08:58:40 2015
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1470281,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683,1718937,1718941,1719191,1719197,1719227,1719229,171923
2,1719236-1719237,1719502,1719522,1719525,1719538,1719557,1719636-1719637,1720480,1720677,1721007,1721012,1721059,1721246,1721321,1721431,1721512,1721514,1721640
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1470281,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683,1718937,1718941,1719191,1719197,1719227,1719229,171923
2,1719236-1719237,1719502,1719522,1719525,1719538,1719557,1719636-1719637,1720480,1720677,1721007,1721012,1721059,1721246,1721321,1721431,1721512,1721514,1721640,1721694
Modified: axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml?rev=1721714&r1=1721713&r2=1721714&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml Sat Dec 26 08:58:40 2015
@@ -88,6 +88,14 @@
<classifier>jacoco</classifier>
<type>exec</type>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rampart-sample</artifactId>
+ <version>${project.version}</version>
+ <classifier>jacoco</classifier>
+ <type>exec</type>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml?rev=1721714&r1=1721713&r2=1721714&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml Sat Dec 26 08:58:40 2015
@@ -33,6 +33,8 @@
<property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+ <property name="vmargs" value=""/>
+
<path id="runtime.classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
@@ -206,6 +208,7 @@
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
<classpath refid="runtime.classpath"/>
+ <jvmarg line="${vmargs}"/>
</java>
</sequential>
@@ -257,6 +260,7 @@
<path refid="runtime.classpath"/>
<dirset dir="${temp.client.dir}" />
</classpath>
+ <jvmarg line="${vmargs}"/>
</java>
<!-- <delete dir="${temp.client.dir}"/> -->
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml?rev=1721714&r1=1721713&r2=1721714&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml Sat Dec 26 08:58:40 2015
@@ -35,6 +35,8 @@
<property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+ <property name="vmargs" value=""/>
+
<path id="runtime.classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
@@ -186,7 +188,7 @@
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
<classpath refid="runtime.classpath"/>
- <jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}"/>
+ <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir} ${vmargs}"/>
</java>
</sequential>
@@ -242,7 +244,7 @@
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
<classpath refid="runtime.classpath"/>
- <jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}"/>
+ <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir} ${vmargs}"/>
</java>
</sequential>
@@ -292,6 +294,7 @@
<path refid="runtime.classpath"/>
<dirset dir="${temp.client.dir}" />
</classpath>
+ <jvmarg line="${vmargs}"/>
</java>
<!-- <delete dir="${temp.client.dir}"/> -->
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml?rev=1721714&r1=1721713&r2=1721714&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml Sat Dec 26 08:58:40 2015
@@ -37,6 +37,22 @@
<build>
<plugins>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-agent-for-client</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <propertyName>jacoco.argLineTemplate</propertyName>
+ <sessionId>mvn:${project.groupId}:${project.artifactId}:${project.version}:@id@</sessionId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-repo-maven-plugin</artifactId>
<executions>
@@ -66,6 +82,14 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <jacoco.argLineTemplate>${jacoco.argLineTemplate}</jacoco.argLineTemplate>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java?rev=1721714&r1=1721713&r2=1721714&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java Sat Dec 26 08:58:40 2015
@@ -25,11 +25,11 @@ import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
final class Sample {
- private final File buildFile;
+ private final String group;
private final String sampleId;
- Sample(File buildFile, String sampleId) {
- this.buildFile = buildFile;
+ Sample(String group, String sampleId) {
+ this.group = group;
this.sampleId = sampleId;
}
@@ -40,7 +40,11 @@ final class Sample {
project.setUserProperty("build.dir", new File(targetDir, "build").getAbsolutePath());
project.setUserProperty("client.port", String.valueOf(port));
project.setUserProperty("server.port", String.valueOf(port));
- ProjectHelper.configureProject(project, buildFile);
+ String jacocoArgLineTemplate = System.getProperty("jacoco.argLineTemplate");
+ if (jacocoArgLineTemplate != null) {
+ project.setUserProperty("vmargs", jacocoArgLineTemplate.replace("@id@", group + ":" + target));
+ }
+ ProjectHelper.configureProject(project, new File(group + "/build.xml"));
project.addBuildListener(logger);
project.executeTarget(target);
}
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java?rev=1721714&r1=1721713&r2=1721714&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java Sat Dec 26 08:58:40 2015
@@ -18,8 +18,6 @@
*/
package org.apache.rampart.samples.runner;
-import java.io.File;
-
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -28,7 +26,7 @@ public class SampleTest extends TestCase
public SampleTest(String group, String id) {
super(group + "/" + id);
- this.sample = new Sample(new File(group + "/build.xml"), id);
+ this.sample = new Sample(group, id);
}
@Override