tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r690691 - in /tuscany/branches/sca-java-1.3.2: itest/validation/src/test/java/calculator/warning/ itest/validation/src/test/java/domain/ modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ modules/implementation-wid...
Date Sun, 31 Aug 2008 13:09:19 GMT
Author: slaws
Date: Sun Aug 31 06:09:18 2008
New Revision: 690691

URL: http://svn.apache.org/viewvc?rev=690691&view=rev
Log:
TUSCANY-2501 - raise an error if the user tries to mix annotated and unannotated references
in a component. Change the vtests and validation tests to take account of this change.

Added:
    tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
      - copied unchanged from r689102, tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
      - copied unchanged from r689102, tuscany/java/sca/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
Removed:
    tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.java
Modified:
    tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
    tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
    tuscany/branches/sca-java-1.3.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
    tuscany/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/resources/ab.composite
    tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
    tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
    tuscany/branches/sca-java-1.3.2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite

Modified: tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
(original)
+++ tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
Sun Aug 31 06:09:18 2008
@@ -30,38 +30,38 @@
 import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
+import domain.CustomCompositeBuilder;
+
 /**
  * This shows how to test the Calculator service component.
  */
 public class ReferenceNotFoundTestCase extends TestCase {
 
-    private CalculatorService calculatorService;
-    private SCANode2 node;
+    private CustomCompositeBuilder customDomain;
 
     @Override
     protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        customDomain = CustomCompositeBuilder.getInstance();
+        try {
+            customDomain.loadContribution("src/main/resources/ReferenceNotFound/Calculator.composite",

+                                          "TestContribution", 
+                                          "src/main/resources/ReferenceNotFound/");
+            customDomain.buildContribution();
+        } catch (Exception ex){
+            throw ex;
+        }   
+        
     }
 
     @Override
     protected void tearDown() throws Exception {
-        node.stop();
+        //node.stop();
     }
 
     public void testCalculator() throws Exception {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
+        Monitor monitor = customDomain.getMonitorInstance();
         Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
         
         assertNotNull(problem);

Modified: tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
(original)
+++ tuscany/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
Sun Aug 31 06:09:18 2008
@@ -27,10 +27,12 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
 import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
@@ -189,6 +191,18 @@
     	return monitor;
     }
     
+    public void buildContribution() throws Exception {
+        // Create a composite model for the domain
+        Composite domainComposite = assemblyFactory.createComposite();
+        domainComposite.setName(new QName("http://customdomain", "domain"));
+        
+        // Add all deployables to it, normally the domain administrator would select
+        // the deployables to include
+        domainComposite.getIncludes().addAll(workspace.getDeployables());
+        
+        // Build the domain composite and wire the components included in it
+        domainCompositeBuilder.build(domainComposite);
+    }
     public void readContribution(String compositeURL, String sourceURI, String sourceURL)
throws Exception {
     	init();
 

Modified: tuscany/branches/sca-java-1.3.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
(original)
+++ tuscany/branches/sca-java-1.3.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
Sun Aug 31 06:09:18 2008
@@ -446,7 +446,7 @@
                 componentReference.setReference(reference);
             } else {
                 if (!componentReference.getName().startsWith("$self$.")) {
-                    warning("ReferenceNotFound", component, component.getName(), componentReference.getName());
+                    error("ReferenceNotFound", component, component.getName(), componentReference.getName());
                 }
             }
         }

Modified: tuscany/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
(original)
+++ tuscany/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
Sun Aug 31 06:09:18 2008
@@ -130,8 +130,10 @@
         String referenceName = null;
         
         String tokens[] = scriptContent.split("=");
-        tokens = tokens[0].split(" ");
-        referenceName = tokens[tokens.length -1];
+        
+        // find the string between the quotes
+        tokens = tokens[1].split("\"");
+        referenceName = tokens[1];
         
         if(referenceName != null) {
             reference = assemblyFactory.createReference();

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
Sun Aug 31 06:09:18 2008
@@ -48,4 +48,8 @@
     public boolean isB7SetterCalled();
     public boolean isB16Null();
     public boolean isB17Null();
+    
+    public boolean isB4Null(); 
+    public boolean isB5Null();
+    public boolean isB6Null();
 }

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
Sun Aug 31 06:09:18 2008
@@ -201,4 +201,15 @@
         return b17 == null;
     }
 
+    public boolean isB4Null() {
+        return b4 == null;
+    }
+    
+    public boolean isB5Null() {
+        return b5 == null;
+    }
+    
+    public boolean isB6Null() {
+        return b6 == null;
+    }    
 }

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/resources/ab.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/resources/ab.composite?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/resources/ab.composite
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/main/resources/ab.composite
Sun Aug 31 06:09:18 2008
@@ -26,9 +26,6 @@
         <reference name="b1" target="BComponent"/>		
         <reference name="b2" target="BComponent"/>		
         <reference name="b3" target="BComponent"/>
