svn commit: r1715389 - in /aries/trunk/blueprint: blueprint-core/ blueprint-core/src/main/java/org/apache/aries/blueprint/ blueprint-parser/src/main/java/org/apache/aries/blueprint/ blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/

[gn...@apache.org]

Author: gnodet
Date: Fri Nov 20 16:44:29 2015
New Revision: 1715389

URL: http://svn.apache.org/viewvc?rev=1715389&view=rev
Log:
[ARIES-1456] Provide access to NamespaceHandlers from the ParserContext

Modified:
    aries/trunk/blueprint/blueprint-core/pom.xml
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ParserContext.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/ParserContextImpl.java

Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1715389&r1=1715388&r2=1715389&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Nov 20 16:44:29 2015
@@ -32,7 +32,7 @@
     <artifactId>org.apache.aries.blueprint.core</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries Blueprint Core</name>
-    <version>1.4.6-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <description>
         This bundle contains the core implementation of Blueprint
         along with the "ext" namespace handler.

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo?rev=1715389&r1=1715388&r2=1715389&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo Fri Nov 20 16:44:29 2015
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 1.4.0
+version 1.5.0

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ParserContext.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ParserContext.java?rev=1715389&r1=1715388&r2=1715389&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ParserContext.java (original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ParserContext.java Fri Nov 20 16:44:29 2015
@@ -16,6 +16,8 @@
  */
 package org.apache.aries.blueprint;
 
+import java.net.URI;
+
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
 import org.osgi.service.blueprint.reflect.Metadata;
 import org.w3c.dom.Element;
@@ -86,5 +88,10 @@ public interface ParserContext  {
      * Get the default timeout setting for the current blueprint file
      */
     String getDefaultTimeout();
+
+    /**
+     * Retrieve the namespace handler for the given uri
+     */
+    NamespaceHandler getNamespaceHandler(URI namespaceUri);
 }
 

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java?rev=1715389&r1=1715388&r2=1715389&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java (original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java Fri Nov 20 16:44:29 2015
@@ -1341,7 +1341,7 @@ public class Parser {
         return getNamespaceHandler(ns);
     }
 
-    private NamespaceHandler getNamespaceHandler(URI uri) {
+    public NamespaceHandler getNamespaceHandler(URI uri) {
         if (handlers == null) {
             throw new ComponentDefinitionException("Unsupported node (namespace handler registry is not set): " + uri);
         }

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/ParserContextImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/ParserContextImpl.java?rev=1715389&r1=1715388&r2=1715389&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/ParserContextImpl.java (original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/ParserContextImpl.java Fri Nov 20 16:44:29 2015
@@ -18,7 +18,10 @@
  */
 package org.apache.aries.blueprint.parser;
 
+import java.net.URI;
+
 import org.apache.aries.blueprint.ComponentDefinitionRegistry;
+import org.apache.aries.blueprint.NamespaceHandler;
 import org.apache.aries.blueprint.ParserContext;
 import org.apache.aries.blueprint.reflect.MetadataUtil;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
@@ -88,4 +91,9 @@ public class ParserContextImpl implement
     public String getDefaultTimeout() {
         return parser.getDefaultTimeout();
     }
+
+    @Override
+    public NamespaceHandler getNamespaceHandler(URI namespaceUri) {
+        return parser.getNamespaceHandler(namespaceUri);
+    }
 }