cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject cxf git commit: Use karaf 4.1.1 minimal and activemq 5.14.5 in OSGi itests
Date Fri, 28 Apr 2017 15:28:37 GMT
Repository: cxf
Updated Branches:
  refs/heads/master c1ba5d90e -> d7d30736a


Use karaf 4.1.1 minimal and activemq 5.14.5 in OSGi itests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d7d30736
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d7d30736
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d7d30736

Branch: refs/heads/master
Commit: d7d30736aae953b2f7a4415f1ea575bfc6e43ae2
Parents: c1ba5d9
Author: Christian Schneider <chris@die-schneider.net>
Authored: Fri Apr 28 17:28:32 2017 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Fri Apr 28 17:28:32 2017 +0200

----------------------------------------------------------------------
 osgi/itests/pom.xml                                       |  7 +------
 .../apache/cxf/osgi/itests/BundlesAndNamespacesTest.java  |  7 ++-----
 .../org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java    | 10 +++++-----
 .../apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java    |  2 +-
 .../apache/cxf/osgi/itests/jaxrs/JaxRsTestActivator.java  |  1 +
 .../org/apache/cxf/osgi/itests/soap/HttpServiceTest.java  |  1 +
 .../org/apache/cxf/osgi/itests/soap/JmsServiceTest.java   |  2 +-
 .../src/test/resources/etc/org.ops4j.pax.logging.cfg      |  2 +-
 parent/pom.xml                                            |  4 ++--
 9 files changed, 15 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 800d50d..ed4e0be 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -100,11 +100,6 @@
             <version>${cxf.karaf.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.core</artifactId>
-            <version>${cxf.karaf.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.jsr303-api-1.1.0</artifactId>
             <version>${cxf.servicemix.specs.version}</version>
@@ -175,7 +170,7 @@
         
         <dependency>
             <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
+            <artifactId>apache-karaf-minimal</artifactId>
             <version>${cxf.karaf.version}</version>
             <type>tar.gz</type>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
index 7a85f43..5640197 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
@@ -19,7 +19,6 @@
 
 package org.apache.cxf.osgi.itests;
 
-import java.io.File;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -31,7 +30,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
 
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
@@ -55,9 +53,8 @@ public class BundlesAndNamespacesTest extends CXFOSGiTestSupport {
     public Option[] config() {
         return new Option[]{
                 cxfBaseConfig(),
-                replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
-                                         new File("src/test/resources/etc/org.ops4j.pax.logging.cfg")),
-                features(cxfUrl, "cxf-core", "cxf-jaxws"),
+
+                features(cxfUrl, "aries-blueprint", "cxf-core", "cxf-jaxws"),
                 logLevel(LogLevel.INFO)};
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index c0c6a8a..5773e18 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -34,7 +34,6 @@ import org.apache.karaf.features.FeaturesService;
 import org.junit.Assert;
 import org.ops4j.pax.exam.MavenUtils;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.options.MavenUrlReference;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -47,7 +46,7 @@ import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.when;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
 
 /**
  *
@@ -67,7 +66,7 @@ public class CXFOSGiTestSupport {
     protected MavenUrlReference amqUrl;
 
     private static String getKarafVersion() {
-        return MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+        return MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf-minimal");
     }
 
     /**
@@ -76,7 +75,7 @@ public class CXFOSGiTestSupport {
      * @return
      */
     protected Option cxfBaseConfig() {
-        karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version(getKarafVersion())
+        karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal").version(getKarafVersion())
             .type("tar.gz");
         cxfUrl = maven().groupId("org.apache.cxf.karaf").artifactId("apache-cxf").versionAsInProject()
             .type("xml").classifier("features");
@@ -95,7 +94,8 @@ public class CXFOSGiTestSupport {
                          //debugConfiguration(), // nor this
                          systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
                          systemProperty("java.awt.headless").value("true"),
-                         logLevel(LogLevel.INFO),
+                         replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
+                                                  new File("src/test/resources/etc/org.ops4j.pax.logging.cfg")),
                          when(localRepo != null)
                              .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
                                                                   "org.ops4j.pax.url.mvn.localRepository",

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
index 4ae7b09..6d1a90a 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -103,7 +103,7 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
     public Option[] config() {
         return new Option[] {
             cxfBaseConfig(),
-            features(cxfUrl, "cxf-core", "cxf-wsdl", "cxf-jaxrs", "http",
+            features(cxfUrl, "aries-blueprint", "cxf-core", "cxf-wsdl", "cxf-jaxrs", "http",
                     "cxf-bean-validation-core",
                     "cxf-bean-validation"),
             testUtils(),

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsTestActivator.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsTestActivator.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsTestActivator.java
index ac358a3..6a73a29 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsTestActivator.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsTestActivator.java
@@ -32,6 +32,7 @@ public class JaxRsTestActivator implements BundleActivator {
     @Override
     public void start(BundleContext arg0) throws Exception {
         Bus bus = BusFactory.newInstance().createBus();
+        bus.setExtension(JaxRsTestActivator.class.getClassLoader(), ClassLoader.class);
         JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
         sf.setBus(bus);
         sf.setResourceClasses(BookStore.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
index 9b007a4..ea2f0b8 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -50,6 +50,7 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
         String res = greeter.greetMe("Chris");
         Assert.assertEquals("Hi Chris", res);
     }
+
     @Test
     public void testHttpEndpointJetty() throws Exception {
         Greeter greeter = greeterHttpProxy(HttpTestActivator.PORT);

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index 3d6e7b3..4dca812 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -75,7 +75,7 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
             cxfBaseConfig(),
             testUtils(),
             features(cxfUrl, "cxf-core", "cxf-jaxws", "cxf-transports-jms"),
-            features(amqUrl, "activemq-broker-noweb"),
+            features(amqUrl, "aries-blueprint", "shell-compat", "activemq-broker-noweb"),
             provision(serviceBundle())
         };
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/osgi/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg b/osgi/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
index 6f8b25f..79b8406 100644
--- a/osgi/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ b/osgi/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
@@ -21,7 +21,7 @@
 log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name}
- %X{bundle.version} | %m%n
 
 # Root logger
-log4j2.rootLogger.level = DEBUG
+log4j2.rootLogger.level = INFO
 # uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
 #log4j2.rootLogger.type = asyncRoot
 #log4j2.rootLogger.includeLocation = false

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7d30736/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 32ad67d..d1f73fd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,7 +68,7 @@
         <!-- please maintain alphabetical order here -->
         <cxf.abdera.version>1.1.3</cxf.abdera.version>
         <cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
-        <cxf.activemq.version>5.14.4</cxf.activemq.version>
+        <cxf.activemq.version>5.14.5</cxf.activemq.version>
         <cxf.ahc.version>1.9.40</cxf.ahc.version>
         <cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
         <cxf.atmosphere.version>2.4.9</cxf.atmosphere.version>
@@ -188,7 +188,7 @@
         <cxf.aries.parser.version>1.3.1</cxf.aries.parser.version> 
         <cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
         <cxf.osgi.version>4.2.0</cxf.osgi.version>
-        <cxf.karaf.version>4.0.8</cxf.karaf.version>
+        <cxf.karaf.version>4.1.1</cxf.karaf.version>
         <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
         <cxf.pax.exam.version>4.10.0</cxf.pax.exam.version>
         <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>


Mime
View raw message