From daac67ff4255bd4c65892eb42c76ac74807c0bdf Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 21 Oct 2009 10:34:41 +0000
Subject: TUSCANY-3347 make the name of the implementation.jee composite unique

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@827953 13f79535-47bb-0310-9956-ffa450edef68
---
 .../scajar-ear-appcomp/src/main/resources/helloworld.composite          | 2 +-
 .../tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'branches/sca-java-1.5.2/itest')

diff --git a/branches/sca-java-1.5.2/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/branches/sca-java-1.5.2/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
index ebd8377725..8f8d46ccd7 100644
--- a/branches/sca-java-1.5.2/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
+++ b/branches/sca-java-1.5.2/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
@@ -29,7 +29,7 @@
     </component>
 
     <component name="HelloworldServiceComponent">
-        <implementation.jee archive="itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear"/>
+        <implementation.jee archive="./itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear"/>
         <reference name="JavaReference" target="HelloworldTargetComponent"/>
     </component>
     
diff --git a/branches/sca-java-1.5.2/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/branches/sca-java-1.5.2/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
index 34bf3702d3..1c4bd34352 100644
--- a/branches/sca-java-1.5.2/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
+++ b/branches/sca-java-1.5.2/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
@@ -91,7 +91,7 @@ public class TestExternalEarModelResolver implements ModelResolver {
                     URL earLocation = null;
                     if ( uri.toString().equals("itest-contribution-jee-samples-13-ear-nonenhanced.ear")){                       
                         earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL();
-                    } else if ( uri.toString().equals("itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear")){                       
+                    } else if ( uri.toString().equals("./itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear")){                       
                         earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit/target/itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear").toURL();
                     } else if ( uri.toString().equals("itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear")){                       
                         earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/target/itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear").toURL();                        
-- 
cgit v1.2.3