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 2017/02/27 19:05:20 UTC

[1/6] cxf git commit: Use osgi version number to avoid bundle-plugin messages

Repository: cxf
Updated Branches:
  refs/heads/master 34fd320f9 -> c5c2f87e4


Use osgi version number to avoid bundle-plugin messages


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

Branch: refs/heads/master
Commit: c5c2f87e4f6c3cc6224af51e9ae24746a15f02aa
Parents: 177579c
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 27 13:40:07 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 27 14:05:08 2017 -0500

----------------------------------------------------------------------
 services/sts/sts-core/pom.xml | 4 ++--
 services/wsn/wsn-osgi/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c5c2f87e/services/sts/sts-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index d34c4a5..d30045b 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -164,11 +164,11 @@
                         <Specification-Title>${project.name}</Specification-Title>
                         <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
                         <Export-Package>
-                            org.apache.cxf.sts.*;version=${project.version}
+                            org.apache.cxf.sts.*;version=${cxf.osgi.version.clean}
                         </Export-Package>
                         <Import-Package>
                             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
-                            org.apache.cxf.sts.provider.*;version=${project.version},
+                            org.apache.cxf.sts.provider.*;version=${cxf.osgi.version.clean},
                             !org.apache.cxf.sts.*,
                             org.apache.cxf.*,
                             javax.xml.ws*;version="[0.0,3)",

http://git-wip-us.apache.org/repos/asf/cxf/blob/c5c2f87e/services/wsn/wsn-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-osgi/pom.xml b/services/wsn/wsn-osgi/pom.xml
index f6ea30f..82acdee 100644
--- a/services/wsn/wsn-osgi/pom.xml
+++ b/services/wsn/wsn-osgi/pom.xml
@@ -68,7 +68,7 @@
                         <Export-Package>
                             org.oasis_open.docs.wsn.*;version=1.3;-noimport:=true,
                             org.oasis_open.docs.wsrf.*;version=1.2;-noimport:=true,
-                            org.apache.cxf.wsn.client;version=${project.version}
+                            org.apache.cxf.wsn.client;version=${cxf.osgi.version.clean}
                         </Export-Package>
                         <Private-Package>
                             org.apache.cxf.wsn.*,


[3/6] cxf git commit: More jibx removal

Posted by dk...@apache.org.
More jibx removal


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

Branch: refs/heads/master
Commit: d0dd55e901a83c1a4a014552a7da58f3899cd638
Parents: 34fd320
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 27 10:48:52 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 27 14:05:08 2017 -0500

----------------------------------------------------------------------
 distribution/javadoc/pom.xml   | 16 ----------------
 osgi/bundle/compatible/pom.xml |  1 -
 parent/pom.xml                 | 21 ---------------------
 systests/databinding/pom.xml   | 16 ----------------
 4 files changed, 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d0dd55e9/distribution/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 2955170..50f601c 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -174,22 +174,6 @@
             <artifactId>cglib-nodep</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-bind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-run</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-schema</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-tools</artifactId>
-        </dependency>
-        <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
             <version>${cxf.jdom.version}</version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d0dd55e9/osgi/bundle/compatible/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml
index 1ecccf4..7302ae4 100644
--- a/osgi/bundle/compatible/pom.xml
+++ b/osgi/bundle/compatible/pom.xml
@@ -178,7 +178,6 @@
                             org.eclipse.jetty*;resolution:=optional;version="${cxf.jetty.osgi.version}",
                             org.jaxen*;resolution:=optional,
                             org.jdom*;resolution:=optional,
-                            org.jibx*;resolution:=optional;version="[1.2.3,2)",
                             org.junit*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
                             org.objectweb.asm*;version="[2.0,4)";resolution:=optional,

http://git-wip-us.apache.org/repos/asf/cxf/blob/d0dd55e9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ffb8ba..1c464bb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -123,7 +123,6 @@
         <cxf.jetty.osgi.version>[8.1,10)</cxf.jetty.osgi.version>
         <cxf.undertow.version>1.3.7.Final</cxf.undertow.version>
         <cxf.undertow.osgi.version>[1.3, 1.4)</cxf.undertow.osgi.version>
-        <cxf.jibx.version>1.2.6</cxf.jibx.version>
         <cxf.junit.version>4.12</cxf.junit.version>
         <cxf.hamcrest.version>1.3</cxf.hamcrest.version>
         <cxf.maven.core.version>3.0.5</cxf.maven.core.version>
