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

1 files changed, 0 insertions, 2 deletions

diff --git a/branches/sca-java-1.x/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/branches/sca-java-1.x/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
index a7224b0efa..9555532b3e 100644
--- a/branches/sca-java-1.x/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ b/branches/sca-java-1.x/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
@@ -33,7 +33,6 @@ import org.example.quote.Quote;
 import org.example.quote.QuoteResponse;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import commonj.sdo.DataObject;
@@ -63,7 +62,6 @@ import commonj.sdo.DataObject;
  *    total price 
  *  4. SDO is used for data interchange
  */
-@Ignore("Broken, see TUSCANY-2943")
 public class XQueryQuoteClientTestCase {
 
     public static boolean SHOW_DEBUG_MSG = false;