-        <reference name="b4" target="BComponent"/>
-        <reference name="b5" target="BComponent"/>
-        <reference name="b6" target="BComponent"/>
         <reference name="b7" target="BComponent"/>
         <reference name="b8" target="BComponent"/>
         <reference name="b9" target="BComponent"/>
@@ -40,8 +37,8 @@
         <reference name="b15" multiplicity="1..n" target="BComponent BComponent"/>
     </component>   
     
-    <component name="AnotherAComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.AnotherAServiceImpl"/>
+    <component name="AUnannotatedComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.AUnannotatedServiceImpl"/>
         <reference name="b4" target="BComponent"/>
         <reference name="b5" target="BComponent"/>
         <reference name="b6" target="BComponent"/>

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
Sun Aug 31 06:09:18 2008
@@ -110,7 +110,12 @@
      */
     @Test
     public void atReference2() throws Exception {
-        AService anotherA = ServiceFinder.getService(AService.class, "AnotherAComponent");
+        AService anotherA = ServiceFinder.getService(AService.class, "AUnannotatedComponent");
+        
+        Assert.assertFalse(anotherA.isB4Null());
+        Assert.assertTrue(anotherA.isB5Null());
+        Assert.assertFalse(anotherA.isB6Null());
+        
         Assert.assertEquals("BService", anotherA.getB4Name());
         try {
             anotherA.getB5Name();
@@ -208,4 +213,17 @@
         Assert.assertTrue(a.isB16Null());
         Assert.assertTrue(a.isB17Null());
     }
+    
+    /**
+     * Java Component Implementation Spec
+     * Section 1.2.7
+     * Line 361 when @Property and @Reference annotations are present
+     * then unannotated fields are ignored
+     */
+    @Test
+    public void atReference8() throws Exception {
+        Assert.assertTrue(a.isB4Null());
+        Assert.assertTrue(a.isB5Null());
+        Assert.assertTrue(a.isB6Null());
+    }
 }

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
Sun Aug 31 06:09:18 2008
@@ -19,9 +19,12 @@
 
 package org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext;
 
+import org.osoa.sca.annotations.Remotable;
+
 /**
  * Simple Service B.
  */
+@Remotable
 public interface BService {
 
     String getBName();

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
Sun Aug 31 06:09:18 2008
@@ -19,6 +19,9 @@
 
 package org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext;
 
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
 public interface DComponent {
 
     public String getName();

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
Sun Aug 31 06:09:18 2008
@@ -45,6 +45,9 @@
     
     @Reference
     protected BService bReference;
+    
+    @Reference
+    protected DComponent dReference;    
 
     @Property(name="aProperty", required=true)
     protected String aProperty;

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
Sun Aug 31 06:09:18 2008
@@ -28,6 +28,13 @@
 	    <reference name="dReference" target="DComponent"/>
 	    <property name="aProperty" type="xsd:string">PropertyA</property>
      </component>
+     
+    <component name="AUnannotatedComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.AUnannotatedComponentImpl"/>
+        <reference name="bReference" target="BComponent/BService"/>
+        <reference name="dReference" target="DComponent"/>
+        <property name="aProperty" type="xsd:string">PropertyA</property>
+     </component>     
 
     <component name="BComponent">
         <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.BComponentImpl"/>

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
Sun Aug 31 06:09:18 2008
@@ -35,6 +35,7 @@
 
     protected static String compositeName = "ab.composite";
     protected static AComponent a;
+    protected static AComponent aUnannotated;
     protected static BService b;
 
     @BeforeClass
@@ -43,6 +44,7 @@
             System.out.println("Setting up");
             ServiceFinder.init(compositeName);
             a = ServiceFinder.getService(AComponent.class, "AComponent");
+            aUnannotated = ServiceFinder.getService(AComponent.class, "AUnannotatedComponent");
             b = ServiceFinder.getService(BService.class, "BComponent/BService");
         } catch (Exception e) {
             e.printStackTrace();
@@ -65,6 +67,7 @@
     @Test
     public void testGetURI() throws Exception {
         Assert.assertEquals("AComponent", a.getContextURI());
+        Assert.assertEquals("AUnannotatedComponent", aUnannotated.getContextURI());
     }
 
     /**

Modified: tuscany/branches/sca-java-1.3.2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite?rev=690691&r1=690690&r2=690691&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
(original)
+++ tuscany/branches/sca-java-1.3.2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
Sun Aug 31 06:09:18 2008
@@ -24,7 +24,6 @@
 		<implementation.java
 			class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.AServiceImpl" />
 		<reference name="b" target="BComponent" />
-		<reference name="c" target="CComponent" />
 		<reference name="d" target="DComponent" />
 	</component>
 



Mime
View raw message