Refactor the default sca namespace binding

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@957347 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java b/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
index d48f010c55..c2ce8c427d 100644
--- a/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
+++ b/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
@@ -86,13 +86,18 @@ public class XPathHelper {
     public NamespaceContext getNamespaceContext(String expression, NamespaceContext context) {
         NamespaceContextImpl nsContext = new NamespaceContextImpl(null);
 
+        boolean found = false;
         for (String prefix : getPrefixes(expression)) {
             String namespace = context.getNamespaceURI(prefix);
             if (namespace != null && !XMLConstants.NULL_NS_URI.equals(namespace)) {
                 nsContext.register(prefix, namespace);
+                found = true;
             }
-        }    	
-    	
+        }
+        
+        if(!found) {
+            nsContext.register("__sca", "http://docs.oasis-open.org/ns/opencsa/sca/200912");
+        }
         return nsContext;
     }