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/03/27 18:23:05 UTC
[1/3] cxf git commit: [CXF-4821] Find the invoke method on the
provider implementation class directly
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 449e39521 -> 6b2066573
[CXF-4821] Find the invoke method on the provider implementation class directly
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a6b87b4d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6b87b4d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6b87b4d
Branch: refs/heads/3.1.x-fixes
Commit: a6b87b4d8b1c6a35493732611bc9e71fb7a052a0
Parents: 449e395
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 27 13:05:00 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 27 14:22:56 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/common/util/ReflectionUtil.java | 17 +++++++++++++++++
.../org/apache/cxf/jaxws/JAXWSMethodInvoker.java | 2 +-
.../cxf/jaxws/JAXWSProviderMethodDispatcher.java | 14 +++++++++++---
3 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6b87b4d/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
index 6b41895..3684d6b 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
@@ -164,6 +164,23 @@ public final class ReflectionUtil {
}
}
}
+ public static Method getMethod(final Class<?> clazz, final String name,
+ final Class<?>... parameterTypes) throws NoSuchMethodException {
+ try {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Method>() {
+ public Method run() throws Exception {
+ return clazz.getMethod(name, parameterTypes);
+ }
+ });
+ } catch (PrivilegedActionException pae) {
+ Exception e = pae.getException();
+ if (e instanceof NoSuchMethodException) {
+ throw (NoSuchMethodException)e;
+ } else {
+ throw new SecurityException(e);
+ }
+ }
+ }
public static Field[] getDeclaredFields(final Class<?> cls) {
return AccessController.doPrivileged(new PrivilegedAction<Field[]>() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6b87b4d/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
index 8c56fbc..bc5cd59 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
@@ -79,7 +79,7 @@ public class JAXWSMethodInvoker extends AbstractJAXWSMethodInvoker {
final MessageContext oldCtx = WebServiceContextImpl.setMessageContext(ctx);
List<Object> res = null;
try {
- if ((params == null || params.isEmpty()) && m.getDeclaringClass().equals(Provider.class)) {
+ if ((params == null || params.isEmpty()) && serviceObject instanceof Provider) {
params = Collections.singletonList(null);
}
res = CastUtils.cast((List<?>)super.invoke(exchange, serviceObject, m, params));
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6b87b4d/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
index 841f82c..40be623 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
import javax.xml.ws.Provider;
+import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
import org.apache.cxf.service.factory.ServiceConstructionException;
@@ -36,9 +37,16 @@ public class JAXWSProviderMethodDispatcher
public JAXWSProviderMethodDispatcher(JaxWsImplementorInfo implInfo) {
try {
- invoke = Provider.class.getMethod("invoke", new Class[] {Object.class});
- } catch (Exception e) {
- throw new ServiceConstructionException(e);
+ invoke = ReflectionUtil.getMethod(implInfo.getImplementorClass(), "invoke",
+ new Class[] {implInfo.getProviderParameterType()});
+ ReflectionUtil.setAccessible(invoke);
+ } catch (Exception e1) {
+ //fall back to the raw Provider provided invoke method
+ try {
+ invoke = Provider.class.getMethod("invoke", new Class[] {Object.class});
+ } catch (Exception e) {
+ throw new ServiceConstructionException(e);
+ }
}
}
[2/3] cxf git commit: [CXF-5697] Some minor updates for WHICH_JAR
Posted by dk...@apache.org.
[CXF-5697] Some minor updates for WHICH_JAR
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/df6b6084
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/df6b6084
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/df6b6084
Branch: refs/heads/3.1.x-fixes
Commit: df6b6084c80a8e6b9fe493924d9f8e7153816d44
Parents: a6b87b4
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 27 14:13:51 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 27 14:22:59 2017 -0400
----------------------------------------------------------------------
distribution/src/main/release/lib/WHICH_JARS | 29 ++++++++++-------------
1 file changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/df6b6084/distribution/src/main/release/lib/WHICH_JARS
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/lib/WHICH_JARS b/distribution/src/main/release/lib/WHICH_JARS
index 2eea065..7255ba9 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -37,6 +37,7 @@ For Java2WSDL and WSDL2Java:
- commons-collections.jar
- commons-lang.jar
- cxf-rt-wsdl.jar
+- cxf-rt-tools*.jar
- cxf-xjc*.jar (optional, these are xjc extensions for providing enhanced
JAXB code generation)
@@ -71,13 +72,7 @@ For standalone HTTP support use Jetty:
- sl4j.jar & sl4j-jdk14.jar (optional - but improves logging)
- cxf-rt-transports-http-jetty.jar
-For standalone HTTP support use Netty:
-- geronimo-servlet.jar
-- netty-*.jar
-- cxf-rt-transports-http-netty.jar
-
For Aegis support:
-- jdom.jar (optional, if you want to map xsd:anyType to JDOM)
- cxf-rt-databinding-aegis.jar
For XmlBeans databinding support:
@@ -89,21 +84,19 @@ For WS-Security support:
- xmlsec.jar
- ehcache-core.jar
- jasypt.jar
+- cxf-rt-security.jar
- cxf-rt-ws-security.jar
+- bcprov-jdk15on.jar (optional)
For SAML support in WS-Security
-- joda-time.jar
-- opensaml.jar
-- openws.jar
-- xmltooling.jar
-- xalan.jar
+- joda-time.jar
+- cryptacular.jar
+- java-support.jar
+- opensaml*.jar
+- commons-code.jar
+- cxf-rt-security-saml.jar
For JAX-RS support:
-- abdera* (optional: for AtomPub support, but also needed for the
- Management log browser console)
-- commons-codec.jar (Needed for Abdera)
-- jaxen.jar (Needed for Abdera)
-- axiom* (Needed for Abdera)
- javax.ws.rs-api.jar
- jettison.jar (Needed for JSON services only)
- oauth*.jar (Needed for OAuth support)
@@ -130,12 +123,14 @@ For the Async HTTP client transport
For CORBA support:
- antlr.jar
+- cxf-rt-bindings-corba.jar
For JavaScript functionality:
- js.jar
+- cxf-rt-javascript
+- cxf-rt-frontend-js
For schema validation with the Aegis data binding.
-
- msv-core.jar
- xsdlib.jar
- isorelax.jar
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
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/6b206657
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6b206657
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6b206657
Branch: refs/heads/3.1.x-fixes
Commit: 6b206657384568c5e8a85e0483234d1deffdf4fc
Parents: df6b608
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 27 14:22:59 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 27 14:22:59 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6b206657/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e7ee421..050268c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -342,6 +342,7 @@ M 10ed38c6d1f74f75ae231e8b91b7198b4e162ab3
M 11637433df089a638e173d1ef57441e7456cf2ea
M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
M 11e18bf5622cafdb10723cee895885d676b35a7b
+M 127acfcf24207eef314efe9ffd72e5a032e02ee1
M 13d33c9ed261e06e44706cffa1671d67d31096a7
M 146b00d1947058705c873dffe2ba78ad35c8b03c
M 156b166b093aa92c1fc400e0f1f7440ded701169
@@ -373,6 +374,7 @@ M 3b7587395586f59d0fe9427038dd2d891fbe223d
M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
M 3e30d8892a723adcf04268efd7d407e164607065
+M 417fb946eec38f403d915e90f405594675a7f7e0
M 437c7daa3345c8482deab4a4da9b164e68fd417a
M 45d54d558625236b84752b0d7976f0cf85518c16
M 4719a033d54fd9fcd173be273e6c320d8353b631
@@ -382,6 +384,7 @@ M 4824bfe59878dd9dbbd2a067e8772b1971897cfc
M 4837a6cb5ea319f6bf87aaf3bf49c1e4e99e45a7
M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
M 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01
+M 4e5119b3d1d807fb6885ec67ce28180beb55c360
M 4f4ce80ba2de80219e13943cbd6edbf411117234
M 5022be0c15d90800ee983fe94b07a10a54814991
M 52d77470228a3560f464003c68b30ffe8f1e8b9c
@@ -391,6 +394,7 @@ M 5954d4ce3c9713c17c3bbb8b730fad210aebfb3a
M 5b7b014cc1d24cba1191bc07fd48b13dbf4d4391
M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
M 6242c682dfce4a2ba4869978c28b14f1472484c1
+M 62f994427bdd12863dc987e348eec1e24e6ce849
M 63a1088a9253da0452497440e900d35a5415c3c9
M 65c1204abcef8720d4eb985d58e3f865e39a1da3
M 6613e46662317ea151f72e26e5deb4f50148a148