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 2010/07/16 19:49:11 UTC
svn commit: r964879 - in /tuscany/sca-java-2.x/trunk:
itest/recursive-multi-level/src/main/java/mysca/test/myservice/
itest/recursive-multi-level/src/main/resources/
itest/recursive-multi-level/src/test/java/test/sca/tests/
modules/assembly/src/main/ja...
Author: rfeng
Date: Fri Jul 16 17:49:10 2010
New Revision: 964879
URL: http://svn.apache.org/viewvc?rev=964879&view=rev
Log:
Fix for TUSCANY-3622
Modified:
tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
Modified: tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java?rev=964879&r1=964878&r2=964879&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java Fri Jul 16 17:49:10 2010
@@ -23,4 +23,6 @@ public interface MySimpleTotalService {
String getLocation();
String getYear();
+
+ String getYear2();
}
Modified: tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java?rev=964879&r1=964878&r2=964879&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java Fri Jul 16 17:49:10 2010
@@ -27,6 +27,9 @@ public class MySimpleTotalServiceImpl im
// default required==true so it is 1:1
@Reference
public MyService myService;
+
+ @Reference
+ private MyService myService2;
public String getLocation() {
return myService.getLocation();
@@ -35,5 +38,9 @@ public class MySimpleTotalServiceImpl im
public String getYear() {
return myService.getYear();
}
+
+ public String getYear2() {
+ return myService2.getYear();
+ }
}
Modified: tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite?rev=964879&r1=964878&r2=964879&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite Fri Jul 16 17:49:10 2010
@@ -43,6 +43,7 @@
<component name="TotalServiceComponentLevel1Auto">
<implementation.java class="mysca.test.myservice.MySimpleTotalServiceImpl"/>
<reference name="myService" autowire="true"/>
+ <reference name="myService2" target="ServiceComponentLevel1Auto"/>
</component>
<reference name="myServiceReference1Auto" promote="TotalServiceComponentLevel1Auto/myService" multiplicity="1..1">
Modified: tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java?rev=964879&r1=964878&r2=964879&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java Fri Jul 16 17:49:10 2010
@@ -27,7 +27,6 @@ import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -67,18 +66,21 @@ public class MultiLevelTestCase {
public void testLevel1() {
assertEquals("Level 1", myService1.getLocation());
assertEquals("2001", myService1.getYear());
+ assertEquals("2001", myService1.getYear2());
}
@Test
public void testLevel2() {
assertEquals("Default 2", myService2.getLocation());
assertEquals("1992", myService2.getYear());
+ assertEquals("2002", myService2.getYear2());
}
@Test
public void testLevel3() {
assertEquals("Default 3", myService3.getLocation());
assertEquals("1993", myService3.getYear());
+ assertEquals("2003", myService3.getYear2());
}
@AfterClass
Modified: tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java?rev=964879&r1=964878&r2=964879&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java Fri Jul 16 17:49:10 2010
@@ -269,7 +269,10 @@ public class EndpointImpl implements End
names[2] = parts[1];
} else if (str.startsWith("service(") && str.endsWith(")")) {
str = str.substring("service(".length(), str.length() - 1);
- names[1] = str;
+ // [rfeng] Deal with empty service name
+ if (!"".equals(str)) {
+ names[1] = str;
+ }
} else {
throw new IllegalArgumentException("Invalid structural URI: " + structuralURI);
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java?rev=964879&r1=964878&r2=964879&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java Fri Jul 16 17:49:10 2010
@@ -93,7 +93,13 @@ public abstract class BaseEndpointRegist
if (endpointReference.getReference() != null) {
Endpoint targetEndpoint = endpointReference.getTargetEndpoint();
- return findEndpoint(targetEndpoint.getURI());
+ String uri = targetEndpoint.getURI();
+ // [rfeng] This is a workaround to deal with the case that the endpoint URI doesn't have the
+ // service name to avoid confusion between structural URIs and service URIs
+ if (uri.indexOf('#') == -1) {
+ uri = uri + "#service()";
+ }
+ return findEndpoint(uri);
}
return new ArrayList<Endpoint>();