svn commit: r961010 - in /tuscany/sca-java-2.x/trunk/modules: assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java

[bdaniel]

Author: bdaniel
Date: Tue Jul  6 20:34:54 2010
New Revision: 961010

URL: http://svn.apache.org/viewvc?rev=961010&view=rev
Log:
Ensure that the SCA namespace prefix is registered in the XPath namespace 
context

Modified:
    
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
    
tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=961010&r1=961009&r2=961010&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
 Tue Jul  6 20:34:54 2010
@@ -260,7 +260,7 @@ public class PolicySetProcessor extends 
             }
         }
 
-        return "_sca";
+        return "__sca";
     }
 
        public void readIntentMap(XMLStreamReader reader, PolicySet policySet, 
Intent mappedIntent, ProcessorContext context)

Modified: 
tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java?rev=961010&r1=961009&r2=961010&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
 Tue Jul  6 20:34:54 2010
@@ -91,7 +91,8 @@ public class XPathHelper {
             String namespace = context.getNamespaceURI(prefix);
             if (namespace != null && 
!XMLConstants.NULL_NS_URI.equals(namespace)) {
                 nsContext.register(prefix, namespace);
-                found = true;
+                if ( 
(namespace.equals("http://docs.oasis-open.org/ns/opencsa/sca/200912";)) && 
!prefix.equals(XMLConstants.DEFAULT_NS_PREFIX))
+                       found = true;
             }
         }