[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes bcec16a62 - 735178174 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/73517817 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/73517817 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/73517817 Branch: refs/heads/3.0.x-fixes Commit: 735178174717ac574d22a6bdedfc97e562e3f3ce Parents: bf9c5e3 Author: Daniel Kulp dk...@apache.org Authored: Tue Feb 10 09:23:34 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Tue Feb 10 09:23:34 2015 -0500 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/73517817/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 59a5e66..b10514d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -228,6 +228,7 @@ M 76c4df1bce5e71b439fb37fa5d9e1af12615786b M 79156d8a23497b9ed9bd912b64f684e610d49863 M 7bf10fc3fb018d533409cc444c2d7b75144b9e23 M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6 +M 824234e627f6205129b7f97e2fde7f1cf1f17093 M 865eb64d44fd4e904f166cb03b0d15ca8b5f0ba5 M 89b87071f3dedd2cd5ed874e56f69ab7dcf7953d M 8bcb5133c602b1cbe642cfd5fbb46099a28b3016
[1/2] cxf git commit: [CXF-6246] Classes are in every version of the JDK we support, just use them directly.
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes eb992c88a - 90f90cbe8
[CXF-6246] Classes are in every version of the JDK we support, just use them
directly.
Conflicts:
rt/databinding/aegis/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5813258c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5813258c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5813258c
Branch: refs/heads/2.7.x-fixes
Commit: 5813258c98351511dea5a319199924954a97968f
Parents: eb992c8
Author: Daniel Kulp dk...@apache.org
Authored: Tue Feb 10 09:14:28 2015 -0500
Committer: Daniel Kulp dk...@apache.org
Committed: Tue Feb 10 09:27:22 2015 -0500
--
rt/databinding/aegis/pom.xml| 8 +-
.../cxf/aegis/type/java5/AnnotationReader.java | 27 +---
2 files changed, 14 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5813258c/rt/databinding/aegis/pom.xml
--
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 9569270..d3e581f 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -32,7 +32,13 @@
version2.7.15-SNAPSHOT/version
relativePath../../../parent/pom.xml/relativePath
/parent
-
+properties
+cxf.osgi.import
+javax.xml.bind*;version=${cxf.osgi.javax.bind.version},
+javax.activation;version=${cxf.osgi.javax.activation.version},
+javax.xml.stream*;version=${cxf.osgi.javax.stream.version}
+/cxf.osgi.import
+/properties
dependencies
dependency
groupIdorg.apache.cxf/groupId
http://git-wip-us.apache.org/repos/asf/cxf/blob/5813258c/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
--
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
index bf06ed1..66299a0 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
@@ -21,26 +21,22 @@ package org.apache.cxf.aegis.type.java5;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.cxf.aegis.type.AegisType;
-import org.apache.cxf.common.logging.LogUtils;
public class AnnotationReader {
-private static final Logger LOG =
LogUtils.getL7dLogger(AnnotationReader.class);
-private static final Class? extends Annotation WEB_PARAM =
load(javax.jws.WebParam);
-private static final Class? extends Annotation WEB_RESULT =
load(javax.jws.WebResult);
+private static final Class? extends Annotation WEB_PARAM =
javax.jws.WebParam.class;
+private static final Class? extends Annotation WEB_RESULT =
javax.jws.WebResult.class;
private static final Class? extends Annotation XML_ATTRIBUTE =
-load(javax.xml.bind.annotation.XmlAttribute);
+javax.xml.bind.annotation.XmlAttribute.class;
private static final Class? extends Annotation XML_ELEMENT =
-load(javax.xml.bind.annotation.XmlElement);
+javax.xml.bind.annotation.XmlElement.class;
private static final Class? extends Annotation XML_SCHEMA =
-load(javax.xml.bind.annotation.XmlSchema);
+javax.xml.bind.annotation.XmlSchema.class;
private static final Class? extends Annotation XML_TYPE =
-load(javax.xml.bind.annotation.XmlType);
+javax.xml.bind.annotation.XmlType.class;
private static final Class? extends Annotation XML_TRANSIENT =
-load(javax.xml.bind.annotation.XmlTransient);
+javax.xml.bind.annotation.XmlTransient.class;
@SuppressWarnings(unchecked)
public boolean isIgnored(AnnotatedElement element) {
@@ -378,15 +374,6 @@ public class AnnotationReader {
return null;
}
-private static Class? extends Annotation load(String name) {
-try {
-return
AnnotationReader.class.getClassLoader().loadClass(name).asSubclass(Annotation.class);
-} catch (Throwable e) {
-LOG.log(Level.FINE, Error loading annotation class + name +
., e);
-return null;
-}
-}
-
public boolean isFlat(Annotation[] annotations) {
if (annotations != null) {
for (Annotation a : annotations) {
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/90f90cbe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/90f90cbe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/90f90cbe Branch: refs/heads/2.7.x-fixes Commit: 90f90cbe8d1e55f619f0d426c02c69c3140eca69 Parents: 5813258 Author: Daniel Kulp dk...@apache.org Authored: Tue Feb 10 09:27:23 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Tue Feb 10 09:27:23 2015 -0500 -- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/90f90cbe/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 8cb2de6..b733f39 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -841,6 +841,7 @@ B 7294ff05b25d1388128b8a546d47a6ebe61ffd61 B 72df21e88a8bd08515f43ec0882abef9a7b6250b B 732ad179ea9f9e320a8fea5f910c4170798e0874 B 7335999ee13253a0e954ff8bc03c6d09b4058392 +B 735178174717ac574d22a6bdedfc97e562e3f3ce B 7397e892c7a63d8959c7a24277fb1b28dfa538e8 B 73a54ae7e5ed0daddd0d508fe035b52a853fdd89 B 73b6eee9968cbb38b272566f5c8544e6269eeacf @@ -1365,6 +1366,7 @@ B bc91295f18a1cce708b233f04abc6e27ae4f3c44 B bca65dca02ff254fbac4a1087156063aefc94260 B bcb29730acce6537411c814c14d5b286ecc8a4d2 B bce66cb2a1a93829127408e88aa47e3a1a905148 +B bcec16a62c6f0ec665a93f3e3960761fc41dedff B bd565683e0696acca674b45e3c312af0120e4a1a B bd624a88b47708daeefc726f8de3ada4a33fdb52 B bd6fc7ef76c99067e6b4699f2fd7dd4d0f480ca7 @@ -2409,6 +2411,7 @@ M bd3430f518704f920d841816d65b2b818f528663 M bdec087c7d4f510a10586f67efda93a8ddf3fd93 M be2581714062c8937145df240b9bd2b298819b68 M be93ea51e144a134fbf59f682a4fca60b68b5a4e +M bf9c5e3dc83c5c7c63a578d8a336318f61f4db31 M bfa25142429fb8077b1ef98fe603175fa0a390be M bff9bf284e7a25c5dbcb3da0e0a7ea1d246400d6 M c08d14a742d5c9705d662aa6692fe1c81b95cabe
[2/2] cxf git commit: [CXF-6246] Classes are in every version of the JDK we support, just use them directly.
[CXF-6246] Classes are in every version of the JDK we support, just use them
directly.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bf9c5e3d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf9c5e3d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf9c5e3d
Branch: refs/heads/3.0.x-fixes
Commit: bf9c5e3dc83c5c7c63a578d8a336318f61f4db31
Parents: bcec16a
Author: Daniel Kulp dk...@apache.org
Authored: Tue Feb 10 09:14:28 2015 -0500
Committer: Daniel Kulp dk...@apache.org
Committed: Tue Feb 10 09:23:34 2015 -0500
--
rt/databinding/aegis/pom.xml| 8 ++
.../cxf/aegis/type/java5/AnnotationReader.java | 27 +---
2 files changed, 15 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/bf9c5e3d/rt/databinding/aegis/pom.xml
--
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 1b41535..8c3be18 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -30,6 +30,14 @@
version3.0.4-SNAPSHOT/version
relativePath../../../parent/pom.xml/relativePath
/parent
+
+properties
+cxf.osgi.import
+javax.xml.bind*;version=${cxf.osgi.javax.bind.version},
+javax.activation;version=${cxf.osgi.javax.activation.version},
+javax.xml.stream*;version=${cxf.osgi.javax.stream.version}
+/cxf.osgi.import
+/properties
dependencies
dependency
groupIdorg.apache.cxf/groupId
http://git-wip-us.apache.org/repos/asf/cxf/blob/bf9c5e3d/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
--
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
index bf06ed1..66299a0 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
@@ -21,26 +21,22 @@ package org.apache.cxf.aegis.type.java5;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.cxf.aegis.type.AegisType;
-import org.apache.cxf.common.logging.LogUtils;
public class AnnotationReader {
-private static final Logger LOG =
LogUtils.getL7dLogger(AnnotationReader.class);
-private static final Class? extends Annotation WEB_PARAM =
load(javax.jws.WebParam);
-private static final Class? extends Annotation WEB_RESULT =
load(javax.jws.WebResult);
+private static final Class? extends Annotation WEB_PARAM =
javax.jws.WebParam.class;
+private static final Class? extends Annotation WEB_RESULT =
javax.jws.WebResult.class;
private static final Class? extends Annotation XML_ATTRIBUTE =
-load(javax.xml.bind.annotation.XmlAttribute);
+javax.xml.bind.annotation.XmlAttribute.class;
private static final Class? extends Annotation XML_ELEMENT =
-load(javax.xml.bind.annotation.XmlElement);
+javax.xml.bind.annotation.XmlElement.class;
private static final Class? extends Annotation XML_SCHEMA =
-load(javax.xml.bind.annotation.XmlSchema);
+javax.xml.bind.annotation.XmlSchema.class;
private static final Class? extends Annotation XML_TYPE =
-load(javax.xml.bind.annotation.XmlType);
+javax.xml.bind.annotation.XmlType.class;
private static final Class? extends Annotation XML_TRANSIENT =
-load(javax.xml.bind.annotation.XmlTransient);
+javax.xml.bind.annotation.XmlTransient.class;
@SuppressWarnings(unchecked)
public boolean isIgnored(AnnotatedElement element) {
@@ -378,15 +374,6 @@ public class AnnotationReader {
return null;
}
-private static Class? extends Annotation load(String name) {
-try {
-return
AnnotationReader.class.getClassLoader().loadClass(name).asSubclass(Annotation.class);
-} catch (Throwable e) {
-LOG.log(Level.FINE, Error loading annotation class + name +
., e);
-return null;
-}
-}
-
public boolean isFlat(Annotation[] annotations) {
if (annotations != null) {
for (Annotation a : annotations) {
cxf git commit: [CXF-6227] Optimize conduit selection by making the address match faster
Repository: cxf
Updated Branches:
refs/heads/master bbcbac00d - daac77b18
[CXF-6227] Optimize conduit selection by making the address match faster
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/daac77b1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/daac77b1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/daac77b1
Branch: refs/heads/master
Commit: daac77b18e2693ef4ad424937aedc764229a63ee
Parents: bbcbac0
Author: Alessio Soldano asold...@redhat.com
Authored: Tue Feb 10 17:41:13 2015 +0100
Committer: Alessio Soldano asold...@redhat.com
Committed: Tue Feb 10 17:41:13 2015 +0100
--
.../cxf/endpoint/AbstractConduitSelector.java | 60
1 file changed, 49 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/daac77b1/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
--
diff --git
a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
index 7a3f989..7f1efb5 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
@@ -234,9 +234,7 @@ public abstract class AbstractConduitSelector implements
ConduitSelector, Closea
if (c != null) {
return c;
}
-boolean full = MessageUtils.getContextualBoolean(message,
-
CONDUIT_COMPARE_FULL_URL,
- false);
+ContextualBooleanGetter cbg = new ContextualBooleanGetter(message);
for (Conduit c2 : conduits) {
if (c2.getTarget() == null
|| c2.getTarget().getAddress() == null
@@ -253,14 +251,7 @@ public abstract class AbstractConduitSelector implements
ConduitSelector, Closea
actualAddress = messageAddress;
}
-if (!full) {
-int idx = conduitAddress.indexOf(':');
-conduitAddress = idx == -1 ? : conduitAddress.substring(0,
idx);
-idx = actualAddress.indexOf(':');
-actualAddress = idx == -1 ? : actualAddress.substring(0,
idx);
-}
-
-if (conduitAddress.equalsIgnoreCase(actualAddress)) {
+if (matchAddresses(conduitAddress, actualAddress, cbg)) {
return c2;
}
}
@@ -273,4 +264,51 @@ public abstract class AbstractConduitSelector implements
ConduitSelector, Closea
}
return null;
}
+
+private boolean matchAddresses(String conduitAddress, String
actualAddress, ContextualBooleanGetter cbg) {
+if (conduitAddress.length() == actualAddress.length()) {
+//let's be optimistic and try full comparison first, regardless of
CONDUIT_COMPARE_FULL_URL value,
+//which can be expensive to fetch; as a matter of fact, anyway, if
the addresses fully match,
+//their hosts also match
+if (conduitAddress.equalsIgnoreCase(actualAddress)) {
+return true;
+} else {
+return cbg.isFullComparison() ? false :
matchAddressSubstrings(conduitAddress, actualAddress);
+}
+} else {
+return cbg.isFullComparison() ? false :
matchAddressSubstrings(conduitAddress, actualAddress);
+}
+}
+
+//smart address substring comparison that tries to avoid building and
comparing substrings unless strictly required
+private boolean matchAddressSubstrings(String conduitAddress, String
actualAddress) {
+int idx = conduitAddress.indexOf(':');
+if (idx == actualAddress.indexOf(':')) {
+if (idx = 0) {
+return true;
+}
+conduitAddress = conduitAddress.substring(0, idx);
+actualAddress = actualAddress.substring(0, idx);
+return conduitAddress.equalsIgnoreCase(actualAddress);
+} else {
+//no possible match as for sure the substrings before idx will be
different
+return false;
+}
+}
+
+private static final class ContextualBooleanGetter {
+private Boolean value;
+private final Message message;
+
+public ContextualBooleanGetter(Message message) {
+this.message = message;
+}
+
+public boolean isFullComparison() {
+if (value == null) {
+value = MessageUtils.getContextualBoolean(message,
CONDUIT_COMPARE_FULL_URL, false);
+}
+return value;
+}
+}
}
cxf git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 58c15ecdf - 941e65f73
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/941e65f7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/941e65f7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/941e65f7
Branch: refs/heads/3.0.x-fixes
Commit: 941e65f73e0476a9f8ea8ee52a813d149e4225c0
Parents: 58c15ec
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Feb 10 16:24:27 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Feb 10 16:48:50 2015 +
--
.../org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/941e65f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
index 41b4dad..b5a0d97 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
@@ -116,6 +116,10 @@ public class CryptoCoverageChecker extends
AbstractSoapInterceptor {
// return
}
+if (message.getContent(SOAPMessage.class) == null) {
+throw new SoapFault(Error obtaining SOAP document,
Fault.FAULT_CODE_CLIENT);
+}
+
Element documentElement = null;
try {
SOAPMessage saajDoc = message.getContent(SOAPMessage.class);
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/58c15ecd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/58c15ecd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/58c15ecd Branch: refs/heads/3.0.x-fixes Commit: 58c15ecdf524bc8818c07c2ffbe0b96d95c209ac Parents: 3013b68 Author: Alessio Soldano asold...@redhat.com Authored: Tue Feb 10 17:46:25 2015 +0100 Committer: Alessio Soldano asold...@redhat.com Committed: Tue Feb 10 17:46:25 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/58c15ecd/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index b10514d..9b1a945 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -254,6 +254,7 @@ M cda58270486b4d394b98a1a1a1d5bfcb366af2c1 M d2dec5b87788b8cb5059d3719cf3dfd7135a1280 M d4a35c40d53fde17fec3d08c25215c7533dcb667 M d5315e072b8dd5222ede6f8e47c1e3e645209f59 +M daac77b18e2693ef4ad424937aedc764229a63ee M e2225709c37cb289b99db015b3d8ba5b9b317615 M e2ad037fbc74f42655ac968415fcb4bded87bb38 M e47e394114d6a3bf06401960618e6bd556a904d7
cxf git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/master 4c9cc32f7 - bbcbac00d
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bbcbac00
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bbcbac00
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bbcbac00
Branch: refs/heads/master
Commit: bbcbac00dd7a1bf5f0c68f9a77dae1497d969167
Parents: 4c9cc32
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Feb 10 16:24:27 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Feb 10 16:24:50 2015 +
--
.../org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/bbcbac00/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
index 41b4dad..b5a0d97 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
@@ -116,6 +116,10 @@ public class CryptoCoverageChecker extends
AbstractSoapInterceptor {
// return
}
+if (message.getContent(SOAPMessage.class) == null) {
+throw new SoapFault(Error obtaining SOAP document,
Fault.FAULT_CODE_CLIENT);
+}
+
Element documentElement = null;
try {
SOAPMessage saajDoc = message.getContent(SOAPMessage.class);
[1/2] cxf git commit: [CXF-6227] Optimize conduit selection by making the address match faster
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 735178174 - 58c15ecdf
[CXF-6227] Optimize conduit selection by making the address match faster
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3013b681
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3013b681
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3013b681
Branch: refs/heads/3.0.x-fixes
Commit: 3013b681ec60e670c5e862d34bb060fc2e3b0732
Parents: 7351781
Author: Alessio Soldano asold...@redhat.com
Authored: Tue Feb 10 17:41:13 2015 +0100
Committer: Alessio Soldano asold...@redhat.com
Committed: Tue Feb 10 17:45:49 2015 +0100
--
.../cxf/endpoint/AbstractConduitSelector.java | 60
1 file changed, 49 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3013b681/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
--
diff --git
a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
index 7a3f989..7f1efb5 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
@@ -234,9 +234,7 @@ public abstract class AbstractConduitSelector implements
ConduitSelector, Closea
if (c != null) {
return c;
}
-boolean full = MessageUtils.getContextualBoolean(message,
-
CONDUIT_COMPARE_FULL_URL,
- false);
+ContextualBooleanGetter cbg = new ContextualBooleanGetter(message);
for (Conduit c2 : conduits) {
if (c2.getTarget() == null
|| c2.getTarget().getAddress() == null
@@ -253,14 +251,7 @@ public abstract class AbstractConduitSelector implements
ConduitSelector, Closea
actualAddress = messageAddress;
}
-if (!full) {
-int idx = conduitAddress.indexOf(':');
-conduitAddress = idx == -1 ? : conduitAddress.substring(0,
idx);
-idx = actualAddress.indexOf(':');
-actualAddress = idx == -1 ? : actualAddress.substring(0,
idx);
-}
-
-if (conduitAddress.equalsIgnoreCase(actualAddress)) {
+if (matchAddresses(conduitAddress, actualAddress, cbg)) {
return c2;
}
}
@@ -273,4 +264,51 @@ public abstract class AbstractConduitSelector implements
ConduitSelector, Closea
}
return null;
}
+
+private boolean matchAddresses(String conduitAddress, String
actualAddress, ContextualBooleanGetter cbg) {
+if (conduitAddress.length() == actualAddress.length()) {
+//let's be optimistic and try full comparison first, regardless of
CONDUIT_COMPARE_FULL_URL value,
+//which can be expensive to fetch; as a matter of fact, anyway, if
the addresses fully match,
+//their hosts also match
+if (conduitAddress.equalsIgnoreCase(actualAddress)) {
+return true;
+} else {
+return cbg.isFullComparison() ? false :
matchAddressSubstrings(conduitAddress, actualAddress);
+}
+} else {
+return cbg.isFullComparison() ? false :
matchAddressSubstrings(conduitAddress, actualAddress);
+}
+}
+
+//smart address substring comparison that tries to avoid building and
comparing substrings unless strictly required
+private boolean matchAddressSubstrings(String conduitAddress, String
actualAddress) {
+int idx = conduitAddress.indexOf(':');
+if (idx == actualAddress.indexOf(':')) {
+if (idx = 0) {
+return true;
+}
+conduitAddress = conduitAddress.substring(0, idx);
+actualAddress = actualAddress.substring(0, idx);
+return conduitAddress.equalsIgnoreCase(actualAddress);
+} else {
+//no possible match as for sure the substrings before idx will be
different
+return false;
+}
+}
+
+private static final class ContextualBooleanGetter {
+private Boolean value;
+private final Message message;
+
+public ContextualBooleanGetter(Message message) {
+this.message = message;
+}
+
+public boolean isFullComparison() {
+if (value == null) {
+value = MessageUtils.getContextualBoolean(message,
CONDUIT_COMPARE_FULL_URL, false);
+}
+return value;
+}
+
cxf git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 90f90cbe8 - 30da37246
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/30da3724
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30da3724
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30da3724
Branch: refs/heads/2.7.x-fixes
Commit: 30da372466c6e1372c6137b14db0ca67296d8078
Parents: 90f90cb
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Feb 10 16:24:27 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Feb 10 16:49:31 2015 +
--
.../org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/30da3724/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
index 8f67b5c..1e66069 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
@@ -124,6 +124,10 @@ public class CryptoCoverageChecker extends
AbstractSoapInterceptor {
// return
}
+if (message.getContent(SOAPMessage.class) == null) {
+throw new SoapFault(Error obtaining SOAP document,
Fault.FAULT_CODE_CLIENT);
+}
+
Element documentElement = null;
try {
SOAPMessage saajDoc = message.getContent(SOAPMessage.class);
cxf git commit: [CXF-6250] WebSocket conduit fails to process String based responses and throws NPE
Repository: cxf
Updated Branches:
refs/heads/master daac77b18 - c1a43f2e6
[CXF-6250] WebSocket conduit fails to process String based responses and throws
NPE
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c1a43f2e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c1a43f2e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c1a43f2e
Branch: refs/heads/master
Commit: c1a43f2e6593c7dbf3b7a40e6533e37fee2ef9a9
Parents: daac77b
Author: Akitoshi Yoshida a...@apache.org
Authored: Tue Feb 10 17:37:59 2015 +0100
Committer: Akitoshi Yoshida a...@apache.org
Committed: Tue Feb 10 18:46:47 2015 +0100
--
.../websocket/ahc/AhcWebSocketConduit.java | 10 ++-
.../websocket/ahc/AhcWebSocketConduitTest.java | 72
2 files changed, 81 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1a43f2e/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
--
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
index d6ef890..897b0d1 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
@@ -447,7 +447,15 @@ public class AhcWebSocketConduit extends
URLConnectionHTTPConduit {
}
private int length(Object o) {
-return o instanceof char[] ? ((String)o).length() : (o instanceof
byte[] ? ((byte[])o).length : 0);
+if (o instanceof String) {
+return ((String)o).length();
+} else if (o instanceof char[]) {
+return ((char[])o).length;
+} else if (o instanceof byte[]) {
+return ((byte[])o).length;
+} else {
+return 0;
+}
}
private int getchar(Object o, int p) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1a43f2e/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
--
diff --git
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
new file mode 100644
index 000..5508fbd
--- /dev/null
+++
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduitTest.java
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.transport.websocket.ahc;
+
+import org.apache.cxf.transport.websocket.WebSocketConstants;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class AhcWebSocketConduitTest extends Assert {
+private static final String TEST_RESPONSE1 =
+200\r\nresponseId:
59610eed-d9de-4692-96d4-bb95a36c41ea\r\nContent-Type: text/plain\r\n\r\nHola!;
+private static final String TEST_RESPONSE2 =
+responseId: 59610eed-d9de-4692-96d4-bb95a36c41ea\r\n\r\nNada!;
+
+@Test
+public void testResponseParsing() throws Exception {
+
+// with all the headers using type string
+AhcWebSocketConduit.Response resp =
+new
AhcWebSocketConduit.Response(WebSocketConstants.DEFAULT_RESPONSE_ID_KEY,
TEST_RESPONSE1);
+assertEquals(200, resp.getStatusCode());
+assertEquals(59610eed-d9de-4692-96d4-bb95a36c41ea, resp.getId());
+assertEquals(text/plain, resp.getContentType());
+assertTrue(resp.getEntity() instanceof String);
+assertEquals(Hola!, resp.getEntity());
+
+// with all the heaers using type byte[]
+resp = new
cxf git commit: [CXF-6085] Prototyping the actual JweJson producer code, using the patch from Daniel Torkian as the input
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 6c6acecbc - bcec16a62
[CXF-6085] Prototyping the actual JweJson producer code, using the patch from
Daniel Torkian as the input
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bcec16a6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bcec16a6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bcec16a6
Branch: refs/heads/3.0.x-fixes
Commit: bcec16a62c6f0ec665a93f3e3960761fc41dedff
Parents: 6c6acec
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Feb 10 13:34:31 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Feb 10 13:36:16 2015 +
--
.../jose/jaxrs/JweWriterInterceptor.java| 4 +-
.../jose/jwe/AbstractJweEncryption.java | 39 +++--
.../security/jose/jwe/JweEncryptionInput.java | 60 +++
.../jose/jwe/JweEncryptionProvider.java | 8 +-
.../jose/jwe/JweJsonEncryptionEntry.java| 56 +++
.../rs/security/jose/jwe/JweJsonProducer.java | 168 +++
6 files changed, 314 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/bcec16a6/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
index ca4f5c9..7291edd 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
@@ -35,6 +35,7 @@ import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.rs.security.jose.JoseConstants;
import org.apache.cxf.rs.security.jose.jwe.JweCompactProducer;
+import org.apache.cxf.rs.security.jose.jwe.JweEncryptionInput;
import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
import org.apache.cxf.rs.security.jose.jwe.JweEncryptionState;
import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
@@ -70,7 +71,8 @@ public class JweWriterInterceptor implements
WriterInterceptor {
}
if (useJweOutputStream) {
-JweEncryptionState encryption =
theEncryptionProvider.createJweEncryptionState(jweHeaders, null);
+JweEncryptionState encryption =
+theEncryptionProvider.createJweEncryptionState(new
JweEncryptionInput(jweHeaders));
try {
JweCompactProducer.startJweContent(actualOs,
encryption.getHeaders(),
http://git-wip-us.apache.org/repos/asf/cxf/blob/bcec16a6/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index 9103ecf..e0d7cf6 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -107,8 +107,8 @@ public abstract class AbstractJweEncryption implements
JweEncryptionProvider {
return writer;
}
@Override
-public JweEncryptionState createJweEncryptionState(JweHeaders jweHeaders,
byte[] aad) {
-JweEncryptionInternal state = getInternalState(jweHeaders, aad);
+public JweEncryptionState createJweEncryptionState(JweEncryptionInput
jweInput) {
+JweEncryptionInternal state =
getInternalState(jweInput.getJweHeaders(), jweInput);
Cipher c = CryptoUtils.initCipher(createCekSecretKey(state),
state.keyProps,
Cipher.ENCRYPT_MODE);
return new JweEncryptionState(c,
@@ -130,7 +130,7 @@ public abstract class AbstractJweEncryption implements
JweEncryptionProvider {
return theCek;
}
-private JweEncryptionInternal getInternalState(JweHeaders jweHeaders,
byte[] aad) {
+private JweEncryptionInternal getInternalState(JweHeaders jweInHeaders,
JweEncryptionInput jweInput) {
JweHeaders theHeaders = new JweHeaders();
if (getKeyAlgorithm() != null) {
theHeaders.setKeyEncryptionAlgorithm(getKeyAlgorithm());
@@ -138,33 +138,35 @@ public abstract class AbstractJweEncryption implements
JweEncryptionProvider {
cxf git commit: Adding a disabled JAXRSAsyncTest
Repository: cxf
Updated Branches:
refs/heads/master 824234e62 - 4c9cc32f7
Adding a disabled JAXRSAsyncTest
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4c9cc32f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4c9cc32f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4c9cc32f
Branch: refs/heads/master
Commit: 4c9cc32f7bba136b3970c91f15a7f24c94c94c89
Parents: 824234e
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Feb 10 16:06:51 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Feb 10 16:06:51 2015 +
--
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 36 +++-
.../jaxrs/JAXRSClientServerBookTest.java| 27 +++
2 files changed, 62 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c9cc32f/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 225743c..7bd8d27 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import java.net.ConnectException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -32,6 +33,9 @@ import java.util.concurrent.Future;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.InvocationCallback;
import javax.ws.rs.client.ResponseProcessingException;
@@ -48,6 +52,7 @@ import
org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
@@ -68,7 +73,6 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
Thread.sleep(Long.valueOf(property));
}
}
-
@Test
public void testRetrieveBookCustomMethodAsyncSync() throws Exception {
String address = http://localhost:; + PORT + /bookstore/retrieve;
@@ -126,6 +130,26 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
}
@Test
+@Ignore
+public void testNonExistent() throws Exception {
+String address = http://localhost/bookstore;;
+ListObject providers = new ArrayListObject();
+providers.add(new TestResponseFilter());
+WebClient wc = WebClient.create(address, providers);
+FutureBook future = wc.async().get(Book.class);
+try {
+future.get();
+fail(Exception expected);
+} catch (ExecutionException ex) {
+Throwable cause = ex.getCause();
+assertTrue(cause instanceof ProcessingException);
+assertTrue(ex.getCause().getCause() instanceof ConnectException);
+} finally {
+wc.close();
+}
+}
+
+@Test
public void testPostBookProcessingException() throws Exception {
String address = http://localhost:; + PORT + /bookstore/;
ListObject providers = new ArrayListObject();
@@ -231,4 +255,14 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
}
+public static class TestResponseFilter implements ClientResponseFilter {
+
+@Override
+public void filter(ClientRequestContext requestContext,
ClientResponseContext responseContext)
+throws IOException {
+// TODO Auto-generated method stub
+
+}
+
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c9cc32f/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index fde6d40..2dd23ab 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
cxf git commit: [CXF-6251] Allowing system property for message logging to do pretty printing This closes #53
Repository: cxf
Updated Branches:
refs/heads/master 26aaa5997 - fe5eedda5
[CXF-6251] Allowing system property for message logging to do pretty printing
This closes #53
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe5eedda
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe5eedda
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe5eedda
Branch: refs/heads/master
Commit: fe5eedda59947924259ec3ce801f6905b9c5a010
Parents: 26aaa59
Author: Kyle Lape kyle.l...@redhat.com
Authored: Sun Feb 8 18:52:46 2015 -0800
Committer: Daniel Kulp dk...@apache.org
Committed: Tue Feb 10 16:51:25 2015 -0500
--
.../cxf/bus/extension/ExtensionManagerBus.java | 29 ++--
1 file changed, 21 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/fe5eedda/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
--
diff --git
a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index 0478279..909ed8a 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -61,19 +61,28 @@ import org.apache.cxf.transport.DestinationFactoryManager;
public class ExtensionManagerBus extends AbstractBasicInterceptorProvider
implements Bus {
public static final String BUS_PROPERTY_NAME = bus;
static final boolean FORCE_LOGGING;
+static final boolean FORCE_PRETTY;
static {
boolean b = false;
+boolean pretty = false;
try {
-b = Boolean.getBoolean(org.apache.cxf.logging.enabled);
-//treat these all the same
-b |=
Boolean.getBoolean(com.sun.xml.ws.transport.local.LocalTransportPipe.dump);
-b |=
Boolean.getBoolean(com.sun.xml.ws.util.pipe.StandaloneTubeAssembler.dump);
-b |=
Boolean.getBoolean(com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump);
-b |=
Boolean.getBoolean(com.sun.xml.ws.transport.http.HttpAdapter.dump);
+String prop = System.getProperty(org.apache.cxf.logging.enabled,
false);
+if (pretty.equals(prop)) {
+b = true;
+pretty = true;
+} else {
+b = Boolean.parseBoolean(prop);
+//treat these all the same
+b |=
Boolean.getBoolean(com.sun.xml.ws.transport.local.LocalTransportPipe.dump);
+b |=
Boolean.getBoolean(com.sun.xml.ws.util.pipe.StandaloneTubeAssembler.dump);
+b |=
Boolean.getBoolean(com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump);
+b |=
Boolean.getBoolean(com.sun.xml.ws.transport.http.HttpAdapter.dump);
+}
} catch (Throwable t) {
//ignore
}
FORCE_LOGGING = b;
+FORCE_PRETTY = pretty;
}
private static final String BUS_ID_PROPERTY_NAME = org.apache.cxf.bus.id;
@@ -102,7 +111,9 @@ public class ExtensionManagerBus extends
AbstractBasicInterceptorProvider implem
CXFBusFactory.possiblySetDefaultBus(this);
if (FORCE_LOGGING) {
-features.add(new LoggingFeature());
+LoggingFeature feature = new LoggingFeature();
+feature.setPrettyLogging(FORCE_PRETTY);
+features.add(feature);
}
if (null == properties) {
properties = new HashMapString, Object();
@@ -345,7 +356,9 @@ public class ExtensionManagerBus extends
AbstractBasicInterceptorProvider implem
this.features.clear();
this.features.addAll(features);
if (FORCE_LOGGING) {
-this.features.add(new LoggingFeature());
+LoggingFeature feature = new LoggingFeature();
+feature.setPrettyLogging(FORCE_PRETTY);
+this.features.add(feature);
}
if (state == BusState.RUNNING) {
initializeFeatures();
[2/2] cxf git commit: [CXF-6251] Allowing system property for message logging to do pretty printing This closes #53
[CXF-6251] Allowing system property for message logging to do pretty printing
This closes #53
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/48084ffd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/48084ffd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/48084ffd
Branch: refs/heads/3.0.x-fixes
Commit: 48084ffd0625178e758c52ffcf2b695206ef8015
Parents: d2a0c47
Author: Kyle Lape kyle.l...@redhat.com
Authored: Sun Feb 8 18:52:46 2015 -0800
Committer: Daniel Kulp dk...@apache.org
Committed: Tue Feb 10 16:53:46 2015 -0500
--
.../cxf/bus/extension/ExtensionManagerBus.java | 29 ++--
1 file changed, 21 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/48084ffd/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
--
diff --git
a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index 0478279..909ed8a 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -61,19 +61,28 @@ import org.apache.cxf.transport.DestinationFactoryManager;
public class ExtensionManagerBus extends AbstractBasicInterceptorProvider
implements Bus {
public static final String BUS_PROPERTY_NAME = bus;
static final boolean FORCE_LOGGING;
+static final boolean FORCE_PRETTY;
static {
boolean b = false;
+boolean pretty = false;
try {
-b = Boolean.getBoolean(org.apache.cxf.logging.enabled);
-//treat these all the same
-b |=
Boolean.getBoolean(com.sun.xml.ws.transport.local.LocalTransportPipe.dump);
-b |=
Boolean.getBoolean(com.sun.xml.ws.util.pipe.StandaloneTubeAssembler.dump);
-b |=
Boolean.getBoolean(com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump);
-b |=
Boolean.getBoolean(com.sun.xml.ws.transport.http.HttpAdapter.dump);
+String prop = System.getProperty(org.apache.cxf.logging.enabled,
false);
+if (pretty.equals(prop)) {
+b = true;
+pretty = true;
+} else {
+b = Boolean.parseBoolean(prop);
+//treat these all the same
+b |=
Boolean.getBoolean(com.sun.xml.ws.transport.local.LocalTransportPipe.dump);
+b |=
Boolean.getBoolean(com.sun.xml.ws.util.pipe.StandaloneTubeAssembler.dump);
+b |=
Boolean.getBoolean(com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump);
+b |=
Boolean.getBoolean(com.sun.xml.ws.transport.http.HttpAdapter.dump);
+}
} catch (Throwable t) {
//ignore
}
FORCE_LOGGING = b;
+FORCE_PRETTY = pretty;
}
private static final String BUS_ID_PROPERTY_NAME = org.apache.cxf.bus.id;
@@ -102,7 +111,9 @@ public class ExtensionManagerBus extends
AbstractBasicInterceptorProvider implem
CXFBusFactory.possiblySetDefaultBus(this);
if (FORCE_LOGGING) {
-features.add(new LoggingFeature());
+LoggingFeature feature = new LoggingFeature();
+feature.setPrettyLogging(FORCE_PRETTY);
+features.add(feature);
}
if (null == properties) {
properties = new HashMapString, Object();
@@ -345,7 +356,9 @@ public class ExtensionManagerBus extends
AbstractBasicInterceptorProvider implem
this.features.clear();
this.features.addAll(features);
if (FORCE_LOGGING) {
-this.features.add(new LoggingFeature());
+LoggingFeature feature = new LoggingFeature();
+feature.setPrettyLogging(FORCE_PRETTY);
+this.features.add(feature);
}
if (state == BusState.RUNNING) {
initializeFeatures();
cxf git commit: [CXF-6096] add jcl-sl4j as a normal dep so users don't need to do funky things for the async stuff to work
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 01c77bd95 - d2a0c476b [CXF-6096] add jcl-sl4j as a normal dep so users don't need to do funky things for the async stuff to work Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d2a0c476 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d2a0c476 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d2a0c476 Branch: refs/heads/3.0.x-fixes Commit: d2a0c476b9d473178904b7d511e41313ddb86afe Parents: 01c77bd Author: Daniel Kulp dk...@apache.org Authored: Tue Feb 10 16:28:46 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Tue Feb 10 16:48:06 2015 -0500 -- rt/transports/http-hc/pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/d2a0c476/rt/transports/http-hc/pom.xml -- diff --git a/rt/transports/http-hc/pom.xml b/rt/transports/http-hc/pom.xml index 02c652a..1aa68dd 100644 --- a/rt/transports/http-hc/pom.xml +++ b/rt/transports/http-hc/pom.xml @@ -82,7 +82,6 @@ dependency groupIdorg.slf4j/groupId artifactIdjcl-over-slf4j/artifactId -scopetest/scope /dependency dependency groupIdorg.apache.httpcomponents/groupId
cxf git commit: [CXF-6096] add jcl-sl4j as a normal dep so users don't need to do funky things for the async stuff to work
Repository: cxf Updated Branches: refs/heads/master c1a43f2e6 - 26aaa5997 [CXF-6096] add jcl-sl4j as a normal dep so users don't need to do funky things for the async stuff to work Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/26aaa599 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/26aaa599 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/26aaa599 Branch: refs/heads/master Commit: 26aaa59970240dbee7b364d2c404fd2a796f027b Parents: c1a43f2 Author: Daniel Kulp dk...@apache.org Authored: Tue Feb 10 16:28:46 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Tue Feb 10 16:29:52 2015 -0500 -- rt/transports/http-hc/pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/26aaa599/rt/transports/http-hc/pom.xml -- diff --git a/rt/transports/http-hc/pom.xml b/rt/transports/http-hc/pom.xml index f84ace0..52abc55 100644 --- a/rt/transports/http-hc/pom.xml +++ b/rt/transports/http-hc/pom.xml @@ -82,7 +82,6 @@ dependency groupIdorg.slf4j/groupId artifactIdjcl-over-slf4j/artifactId -scopetest/scope /dependency dependency groupIdorg.apache.httpcomponents/groupId
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes d2a0c476b - 491424b20 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/491424b2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/491424b2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/491424b2 Branch: refs/heads/3.0.x-fixes Commit: 491424b20127a2147aa78c5657ec542fdf786e8b Parents: 48084ff Author: Daniel Kulp dk...@apache.org Authored: Tue Feb 10 16:53:46 2015 -0500 Committer: Daniel Kulp dk...@apache.org Committed: Tue Feb 10 16:53:46 2015 -0500 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/491424b2/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 9b1a945..d6c344a 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -266,4 +266,5 @@ M eb9e13e2dd4a22b1d777095a5d92139829d550b8 M efaf05170b4f76ad61ff423e30ece58bdd226ae5 M f02b02934bf78504ffc462c364dc43e386e727b2 M fb0520525f07041f42bc0562b4a15240bb757373 +M fe5eedda59947924259ec3ce801f6905b9c5a010 M fe611ce66d8d2b82cba0b48c3e9f5406da8b38ed
cxf git commit: [CXF-6252] Initial support for handling async connect exceptions
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 491424b20 - 272b8533f
[CXF-6252] Initial support for handling async connect exceptions
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/272b8533
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/272b8533
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/272b8533
Branch: refs/heads/3.0.x-fixes
Commit: 272b8533f84653a9da0d462600d64dd3c44829f3
Parents: 491424b
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Feb 10 22:16:36 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Feb 10 22:24:15 2015 +
--
.../apache/cxf/jaxrs/client/AbstractClient.java | 32 +-
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 35 +++-
2 files changed, 50 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/272b8533/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index a745d77..f87498d 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
+import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.text.SimpleDateFormat;
@@ -83,6 +84,7 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseChainCache;
import org.apache.cxf.phase.PhaseInterceptorChain;
@@ -860,15 +862,12 @@ public abstract class AbstractClient implements Client {
}
protected static MessageObserver setupInFaultObserver(final
ClientConfiguration cfg) {
-if (!cfg.getInFaultInterceptors().isEmpty()) {
-return new InFaultChainInitiatorObserver(cfg.getBus()) {
-protected void initializeInterceptors(Exchange ex,
PhaseInterceptorChain chain) {
-chain.add(cfg.getInFaultInterceptors());
-}
-};
-} else {
-return null;
-}
+return new InFaultChainInitiatorObserver(cfg.getBus()) {
+protected void initializeInterceptors(Exchange ex,
PhaseInterceptorChain chain) {
+chain.add(cfg.getInFaultInterceptors());
+chain.add(new ConnectionFaultInterceptor());
+}
+};
}
protected void setSupportOnewayResponseProperty(Message outMessage) {
@@ -1059,4 +1058,19 @@ public abstract class AbstractClient implements Client {
}
}
+private static class ConnectionFaultInterceptor extends
AbstractPhaseInterceptorMessage {
+public ConnectionFaultInterceptor() {
+super(Phase.PRE_STREAM);
+}
+
+public void handleMessage(Message message) throws Fault {
+Exception ex = message.getContent(Exception.class);
+if (!message.getExchange().isSynchronous()
+ ex instanceof ConnectException) {
+//TODO: make sure it works with the failover feature
+JaxrsClientCallback? cb =
message.getExchange().get(JaxrsClientCallback.class);
+cb.handleException(message, new ProcessingException(ex));
+}
+}
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/272b8533/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 225743c..b870f45 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -68,8 +68,8 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
Thread.sleep(Long.valueOf(property));
}
}
-
-@Test
+
+//@Test
public void testRetrieveBookCustomMethodAsyncSync() throws Exception {
String address = http://localhost:; + PORT +
cxf git commit: [CXF-6252] Initial support for handling async connect exceptions
Repository: cxf
Updated Branches:
refs/heads/master fe5eedda5 - 0cb64ee2b
[CXF-6252] Initial support for handling async connect exceptions
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0cb64ee2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0cb64ee2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0cb64ee2
Branch: refs/heads/master
Commit: 0cb64ee2bb66e4249c4a0f8d7ae62068e2a95dcd
Parents: fe5eedd
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Feb 10 22:16:36 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Feb 10 22:16:36 2015 +
--
.../apache/cxf/jaxrs/client/AbstractClient.java | 32 ++--
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 18 +--
2 files changed, 31 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0cb64ee2/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index a745d77..f87498d 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
+import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.text.SimpleDateFormat;
@@ -83,6 +84,7 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseChainCache;
import org.apache.cxf.phase.PhaseInterceptorChain;
@@ -860,15 +862,12 @@ public abstract class AbstractClient implements Client {
}
protected static MessageObserver setupInFaultObserver(final
ClientConfiguration cfg) {
-if (!cfg.getInFaultInterceptors().isEmpty()) {
-return new InFaultChainInitiatorObserver(cfg.getBus()) {
-protected void initializeInterceptors(Exchange ex,
PhaseInterceptorChain chain) {
-chain.add(cfg.getInFaultInterceptors());
-}
-};
-} else {
-return null;
-}
+return new InFaultChainInitiatorObserver(cfg.getBus()) {
+protected void initializeInterceptors(Exchange ex,
PhaseInterceptorChain chain) {
+chain.add(cfg.getInFaultInterceptors());
+chain.add(new ConnectionFaultInterceptor());
+}
+};
}
protected void setSupportOnewayResponseProperty(Message outMessage) {
@@ -1059,4 +1058,19 @@ public abstract class AbstractClient implements Client {
}
}
+private static class ConnectionFaultInterceptor extends
AbstractPhaseInterceptorMessage {
+public ConnectionFaultInterceptor() {
+super(Phase.PRE_STREAM);
+}
+
+public void handleMessage(Message message) throws Fault {
+Exception ex = message.getContent(Exception.class);
+if (!message.getExchange().isSynchronous()
+ ex instanceof ConnectException) {
+//TODO: make sure it works with the failover feature
+JaxrsClientCallback? cb =
message.getExchange().get(JaxrsClientCallback.class);
+cb.handleException(message, new ProcessingException(ex));
+}
+}
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/0cb64ee2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 7bd8d27..40d38ce 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -52,7 +52,6 @@ import
org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
@@ -73,7 +72,7 @@ public class JAXRSAsyncClientTest extends
cxf git commit: [CXF-6252] Reenabling all of JAXRSAsyncClientTest tests
Repository: cxf
Updated Branches:
refs/heads/master 0cb64ee2b - 6d7ab22d5
[CXF-6252] Reenabling all of JAXRSAsyncClientTest tests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6d7ab22d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6d7ab22d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6d7ab22d
Branch: refs/heads/master
Commit: 6d7ab22d5adcd15bfa3a086345a0b5851fe3e2b2
Parents: 0cb64ee
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Feb 10 22:21:49 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Feb 10 22:21:49 2015 +
--
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d7ab22d/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 40d38ce..fe9a81b 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -72,7 +72,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
Thread.sleep(Long.valueOf(property));
}
}
-//@Test
+@Test
public void testRetrieveBookCustomMethodAsyncSync() throws Exception {
String address = http://localhost:; + PORT + /bookstore/retrieve;
WebClient wc = WebClient.create(address);
@@ -83,7 +83,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testDeleteWithBody() throws Exception {
String address = http://localhost:; + PORT + /bookstore/deletebody;
WebClient wc = WebClient.create(address);
@@ -94,7 +94,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testRetrieveBookCustomMethodAsync() throws Exception {
String address = http://localhost:; + PORT + /bookstore/retrieve;
WebClient wc = WebClient.create(address);
@@ -105,7 +105,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testGetBookAsyncResponse404() throws Exception {
String address = http://localhost:; + PORT +
/bookstore/bookheaders/404;
WebClient wc = createWebClient(address);
@@ -114,7 +114,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testGetBookAsync404() throws Exception {
String address = http://localhost:; + PORT +
/bookstore/bookheaders/404;
WebClient wc = createWebClient(address);
@@ -147,7 +147,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
}
}
-//@Test
+@Test
public void testPostBookProcessingException() throws Exception {
String address = http://localhost:; + PORT + /bookstore/;
ListObject providers = new ArrayListObject();
@@ -164,7 +164,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testGetBookResponseProcessingException() throws Exception {
String address = http://localhost:; + PORT + /bookstore/books/123;
ListObject providers = new ArrayListObject();
@@ -181,7 +181,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testGetBookAsync404Callback() throws Exception {
String address = http://localhost:; + PORT +
/bookstore/bookheaders/404;
WebClient wc = createWebClient(address);
cxf git commit: [CXF-6252] Reenabling all of JAXRSAsyncClientTest tests
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 272b8533f - 28e7c51cf
[CXF-6252] Reenabling all of JAXRSAsyncClientTest tests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/28e7c51c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/28e7c51c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/28e7c51c
Branch: refs/heads/3.0.x-fixes
Commit: 28e7c51cfa9e2548600151669f8896af20bce293
Parents: 272b853
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Feb 10 22:21:49 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Feb 10 22:26:26 2015 +
--
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/28e7c51c/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index b870f45..b46d054 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -69,7 +69,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
}
}
-//@Test
+@Test
public void testRetrieveBookCustomMethodAsyncSync() throws Exception {
String address = http://localhost:; + PORT + /bookstore/retrieve;
WebClient wc = WebClient.create(address);
@@ -80,7 +80,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testDeleteWithBody() throws Exception {
String address = http://localhost:; + PORT + /bookstore/deletebody;
WebClient wc = WebClient.create(address);
@@ -91,7 +91,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testRetrieveBookCustomMethodAsync() throws Exception {
String address = http://localhost:; + PORT + /bookstore/retrieve;
WebClient wc = WebClient.create(address);
@@ -102,7 +102,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testGetBookAsyncResponse404() throws Exception {
String address = http://localhost:; + PORT +
/bookstore/bookheaders/404;
WebClient wc = createWebClient(address);
@@ -111,7 +111,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testGetBookAsync404() throws Exception {
String address = http://localhost:; + PORT +
/bookstore/bookheaders/404;
WebClient wc = createWebClient(address);
@@ -144,7 +144,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
}
}
-//@Test
+@Test
public void testPostBookProcessingException() throws Exception {
String address = http://localhost:; + PORT + /bookstore/;
ListObject providers = new ArrayListObject();
@@ -161,7 +161,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testGetBookResponseProcessingException() throws Exception {
String address = http://localhost:; + PORT + /bookstore/books/123;
ListObject providers = new ArrayListObject();
@@ -178,7 +178,7 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
wc.close();
}
-//@Test
+@Test
public void testGetBookAsync404Callback() throws Exception {
String address = http://localhost:; + PORT +
/bookstore/bookheaders/404;
WebClient wc = createWebClient(address);
cxf git commit: [CXF-6246] Classes are in every version of the JDK we support, just use them directly.
Repository: cxf
Updated Branches:
refs/heads/master 8891549dc - 824234e62
[CXF-6246] Classes are in every version of the JDK we support, just use them
directly.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/824234e6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/824234e6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/824234e6
Branch: refs/heads/master
Commit: 824234e627f6205129b7f97e2fde7f1cf1f17093
Parents: 8891549
Author: Daniel Kulp dk...@apache.org
Authored: Tue Feb 10 09:14:28 2015 -0500
Committer: Daniel Kulp dk...@apache.org
Committed: Tue Feb 10 09:18:09 2015 -0500
--
rt/databinding/aegis/pom.xml| 8 ++
.../cxf/aegis/type/java5/AnnotationReader.java | 27 +---
2 files changed, 15 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/824234e6/rt/databinding/aegis/pom.xml
--
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 83a6df3..59729e2 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -30,6 +30,14 @@
version3.1.0-SNAPSHOT/version
relativePath../../../parent/pom.xml/relativePath
/parent
+
+properties
+cxf.osgi.import
+javax.xml.bind*;version=${cxf.osgi.javax.bind.version},
+javax.activation;version=${cxf.osgi.javax.activation.version},
+javax.xml.stream*;version=${cxf.osgi.javax.stream.version}
+/cxf.osgi.import
+/properties
dependencies
dependency
groupIdorg.apache.cxf/groupId
http://git-wip-us.apache.org/repos/asf/cxf/blob/824234e6/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
--
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
index 56f6a7e..d4fcb5a 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
@@ -21,26 +21,22 @@ package org.apache.cxf.aegis.type.java5;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.cxf.aegis.type.AegisType;
-import org.apache.cxf.common.logging.LogUtils;
public class AnnotationReader {
-private static final Logger LOG =
LogUtils.getL7dLogger(AnnotationReader.class);
-private static final Class? extends Annotation WEB_PARAM =
load(javax.jws.WebParam);
-private static final Class? extends Annotation WEB_RESULT =
load(javax.jws.WebResult);
+private static final Class? extends Annotation WEB_PARAM =
javax.jws.WebParam.class;
+private static final Class? extends Annotation WEB_RESULT =
javax.jws.WebResult.class;
private static final Class? extends Annotation XML_ATTRIBUTE =
-load(javax.xml.bind.annotation.XmlAttribute);
+javax.xml.bind.annotation.XmlAttribute.class;
private static final Class? extends Annotation XML_ELEMENT =
-load(javax.xml.bind.annotation.XmlElement);
+javax.xml.bind.annotation.XmlElement.class;
private static final Class? extends Annotation XML_SCHEMA =
-load(javax.xml.bind.annotation.XmlSchema);
+javax.xml.bind.annotation.XmlSchema.class;
private static final Class? extends Annotation XML_TYPE =
-load(javax.xml.bind.annotation.XmlType);
+javax.xml.bind.annotation.XmlType.class;
private static final Class? extends Annotation XML_TRANSIENT =
-load(javax.xml.bind.annotation.XmlTransient);
+javax.xml.bind.annotation.XmlTransient.class;
public boolean isIgnored(AnnotatedElement element) {
return isAnnotationPresent(element,
@@ -362,15 +358,6 @@ public class AnnotationReader {
return null;
}
-private static Class? extends Annotation load(String name) {
-try {
-return
AnnotationReader.class.getClassLoader().loadClass(name).asSubclass(Annotation.class);
-} catch (Throwable e) {
-LOG.log(Level.FINE, Error loading annotation class + name +
., e);
-return null;
-}
-}
-
public boolean isFlat(Annotation[] annotations) {
if (annotations != null) {
for (Annotation a : annotations) {
