Merge "Add support to RESTCONF to dynamically specify Filters"

diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/sal-rest-connector/pom.xml
index 31b614766f58f187499ccaf7c674de1205a2181b..aee9c961ebf4082e3d24dfbb9936410d4c1ffac2 100644 (file)
--- a/restconf/sal-rest-connector/pom.xml
+++ b/restconf/sal-rest-connector/pom.xml
@@ -196,6 +196,7 @@
               org.opendaylight.aaa.shiro.filters,
               org.opendaylight.aaa.shiro.realm,
               org.opendaylight.aaa.shiro.web.env,
+              org.opendaylight.aaa.filterchain.filters,
               org.apache.shiro.web.env
             </Import-Package>
             <Embed-Dependency>stax-utils</Embed-Dependency>

diff --git a/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml b/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
index 493572952598594c7cb32d0e80b3cab03c8ad461..6b801d7321307adc5cf70ea2f62c662933dc17a4 100644 (file)
--- a/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
+++ b/restconf/sal-rest-connector/src/main/resources/WEB-INF/web.xml
@@ -32,6 +32,17 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <filter>
+        <filter-name>DynamicFilterChain</filter-name>
+        <filter-class>org.opendaylight.aaa.filterchain.filters.CustomFilterAdapter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>DynamicFilterChain</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+
     <servlet-mapping>
         <servlet-name>JAXRSRestconf</servlet-name>
         <url-pattern>/*</url-pattern>