Return-Path: 
 <commits-return-7163-apmail-aries-commits-archive=aries.apache.org@aries.apache.org>
X-Original-To: apmail-aries-commits-archive@www.apache.org
Delivered-To: apmail-aries-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 99C3D176B4
	for <apmail-aries-commits-archive@www.apache.org>;
 Tue, 24 Feb 2015 16:32:57 +0000 (UTC)
Received: (qmail 12677 invoked by uid 500); 24 Feb 2015 16:32:57 -0000
Delivered-To: apmail-aries-commits-archive@aries.apache.org
Received: (qmail 12611 invoked by uid 500); 24 Feb 2015 16:32:57 -0000
Mailing-List: contact commits-help@aries.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@aries.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@aries.apache.org>
List-Post: <mailto:commits@aries.apache.org>
List-Id: <commits.aries.apache.org>
Reply-To: dev@aries.apache.org
Delivered-To: mailing list commits@aries.apache.org
Received: (qmail 12600 invoked by uid 99); 24 Feb 2015 16:32:57 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2015 16:32:57 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 31196AC0051
	for <commits@aries.apache.org>; Tue, 24 Feb 2015 16:32:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1662008 - in /aries/trunk/blueprint/blueprint-web:
 pom.xml
 src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
Date: Tue, 24 Feb 2015 16:32:56 -0000
To: commits@aries.apache.org
From: sergeyb@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150224163257.31196AC0051@hades.apache.org>

Author: sergeyb
Date: Tue Feb 24 16:32:56 2015
New Revision: 1662008

URL: http://svn.apache.org/r1662008
Log:
[ARIES-1300] Minor updates to noosgi BlueprintContainerImpl and BlueprintContextListener to make it easier to provide custom namespace handler sets

Modified:
    aries/trunk/blueprint/blueprint-web/pom.xml
    aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java

Modified: aries/trunk/blueprint/blueprint-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/pom.xml?rev=1662008&r1=1662007&r2=1662008&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-web/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-web/pom.xml Tue Feb 24 16:32:56 2015
@@ -45,7 +45,7 @@
     </scm>
 
     <properties>
-        <blueprint.nosgi.version>1.0.0</blueprint.nosgi.version>
+        <blueprint.nosgi.version>1.1.0-SNAPSHOT</blueprint.nosgi.version>
         <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
@@ -53,7 +53,7 @@
         <profile>
             <id>dev</id>
             <properties>
-              <blueprint.nosgi.version>1.0.0-SNAPSHOT</blueprint.nosgi.version>
+              <blueprint.nosgi.version>1.1.0-SNAPSHOT</blueprint.nosgi.version>
             </properties>
         </profile>
     </profiles>

Modified: aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java?rev=1662008&r1=1662007&r2=1662008&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java (original)
+++ aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java Tue Feb 24 16:32:56 2015
@@ -17,10 +17,6 @@
  */
 package org.apache.aries.blueprint.web;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
@@ -29,8 +25,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
 import org.apache.aries.blueprint.container.BlueprintContainerImpl;
+import org.apache.aries.blueprint.parser.NamespaceHandlerSet;
 
 /**
  * Initialises all the blueprint XML files called <code>META-INF/blueprint.xml</code> on the classpath
@@ -83,12 +84,17 @@ public class BlueprintContextListener im
                 }
             }
 
-            BlueprintContainerImpl container = new BlueprintContainerImpl(classLoader, resourcePaths, properties, true);
+            NamespaceHandlerSet nsHandlerSet = getNamespaceHandlerSet(classLoader);
+            BlueprintContainerImpl container = new BlueprintContainerImpl(classLoader, resourcePaths, properties, nsHandlerSet, true);
             servletContext.setAttribute(CONTAINER_ATTRIBUTE, container);
         } catch (Exception e) {
             servletContext.log("Failed to startup blueprint container. " + e, e);
         }
     }
+    
+    protected NamespaceHandlerSet getNamespaceHandlerSet(ClassLoader tccl) {
+        return null;
+    }
 
     public void contextDestroyed(ServletContextEvent event) {
         ServletContext servletContext = event.getServletContext();