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/25 21:36:56 UTC
svn commit: r1721694 - in /axis/axis2/java/rampart/trunk: code-coverage/
modules/rampart-samples/ modules/rampart-samples/policy/
modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/
Author: veithen
Date: Fri Dec 25 20:36:56 2015
New Revision: 1721694
URL: http://svn.apache.org/viewvc?rev=1721694&view=rev
Log:
Instrument the samples using JaCoCo.
Modified:
axis/axis2/java/rampart/trunk/code-coverage/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
Modified: axis/axis2/java/rampart/trunk/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/code-coverage/pom.xml?rev=1721694&r1=1721693&r2=1721694&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/code-coverage/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/code-coverage/pom.xml Fri Dec 25 20:36:56 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/trunk/modules/rampart-samples/policy/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml?rev=1721694&r1=1721693&r2=1721694&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml Fri Dec 25 20:36:56 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/trunk/modules/rampart-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml?rev=1721694&r1=1721693&r2=1721694&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/pom.xml Fri Dec 25 20:36:56 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/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java?rev=1721694&r1=1721693&r2=1721694&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java Fri Dec 25 20:36:56 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/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java?rev=1721694&r1=1721693&r2=1721694&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java Fri Dec 25 20:36:56 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