Author: dkulp
Date: Wed Jan 11 17:18:09 2012
New Revision: 1230156
URL: http://svn.apache.org/viewvc?rev=1230156&view=rev
Log:
Move org.apache.cxf.frontend stuff out of rt-core and deprecated the
one class.
Added:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java
- copied, changed from r1230132,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
(contents, props changed)
- copied, changed from r1230132,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
(contents, props changed)
- copied, changed from r1230132,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
Removed:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
Modified:
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java
Modified:
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java
(original)
+++
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java
Wed Jan 11 17:18:09 2012
@@ -39,13 +39,13 @@ import org.apache.cxf.binding.xml.XMLBin
import org.apache.cxf.binding.xml.interceptor.XMLFaultInInterceptor;
import org.apache.cxf.binding.xml.interceptor.XMLFaultOutInterceptor;
import org.apache.cxf.common.injection.NoJSR250Annotations;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.interceptor.AttachmentInInterceptor;
import org.apache.cxf.interceptor.AttachmentOutInterceptor;
import org.apache.cxf.interceptor.StaxOutInterceptor;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
Wed Jan 11 17:18:09 2012
@@ -31,7 +31,6 @@ import org.w3c.dom.Node;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.frontend.FaultInfoException;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
@@ -132,8 +131,17 @@ public class FaultOutInterceptor extends
return supportsDOM;
}
+ private boolean hasFaultInfo(Class<?> c) {
+ if ("org.apache.cxf.frontend.FaultInfoException".equals(c.getName())) {
+ return true;
+ }
+ if (c == Throwable.class) {
+ return false;
+ }
+ return hasFaultInfo(c.getSuperclass());
+ }
protected Object getFaultBean(Throwable cause, FaultInfo faultPart,
Message message) {
- if (FaultInfoException.class.isAssignableFrom(cause.getClass())) {
+ if (hasFaultInfo(cause.getClass())) {
try {
Method method = cause.getClass().getMethod("getFaultInfo", new
Class[0]);
return method.invoke(cause, new Object[0]);
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
Wed Jan 11 17:18:09 2012
@@ -42,12 +42,12 @@ import org.apache.cxf.common.util.Primit
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.util.XMLSchemaQNames;
import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessagePartInfo;
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
Wed Jan 11 17:18:09 2012
@@ -24,13 +24,13 @@ import java.util.List;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
public abstract class AbstractAuthorizingInInterceptor extends
AbstractPhaseInterceptor<Message> {
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
Wed Jan 11 17:18:09 2012
@@ -30,7 +30,6 @@ import java.util.logging.Logger;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.continuations.SuspendedInvocationException;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Exchange;
Copied:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java
(from r1230132,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java&r1=1230132&r2=1230156&rev=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java
Wed Jan 11 17:18:09 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.frontend;
+package org.apache.cxf.service.invoker;
import java.lang.reflect.Method;
Modified:
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
(original)
+++
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
Wed Jan 11 17:18:09 2012
@@ -26,13 +26,13 @@ import java.lang.annotation.Target;
import java.lang.reflect.Method;
import java.security.Principal;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.easymock.EasyMock;
Modified:
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
(original)
+++
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
Wed Jan 11 17:18:09 2012
@@ -23,13 +23,13 @@ import java.security.Principal;
import java.util.Collections;
import java.util.List;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.easymock.EasyMock;
Modified:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
(original)
+++
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Wed Jan 11 17:18:09 2012
@@ -53,9 +53,9 @@ import org.apache.cxf.common.xmlschema.X
import org.apache.cxf.databinding.AbstractDataBinding;
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.frontend.SimpleMethodDispatcher;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.AbstractMessageContainer;
import org.apache.cxf.service.model.FaultInfo;
import org.apache.cxf.service.model.MessagePartInfo;
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
Wed Jan 11 17:18:09 2012
@@ -37,12 +37,12 @@ import javax.xml.validation.Schema;
import org.apache.cxf.databinding.AbstractDataBinding;
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessagePartInfo;
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSProviderMethodDispatcher.java
Wed Jan 11 17:18:09 2012
@@ -24,13 +24,15 @@ import java.lang.reflect.Method;
import javax.xml.ws.Provider;
import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
-public class JAXWSProviderMethodDispatcher implements MethodDispatcher {
+@SuppressWarnings("deprecation")
+public class JAXWSProviderMethodDispatcher
+ implements org.apache.cxf.service.invoker.MethodDispatcher,
+ org.apache.cxf.frontend.MethodDispatcher {
Method invoke;
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Wed Jan 11 17:18:09 2012
@@ -53,11 +53,11 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.ClientCallback;
import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
public class JaxWsClientProxy extends org.apache.cxf.frontend.ClientProxy
implements
Modified:
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
Wed Jan 11 17:18:09 2012
@@ -26,7 +26,6 @@ import javax.xml.transform.stream.Stream
import javax.xml.ws.Provider;
import org.apache.cxf.continuations.SuspendedInvocationException;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.jaxws.service.Hello;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -35,6 +34,7 @@ import org.apache.cxf.message.MessageCon
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.Factory;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.easymock.EasyMock;
import org.junit.Assert;
Modified:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
(original)
+++
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
Wed Jan 11 17:18:09 2012
@@ -32,6 +32,7 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
public class ClientProxy implements InvocationHandler, Closeable {
Copied:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
(from r1230132,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/FaultInfoException.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java?p2=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/FaultInfoException.java&r1=1230132&r2=1230156&rev=1230156&view=diff
==============================================================================
(empty)
Propchange:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
(from r1230132,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java?p2=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java&r1=1230132&r2=1230156&rev=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
(original)
+++
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
Wed Jan 11 17:18:09 2012
@@ -18,21 +18,13 @@
*/
package org.apache.cxf.frontend;
-import java.lang.reflect.Method;
-
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.OperationInfo;
/**
* Provides functionality to map BindingOperations to Methods and
* vis a versa.
+ * @deprecated - use org.apache.cxf.service.invoker.MethodDispatcher. Will be
removed in the future.
*/
-public interface MethodDispatcher {
- Method getMethod(BindingOperationInfo op);
-
- BindingOperationInfo getBindingOperation(Method m, Endpoint endpoint);
-
- void bind(OperationInfo o, Method... methods);
+@Deprecated
+public interface MethodDispatcher extends
org.apache.cxf.service.invoker.MethodDispatcher {
}
Propchange:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/MethodDispatcher.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
(original)
+++
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
Wed Jan 11 17:18:09 2012
@@ -27,7 +27,9 @@ import org.apache.cxf.service.model.Bind
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
-public class SimpleMethodDispatcher implements MethodDispatcher {
+@SuppressWarnings("deprecation")
+public class SimpleMethodDispatcher
+ implements org.apache.cxf.service.invoker.MethodDispatcher,
MethodDispatcher {
private Map<Method, Map<BindingInfo, BindingOperationInfo>> infoMap =
new ConcurrentHashMap<Method, Map<BindingInfo,
BindingOperationInfo>>();
Modified:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Wed Jan 11 17:18:09 2012
@@ -77,7 +77,6 @@ import org.apache.cxf.endpoint.EndpointI
import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.frontend.FaultInfoException;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.frontend.SimpleMethodDispatcher;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.MethodComparator;
@@ -92,6 +91,7 @@ import org.apache.cxf.service.ServiceMod
import org.apache.cxf.service.factory.FactoryBeanListener.Event;
import org.apache.cxf.service.invoker.FactoryInvoker;
import org.apache.cxf.service.invoker.Invoker;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.invoker.SingletonFactory;
import org.apache.cxf.service.model.AbstractMessageContainer;
import org.apache.cxf.service.model.BindingInfo;
@@ -232,6 +232,7 @@ public class ReflectionServiceFactoryBea
setService(null);
}
+ @SuppressWarnings("deprecation")
@Override
public synchronized Service create() {
reset();
@@ -255,7 +256,11 @@ public class ReflectionServiceFactoryBea
getService().setDataBinding(getDataBinding());
}
- getService().put(MethodDispatcher.class.getName(),
getMethodDispatcher());
+ MethodDispatcher m = getMethodDispatcher();
+ getService().put(MethodDispatcher.class.getName(), m);
+ if (m instanceof org.apache.cxf.frontend.MethodDispatcher) {
+
getService().put(org.apache.cxf.frontend.MethodDispatcher.class.getName(), m);
+ }
createEndpoints();
Modified:
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java?rev=1230156&r1=1230155&r2=1230156&view=diff
==============================================================================
---
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java
(original)
+++
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/ClaimsAuthorizingInterceptor.java
Wed Jan 11 17:18:09 2012
@@ -31,7 +31,6 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ClassHelper;
-import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.security.AccessDeniedException;
import org.apache.cxf.message.Message;
@@ -39,6 +38,7 @@ import org.apache.cxf.phase.AbstractPhas
import org.apache.cxf.phase.Phase;
import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
