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 21:26:57 UTC
svn commit: r1721752 - in /axis/axis2/java/rampart/branches/1_6: ./
modules/rampart-samples/pom.xml modules/rampart-samples/src/test/conf/
modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/Sample.java
Author: veithen
Date: Sat Dec 26 20:26:57 2015
New Revision: 1721752
URL: http://svn.apache.org/viewvc?rev=1721752&view=rev
Log:
Merge r1721719 and r1721720 to the 1.6 branch.
Added:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/conf/
- copied from r1721719, axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/conf/
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
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
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 26 20:26:57 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,1721694,1721717
+/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,1721717,1721719-1721720
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=1721752&r1=1721751&r2=1721752&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 20:26:57 2015
@@ -77,6 +77,7 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/axis2/lib</outputDirectory>
+ <includeTypes>jar</includeTypes>
</configuration>
</execution>
</executions>
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=1721752&r1=1721751&r2=1721752&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 20:26:57 2015
@@ -40,10 +40,15 @@ 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));
+ StringBuilder vmargs = new StringBuilder();
+ vmargs.append("-Dlog4j.configuration=");
+ vmargs.append(new File("src/test/conf/log4j.properties").getAbsoluteFile().toURI().toString());
String jacocoArgLineTemplate = System.getProperty("jacoco.argLineTemplate");
if (jacocoArgLineTemplate != null) {
- project.setUserProperty("vmargs", jacocoArgLineTemplate.replace("@id@", group + ":" + target));
+ vmargs.append(" ");
+ vmargs.append(jacocoArgLineTemplate.replace("@id@", group + ":" + target));
}
+ project.setUserProperty("vmargs", vmargs.toString());
ProjectHelper.configureProject(project, new File(group + "/build.xml"));
project.addBuildListener(logger);
project.executeTarget(target);