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 @@
<version>2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-api-r2.1</artifactId>
+ <version>1.1.1</version>
+ </dependency>
</dependencies>
</project>
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 {
+
+}