@@ -1637,26 +1636,6 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.jibx</groupId>
-                <artifactId>jibx-bind</artifactId>
-                <version>${cxf.jibx.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jibx</groupId>
-                <artifactId>jibx-run</artifactId>
-                <version>${cxf.jibx.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jibx</groupId>
-                <artifactId>jibx-schema</artifactId>
-                <version>${cxf.jibx.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jibx</groupId>
-                <artifactId>jibx-tools</artifactId>
-                <version>${cxf.jibx.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>xml-resolver</groupId>
                 <artifactId>xml-resolver</artifactId>
                 <version>1.2</version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d0dd55e9/systests/databinding/pom.xml
----------------------------------------------------------------------
diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml
index 2cc6dba..acb5fc8 100644
--- a/systests/databinding/pom.xml
+++ b/systests/databinding/pom.xml
@@ -278,22 +278,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-bind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-run</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-schema</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jibx</groupId>
-            <artifactId>jibx-tools</artifactId>
-        </dependency>
-        <dependency>
             <groupId>net.java.dev.msv</groupId>
             <artifactId>msv-core</artifactId>
             <exclusions>


[4/6] cxf git commit: Update some dependency versions

Posted by dk...@apache.org.
Update some dependency versions


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

Branch: refs/heads/master
Commit: 855d033766dc31a76e8cf1a38b6ef8eb7490a23e
Parents: d0dd55e
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 27 10:47:55 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 27 14:05:08 2017 -0500

----------------------------------------------------------------------
 parent/pom.xml                                    | 18 +++++++++---------
 rt/rs/client/pom.xml                              |  5 +++++
 .../http/asyncclient/SharedInputBuffer.java       |  2 --
 .../http/asyncclient/SharedOutputBuffer.java      |  2 --
 4 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/855d0337/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1c464bb..139fe97 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -47,7 +47,7 @@
         <!-- stuff related to ASM -->
         <cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId>
         <cxf.asm.artifactId>asm</cxf.asm.artifactId>
-        <cxf.asm.version>5.0.4</cxf.asm.version>
+        <cxf.asm.version>5.2</cxf.asm.version>
         <cxf.osgi.asm.version>[3.0,6.1)</cxf.osgi.asm.version>
         <!-- OSGi related properties -->
         <cxf.fragment.host />
@@ -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.2</cxf.activemq.version>
+        <cxf.activemq.version>5.14.3</cxf.activemq.version>
         <cxf.ahc.version>1.9.8</cxf.ahc.version>
         <cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
         <cxf.atmosphere.version>2.4.9</cxf.atmosphere.version>
@@ -88,12 +88,12 @@
         <cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version>
         <cxf.guava.version>18.0</cxf.guava.version>
         <cxf.hazelcast.version>3.7.4</cxf.hazelcast.version>
-        <cxf.httpcomponents.asyncclient.version>4.1.2</cxf.httpcomponents.asyncclient.version>
+        <cxf.httpcomponents.asyncclient.version>4.1.3</cxf.httpcomponents.asyncclient.version>
         <cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
-        <cxf.httpcomponents.client.version>4.5.2</cxf.httpcomponents.client.version>
-        <cxf.httpcomponents.core.version>4.4.4</cxf.httpcomponents.core.version>
+        <cxf.httpcomponents.client.version>4.5.3</cxf.httpcomponents.client.version>
+        <cxf.httpcomponents.core.version>4.4.6</cxf.httpcomponents.core.version>
         <cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
-        <cxf.jackson.version>2.8.6</cxf.jackson.version>
+        <cxf.jackson.version>2.8.7</cxf.jackson.version>
         <cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
         <cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
         <cxf.log4j.version>1.2.17</cxf.log4j.version>
@@ -144,11 +144,11 @@
         <cxf.geronimo.servlet25.version>1.2</cxf.geronimo.servlet25.version>
         <cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
         <cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
-        <cxf.slf4j.version>1.7.22</cxf.slf4j.version>
+        <cxf.slf4j.version>1.7.24</cxf.slf4j.version>
         <cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
         <cxf.spring.version>4.2.9.RELEASE</cxf.spring.version>
         <cxf.spring.boot.version>1.5.1.RELEASE</cxf.spring.boot.version>
-        <cxf.spring.security.version>4.2.0.RELEASE</cxf.spring.security.version>
+        <cxf.spring.security.version>4.2.1.RELEASE</cxf.spring.security.version>
         <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
         <cxf.spring.ldap.version>2.2.1.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
@@ -1456,7 +1456,7 @@
             <dependency>
                 <groupId>org.easymock</groupId>
                 <artifactId>easymock</artifactId>
-                <version>3.3.1</version>
+                <version>3.4</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/855d0337/rt/rs/client/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index ec6e4ab..237d079 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -114,6 +114,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>${cxf.servlet-api.group}</groupId>
             <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/855d0337/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java
index 7a2a4e2..3fbd9dc 100644
--- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java
+++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedInputBuffer.java
@@ -25,7 +25,6 @@ import java.nio.ByteBuffer;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.http.annotation.ThreadSafe;
 import org.apache.http.nio.ContentDecoder;
 import org.apache.http.nio.IOControl;
 import org.apache.http.nio.util.ByteBufferAllocator;
@@ -44,7 +43,6 @@ import org.apache.http.nio.util.ExpandableBuffer;
  * In case of an abnormal situation or when no longer needed the buffer must be shut down
  * using {@link #shutdown()} method.
  */
-@ThreadSafe
 public class SharedInputBuffer extends ExpandableBuffer {
 
     private final ReentrantLock lock;

http://git-wip-us.apache.org/repos/asf/cxf/blob/855d0337/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
index 8d8dfc3..8f94fe8 100644
--- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
+++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
@@ -26,7 +26,6 @@ import java.nio.ByteBuffer;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.http.annotation.ThreadSafe;
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.IOControl;
 import org.apache.http.nio.util.ByteBufferAllocator;
@@ -45,7 +44,6 @@ import org.apache.http.nio.util.ExpandableBuffer;
  * In case of an abnormal situation or when no longer needed the buffer must be
  * shut down using {@link #shutdown()} method.
  */
-@ThreadSafe
 public class SharedOutputBuffer extends ExpandableBuffer {
 
     private final ReentrantLock lock;


[2/6] cxf git commit: Update version of karaf in code.

Posted by dk...@apache.org.
Update version of karaf in code.


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

Branch: refs/heads/master
Commit: d017d3cf4165e9d8fa849e29669cece562f55253
Parents: e18b4fb
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 27 12:25:18 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 27 14:05:08 2017 -0500

----------------------------------------------------------------------
 .../org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java | 2 +-
 .../test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d017d3cf/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
index 1e1cd30..7568825 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
@@ -43,7 +43,7 @@ public class BasicSTSIntegrationTest {
 
     @Configuration
     public Option[] getConfig() {
-        String karafVersion = System.getProperty("karaf.version", "3.0.4");
+        String karafVersion = System.getProperty("karaf.version", "4.0.8");
         String localRepository = System.getProperty("localRepository");
 
         MavenArtifactUrlReference karafUrl = maven() //

http://git-wip-us.apache.org/repos/asf/cxf/blob/d017d3cf/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 e1f3cc1..6e201b9 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
@@ -59,7 +59,7 @@ public class BasicIntegrationTest {
 
     @Configuration
     public Option[] getConfig() {
-        String karafVersion = System.getProperty("karaf.version", "3.0.4");
+        String karafVersion = System.getProperty("karaf.version", "4.0.8");
         String localRepository = System.getProperty("localRepository");
         MavenArtifactUrlReference karafUrl = maven() //
             .groupId("org.apache.karaf") //


[5/6] cxf git commit: Rework test to try and see why it's randomly failing

Posted by dk...@apache.org.
Rework test to try and see why it's randomly failing


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

Branch: refs/heads/master
Commit: 177579cad9c1a41b9b7c68ad69ed84de9fa08561
Parents: d017d3c
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 27 13:35:35 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 27 14:05:08 2017 -0500

----------------------------------------------------------------------
 .../jaxrs/client/logging/RESTLoggingTest.java   | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/177579ca/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
index 08527c8..980a744 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
@@ -66,15 +66,17 @@ public class RESTLoggingTest {
         client.get(InputStream.class).close();
         server.destroy();
 
-        assertLogged(sender.getEvents().get(0));
-        assertLogged(sender.getEvents().get(1));
-        assertNotLogged(sender.getEvents().get(2));
-        assertNotLogged(sender.getEvents().get(3));
-
-        assertLogged(sender.getEvents().get(4));
-        assertLogged(sender.getEvents().get(5));
-        assertLogged(sender.getEvents().get(6));
-        assertLogged(sender.getEvents().get(7));
+        List<LogEvent> events = sender.getEvents();
+        Assert.assertEquals(8, events.size());
+        assertLogged(events.get(0));
+        assertLogged(events.get(1));
+        assertNotLogged(events.get(2));
+        assertNotLogged(events.get(3));
+
+        assertLogged(events.get(4));
+        assertLogged(events.get(5));
+        assertLogged(events.get(6));
+        assertLogged(events.get(7));
     }
 
     private void assertLogged(LogEvent event) {


[6/6] cxf git commit: Flush teh print writer so results are available

Posted by dk...@apache.org.
Flush teh print writer so results are available


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

Branch: refs/heads/master
Commit: e18b4fb7d5f4f585eea1a2637c5158cd6e0c61af
Parents: 855d033
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 27 12:24:48 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 27 14:05:08 2017 -0500

----------------------------------------------------------------------
 .../org/apache/cxf/ext/logging/event/PrintWriterEventSender.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e18b4fb7/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
index 424e915..af1d91b 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
@@ -38,6 +38,7 @@ public class PrintWriterEventSender implements LogEventSender {
         synchronized (writer) {
             writer.print(Instant.now().toString() + " - PrintWriterEventSender");
             writer.print(LogMessageFormatter.format(event));
+            writer.flush();
         }
     }