cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1561932 - in /cxf/trunk: osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/ osgi/itests/src/test/java/org/apache/cxf/osgi/itests/ services/xkms/xkms-itests/ services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/
Date Tue, 28 Jan 2014 03:58:30 GMT
Author: dkulp
Date: Tue Jan 28 03:58:30 2014
New Revision: 1561932

URL: http://svn.apache.org/r1561932
Log:
Make an attempt to get the osgi based tests to pass in Jenkins

Modified:
    cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
    cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
    cxf/trunk/services/xkms/xkms-itests/pom.xml
    cxf/trunk/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java

Modified: cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java?rev=1561932&r1=1561931&r2=1561932&view=diff
==============================================================================
--- cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
(original)
+++ cxf/trunk/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
Tue Jan 28 03:58:30 2014
@@ -20,6 +20,7 @@ package org.apache.cxf.osgi.itests;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
@@ -28,6 +29,7 @@ import org.ops4j.pax.exam.spi.reactors.P
 
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
@@ -47,6 +49,9 @@ public class NoAriesBlueprintTest extend
     @Configuration
     public Option[] config() {
         return new Option[]{
+                systemProperty("java.awt.headless").value("true"),
+                systemProperty("org.ops4j.pax.url.mvn.localRepository")
+                    .value(System.getProperty("localRepository")),
                 mavenBundle().groupId("org.apache.ws.xmlschema").artifactId("xmlschema-core").versionAsInProject(),
                 mavenBundle().groupId("org.apache.cxf").artifactId("cxf-core").versionAsInProject(),
                 mavenBundle().groupId("org.apache.servicemix.bundles")

Modified: cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java?rev=1561932&r1=1561931&r2=1561932&view=diff
==============================================================================
--- cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
(original)
+++ cxf/trunk/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
Tue Jan 28 03:58:30 2014
@@ -21,6 +21,7 @@ package org.apache.cxf.osgi.itests;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
@@ -28,7 +29,8 @@ import org.ops4j.pax.exam.karaf.options.
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
 
 @RunWith(PaxExam.class)
@@ -51,8 +53,12 @@ public class BundlesAndNamespacesTest ex
     @Configuration
     public Option[] config() {
         return new Option[]{
-                cxfBaseConfig(), 
-                keepRuntimeFolder(),
+                cxfBaseConfig(),
+                systemProperty("java.awt.headless").value("true"),
+
+                editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", 
+                                         "org.ops4j.pax.url.mvn.localRepository",
+                                         System.getProperty("localRepository")),
                 logLevel(LogLevel.INFO)};
     }
 }

Modified: cxf/trunk/services/xkms/xkms-itests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-itests/pom.xml?rev=1561932&r1=1561931&r2=1561932&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-itests/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-itests/pom.xml Tue Jan 28 03:58:30 2014
@@ -109,6 +109,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/trunk/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java?rev=1561932&r1=1561931&r2=1561932&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
(original)
+++ cxf/trunk/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
Tue Jan 28 03:58:30 2014
@@ -66,6 +66,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"),
@@ -89,6 +90,9 @@ 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),
+            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")



Mime
View raw message