Repository: cxf Updated Branches: refs/heads/master 610791147 -> e1e3b2c7a
Fixing and reenabling xmks tests Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e1e3b2c7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e1e3b2c7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e1e3b2c7 Branch: refs/heads/master Commit: e1e3b2c7ab2f808fdd7849ba7f3622e945296d02 Parents: 6107911 Author: Christian Schneider <[email protected]> Authored: Thu Aug 13 14:34:37 2015 +0200 Committer: Christian Schneider <[email protected]> Committed: Thu Aug 13 14:34:52 2015 +0200 ---------------------------------------------------------------------- services/xkms/pom.xml | 2 +- services/xkms/xkms-itests/pom.xml | 20 +++++++++++---- .../cxf/xkms/itests/BasicIntegrationTest.java | 27 ++++++++++---------- .../resources/etc/org.ops4j.pax.logging.cfg | 2 +- 4 files changed, 31 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e1e3b2c7/services/xkms/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml index 4a50691..e34c2d2 100644 --- a/services/xkms/pom.xml +++ b/services/xkms/pom.xml @@ -39,7 +39,7 @@ <module>xkms-features</module> <module>xkms-osgi</module> <module>xkms-war</module> - <!--<module>xkms-itests</module>--> + <module>xkms-itests</module> <module>xkms-x509-repo-ldap</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/cxf/blob/e1e3b2c7/services/xkms/xkms-itests/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml index cbc8c6f..22777f5 100644 --- a/services/xkms/xkms-itests/pom.xml +++ b/services/xkms/xkms-itests/pom.xml @@ -18,11 +18,16 @@ <parent> <groupId>org.apache.cxf</groupId> <artifactId>cxf-parent</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> <dependencies> <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </dependency> + + <dependency> <groupId>org.apache.cxf.services.xkms</groupId> <artifactId>cxf-services-xkms-common</artifactId> <version>${project.version}</version> @@ -43,7 +48,8 @@ <version>${project.version}</version> <type>xml</type> </dependency> - <!-- to force the karaf cxf feature to be available before testing --> + + <!-- to force the karaf cxf feature to be available before testing --> <dependency> <groupId>org.apache.cxf.karaf</groupId> <artifactId>apache-cxf</artifactId> @@ -60,6 +66,11 @@ </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> + <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> <version>${cxf.pax.exam.version}</version> @@ -93,8 +104,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <version>1.7.7</version> + <artifactId>slf4j-jdk14</artifactId> </dependency> </dependencies> <build> @@ -120,7 +130,7 @@ <systemPropertyVariables> <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level> <karaf.version>${cxf.karaf.version}</karaf.version> - <org.ops4j.pax.url.mvn.localRepository>${maven.repo.local}</org.ops4j.pax.url.mvn.localRepository> + <localRepository>${maven.repo.local}</localRepository> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/cxf/blob/e1e3b2c7/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java index 4d01e25..e1f3cc1 100644 --- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java +++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java @@ -31,7 +31,6 @@ import org.junit.Assert; import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.options.MavenArtifactUrlReference; -import org.ops4j.pax.exam.options.MavenUrlReference; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; import org.w3._2002._03.xkms_wsdl.XKMSPortType; @@ -52,24 +51,26 @@ public class BasicIntegrationTest { private static final String XKMS_ENDPOINT = "http://localhost:"; + HTTP_PORT + "/cxf/XKMS"; // Adding apache snapshots as cxf trunk may contain snapshot dependencies - private static final String REPOS = "http://repo1.maven.org/maven2@id=central, " - + "http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache-snapshots "; - - protected MavenArtifactUrlReference karafUrl; - protected MavenUrlReference xkmsFeatures; + //private static final String REPOS = "http://repo1.maven.org/maven2@id=central, " + // + "http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache-snapshots "; @Inject protected XKMSPortType xkmsService; @Configuration public Option[] getConfig() { - String karafVersion = System.getProperty("karaf.version", "3.0.2"); + String karafVersion = System.getProperty("karaf.version", "3.0.4"); String localRepository = System.getProperty("localRepository"); - karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf") - .version(karafVersion).type("tar.gz"); - xkmsFeatures = maven().groupId("org.apache.cxf.services.xkms") - .artifactId("cxf-services-xkms-features").versionAsInProject().type("xml"); - + MavenArtifactUrlReference karafUrl = maven() // + .groupId("org.apache.karaf") // + .artifactId("apache-karaf") // + .version(karafVersion) + .type("tar.gz"); + MavenArtifactUrlReference xkmsFeatures = maven() // + .groupId("org.apache.cxf.services.xkms") // + .artifactId("cxf-services-xkms-features") // + .versionAsInProject() // + .type("xml"); return new Option[] { karafDistributionConfiguration().frameworkUrl(karafUrl).karafVersion(karafVersion) @@ -82,7 +83,7 @@ public class BasicIntegrationTest { copy("data/xkms/certificates/dave.cer"), copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"), copy("etc/org.ops4j.pax.logging.cfg"), - editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories", REPOS), + //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), when(localRepository != null) http://git-wip-us.apache.org/repos/asf/cxf/blob/e1e3b2c7/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg b/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg index 5355947..aa82be2 100644 --- a/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg +++ b/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg @@ -1,5 +1,5 @@ # Root logger -log4j.rootLogger=WARN, stdout, file +log4j.rootLogger=WARN, stdout log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer log4j.logger.org.apache.cxf.xkms=INFO
