Return-Path: X-Original-To: apmail-tuscany-commits-archive@www.apache.org Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 35DB17E0F for ; Tue, 13 Dec 2011 09:15:50 +0000 (UTC) Received: (qmail 33723 invoked by uid 500); 13 Dec 2011 09:15:48 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 32747 invoked by uid 500); 13 Dec 2011 09:15:35 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 32739 invoked by uid 99); 13 Dec 2011 09:15:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2011 09:15:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 13 Dec 2011 09:15:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0AF9A2388860 for ; Tue, 13 Dec 2011 09:15:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213614 - /tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java Date: Tue, 13 Dec 2011 09:15:11 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111213091512.0AF9A2388860@eris.apache.org> Author: antelder Date: Tue Dec 13 09:15:11 2011 New Revision: 1213614 URL: http://svn.apache.org/viewvc?rev=1213614&view=rev Log: Update context annotation processor to work with both OASIS and Tuscany types of ComponentContext Modified: tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java Modified: tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java?rev=1213614&r1=1213613&r2=1213614&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java (original) +++ tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java Tue Dec 13 09:15:11 2011 @@ -60,7 +60,7 @@ public class ContextProcessor extends Ba } Class paramType = method.getParameterTypes()[0]; String name = JavaIntrospectionHelper.toPropertyName(method.getName()); - if (ComponentContext.class.equals(paramType) || RequestContext.class.equals(paramType)) { + if (ComponentContext.class.isAssignableFrom(paramType) || RequestContext.class.equals(paramType)) { JavaElementImpl element = new JavaElementImpl(method, 0); element.setName(name); element.setClassifer(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class); @@ -77,7 +77,7 @@ public class ContextProcessor extends Ba return; } Class paramType = field.getType(); - if (ComponentContext.class.equals(paramType) || RequestContext.class.equals(paramType)) { + if (ComponentContext.class.isAssignableFrom(paramType) || RequestContext.class.equals(paramType)) { JavaElementImpl element = new JavaElementImpl(field); element.setClassifer(Resource.class); JavaResourceImpl resource = new JavaResourceImpl(element);