cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r674650 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Date Mon, 07 Jul 2008 21:31:29 GMT
Author: dkulp
Date: Mon Jul  7 14:31:29 2008
New Revision: 674650

URL: http://svn.apache.org/viewvc?rev=674650&view=rev
Log:
Merged revisions 674649 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r674649 | dkulp | 2008-07-07 17:29:55 -0400 (Mon, 07 Jul 2008) | 3 lines
  
  [CXF-1663] Remove unneeded @Resource things
  Also remove a line that was causing un-found resources to be looked up twice
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul  7 14:31:29 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java?rev=674650&r1=674649&r2=674650&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
(original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
Mon Jul  7 14:31:29 2008
@@ -187,8 +187,6 @@
         if (resource != null) {
             invokeSetter(method, resource);
         } else {
-            resource = resolveResource(resourceName, clz);
-            
             LOG.log(Level.FINE, "RESOURCE_RESOLVE_FAILED", new Object[] {resourceName, clz});
         }
     }

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=674650&r1=674649&r2=674650&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Mon Jul  7 14:31:29 2008
@@ -40,7 +40,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.annotation.Resource;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
@@ -1215,7 +1214,6 @@
      * Using this method will override any Authorization Policy set in 
      * configuration.
      */
-    @Resource
     public void setAuthorization(AuthorizationPolicy authorization) {
         this.authorizationPolicy = authorization;
     }
@@ -1236,7 +1234,6 @@
      * This method sets the Client Side Policy for this HTTPConduit. Using this
      * method will override any HTTPClientPolicy set in configuration.
      */
-    @Resource
     public void setClient(HTTPClientPolicy client) {
         this.clientSidePolicy = client;
     }
@@ -1254,7 +1251,6 @@
      * Using this method overrides any Authorization Policy for the proxy 
      * that is set in the configuration.
      */
-    @Resource
     public void setProxyAuthorization(
             ProxyAuthorizationPolicy proxyAuthorization
     ) {
@@ -1274,7 +1270,6 @@
      * Using this method overrides any TLS Client Parameters that is configured
      * for this HTTPConduit.
      */
-    @Resource
     public void setTlsClientParameters(TLSClientParameters params) {
         this.tlsClientParameters = params;
         if (this.tlsClientParameters != null) {
@@ -1312,7 +1307,6 @@
      * Using this method overrides any trust decider configured for this 
      * HTTPConduit.
      */
-    @Resource
     public void setTrustDecider(MessageTrustDecider decider) {
         this.trustDecider = decider;
     }
@@ -1331,7 +1325,6 @@
      * Using this method overrides any trust decider configured for this 
      * HTTPConduit.
      */
-    @Resource
     public void setBasicAuthSupplier(HttpBasicAuthSupplier supplier) {
         this.basicAuthSupplier = supplier;
     }



Mime
View raw message