You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/01/28 15:46:47 UTC
svn commit: r1562086 - in
/cxf/branches/2.7.x-fixes/services/xkms/xkms-itests: pom.xml
src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
Author: dkulp
Date: Tue Jan 28 14:46:46 2014
New Revision: 1562086
URL: http://svn.apache.org/r1562086
Log:
Merged revisions 1561932 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1561932 | dkulp | 2014-01-27 22:58:30 -0500 (Mon, 27 Jan 2014) | 2 lines
Make an attempt to get the osgi based tests to pass in Jenkins
........
Modified:
cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml
cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
Modified: cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml?rev=1562086&r1=1562085&r2=1562086&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/pom.xml Tue Jan 28 14:46:46 2014
@@ -121,6 +121,7 @@
<project.version>${project.version}</project.version>
<karaf.version>${karaf.version}</karaf.version>
<buildDirectory>${project.build.directory}</buildDirectory>
+ <org.ops4j.pax.url.mvn.localRepository>${maven.repo.local}</org.ops4j.pax.url.mvn.localRepository>
</systemPropertyVariables>
</configuration>
</plugin>
Modified: cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java?rev=1562086&r1=1562085&r2=1562086&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java (original)
+++ cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java Tue Jan 28 14:46:46 2014
@@ -68,6 +68,7 @@ public class BasicIntegrationTest {
.artifactId("cxf-services-xkms-features").version(projectVersion).type("xml");
return new Option[] {
+
karafDistributionConfiguration().frameworkUrl(karafUrl).karafVersion(karafVersion)
.unpackDirectory(new File("target/paxexam/unpack/")).useDeployFolder(false),
systemProperty("java.awt.headless").value("true"),
@@ -88,7 +89,10 @@ public class BasicIntegrationTest {
editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories", REPOS),
editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", HTTP_PORT),
editConfigurationFilePut("etc/org.apache.cxf.xkms.client.cfg", "xkms.endpoint", XKMS_ENDPOINT),
- features(xkmsFeatures, "cxf-xkms-service", "cxf-xkms-client", "spring-dm"),
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
+ "org.ops4j.pax.url.mvn.localRepository",
+ System.getProperty("localRepository")),
+ features(xkmsFeatures, "cxf-xkms-service", "cxf-xkms-client"),
configureConsole().ignoreLocalConsole(),
//CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
};