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 96BEF7FE1 for ; Mon, 5 Dec 2011 12:24:11 +0000 (UTC) Received: (qmail 82237 invoked by uid 500); 5 Dec 2011 12:24:11 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 82216 invoked by uid 500); 5 Dec 2011 12:24:11 -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 82209 invoked by uid 99); 5 Dec 2011 12:24:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Dec 2011 12:24:11 +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; Mon, 05 Dec 2011 12:24:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8765523888FD for ; Mon, 5 Dec 2011 12:23:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1210425 - in /tuscany/sca-java-2.x/trunk/testing/itest/properties: pom.xml src/main/java/org/apache/tuscany/sca/itest/ctcalc/AnnotatedCTCalcComponentImpl.java src/main/java/org/apache/tuscany/sca/itest/ctcalc/DefaultHelperContext.java Date: Mon, 05 Dec 2011 12:23:46 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111205122346.8765523888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Mon Dec 5 12:23:45 2011 New Revision: 1210425 URL: http://svn.apache.org/viewvc?rev=1210425&view=rev Log: TUSCANY_3965: Add a field thats annotated but not with an SCA annotation to match the scenario as described in TUSCANY_3965 Added: tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/DefaultHelperContext.java Modified: tuscany/sca-java-2.x/trunk/testing/itest/properties/pom.xml tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/AnnotatedCTCalcComponentImpl.java Modified: tuscany/sca-java-2.x/trunk/testing/itest/properties/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/properties/pom.xml?rev=1210425&r1=1210424&r2=1210425&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/testing/itest/properties/pom.xml (original) +++ tuscany/sca-java-2.x/trunk/testing/itest/properties/pom.xml Mon Dec 5 12:23:45 2011 @@ -70,5 +70,11 @@ 2.0-SNAPSHOT compile + + + org.apache.tuscany.sdo + tuscany-sdo-api-r2.1 + 1.1.1 + Modified: tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/AnnotatedCTCalcComponentImpl.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/AnnotatedCTCalcComponentImpl.java?rev=1210425&r1=1210424&r2=1210425&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/AnnotatedCTCalcComponentImpl.java (original) +++ tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/AnnotatedCTCalcComponentImpl.java Mon Dec 5 12:23:45 2011 @@ -20,6 +20,8 @@ package org.apache.tuscany.sca.itest.ctc import org.oasisopen.sca.annotation.Service; +import commonj.sdo.helper.HelperContext; + @Service(CTCalcComponent.class) public class AnnotatedCTCalcComponentImpl extends BaseCTCalcComponentImpl { @@ -27,6 +29,9 @@ public class AnnotatedCTCalcComponentImp protected String aPropertyProtected; public String aPropertyPublic; + @DefaultHelperContext + protected HelperContext hc; + public String test(){ return "Annotated"; } Added: tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/DefaultHelperContext.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/DefaultHelperContext.java?rev=1210425&view=auto ============================================================================== --- tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/DefaultHelperContext.java (added) +++ tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ctcalc/DefaultHelperContext.java Mon Dec 5 12:23:45 2011 @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.itest.ctcalc; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface DefaultHelperContext { + +}