You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/10/01 22:20:48 UTC
svn commit: r581062 - in /incubator/tuscany/java/sca:
itest/properties/src/main/java/org/apache/tuscany/sca/itest/
itest/properties/src/test/java/org/apache/tuscany/sca/itest/
modules/core/src/main/java/org/apache/tuscany/sca/core/context/
Author: rfeng
Date: Mon Oct 1 13:20:47 2007
New Revision: 581062
URL: http://svn.apache.org/viewvc?rev=581062&view=rev
Log:
Apply the patch from Mark Combellack for TUSCANY-1823
Modified:
incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
Modified: incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java?rev=581062&r1=581061&r2=581062&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java Mon Oct 1 13:20:47 2007
@@ -26,6 +26,7 @@
public interface PropertyComponent {
public String getLocation();
+ public String getLocationFromComponentContext();
public String getYear();
public ComplexPropertyBean getComplexPropertyOne();
public ComplexPropertyBean getComplexPropertyTwo();
Modified: incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java?rev=581062&r1=581061&r2=581062&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java Mon Oct 1 13:20:47 2007
@@ -21,6 +21,8 @@
import java.util.Collection;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.Property;
import com.example.customer.sdo.impl.CustomerImpl;
@@ -28,6 +30,9 @@
public class PropertyComponentImpl implements PropertyComponent {
+ @Context
+ protected ComponentContext context;
+
@Property
protected CustomerImpl customerSdo;
@@ -54,6 +59,10 @@
public String getLocation(){
return location;
+ }
+
+ public String getLocationFromComponentContext() {
+ return context.getProperty(String.class, "location");
}
public String getYear(){
Modified: incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java?rev=581062&r1=581061&r2=581062&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java Mon Oct 1 13:20:47 2007
@@ -188,6 +188,16 @@
assertEquals("Sdo Middler Name", dataObject.getString("middleName"));
assertEquals("Sdo Lasting Name", dataObject.getString("lastName"));
}
+
+ // FIXME: Uncomment the @Test to enable this test case (TUSCANY-1832)
+ // @Test
+ public void testGetLocationFromComponentContext() {
+ String location = propertyService.getLocation();
+ assertNotNull(location);
+ String locationFromCC = propertyService.getLocationFromComponentContext();
+ assertNotNull(locationFromCC);
+ assertEquals(location, locationFromCC);
+ }
@BeforeClass
public static void init() throws Exception {
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java?rev=581062&r1=581061&r2=581062&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java Mon Oct 1 13:20:47 2007
@@ -110,7 +110,7 @@
public <B> B getProperty(Class<B> type, String propertyName) {
for (ComponentProperty p : component.getProperties()) {
- if (propertyName.equals(propertyName)) {
+ if (propertyName.equals(p.getName())) {
return type.cast(p.getValue());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org