Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 67947 invoked from network); 7 Jul 2008 21:30:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jul 2008 21:30:17 -0000 Received: (qmail 69104 invoked by uid 500); 7 Jul 2008 21:30:17 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 69082 invoked by uid 500); 7 Jul 2008 21:30:17 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 69073 invoked by uid 99); 7 Jul 2008 21:30:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jul 2008 14:30:17 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jul 2008 21:29:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C9BB32388A23; Mon, 7 Jul 2008 14:29:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674649 - in /cxf/trunk: 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:29:55 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080707212955.C9BB32388A23@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Jul 7 14:29:55 2008 New Revision: 674649 URL: http://svn.apache.org/viewvc?rev=674649&view=rev Log: [CXF-1663] Remove unneeded @Resource things Also remove a line that was causing un-found resources to be looked up twice Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java?rev=674649&r1=674648&r2=674649&view=diff ============================================================================== --- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java (original) +++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java Mon Jul 7 14:29:55 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/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=674649&r1=674648&r2=674649&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Mon Jul 7 14:29:55 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; }