From 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Oct 2009 23:44:59 +0000
Subject: Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
---
 branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml         | 2 ++
 .../policy-security-basicauth/src/main/resources/definitions.xml      | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'branches/sca-java-1.x/itest/policy-security-basicauth')

diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml b/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml
index c78a7e47d8..5bedabfb5b 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml
+++ b/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml
@@ -100,6 +100,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.5</version>
+            <scope>test</scope>
         </dependency>
         
         <dependency>
@@ -108,5 +109,6 @@
             <version>1.6.1</version>
             <scope>test</scope>
         </dependency>        
+
     </dependencies>
 </project>
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml b/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml
index 455ca2f917..dbdf0cd263 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml
+++ b/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml
@@ -31,10 +31,6 @@
           <tuscany:userName>myname</tuscany:userName>
           <tuscany:password>mypassword</tuscany:password>
         </tuscany:basicAuthentication>
-        <tuscany:basicAuthentication>
-          <tuscany:userName>myname1</tuscany:userName>
-          <tuscany:password>mypassword1</tuscany:password>
-        </tuscany:basicAuthentication>
     </sca:policySet>
     
     <sca:policySet name="ImplementationIdentityPolicySet"
-- 
cgit v1.2.3