Merge "BUG-694: Disable DataReader registration for BA Broker"

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index 9df653cf94f00af395839711d6a347e2b1b04a0d..e678ef726d2a22a83d75fd10501eab43fa7e9bba 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@ -47,9 +47,12 @@ eclipse.ignoreApp=true
 osgi.noShutdown=true
 # Clean any cached data on restart of the framework
 osgi.clean=true
+
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578
 # Extend the framework to avoid the resources to be presented with
 # a URL of type bundleresource: but to be presented as file:
 osgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator
+
 # Directory from where the fileinstall will monitor for new bundles
 felix.fileinstall.dir=./plugins
 # Immediately learn new bundles at startup

diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml
index 1e373fb56cd43d8d25550559e1b8878ee44b9db3..a649b082e4f422b92553df6aadc6b170948f1ebc 100644 (file)
--- a/opendaylight/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml
+++ b/opendaylight/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml
@@ -8,11 +8,11 @@
 
         <http pattern="/css/**" security="none" />
         <http pattern="/js/**" security="none" />
-        <http pattern="/images/**" security="none" />
+        <http pattern="/img/**" security="none" />
         <http pattern="/favicon.ico" security="none" />
         <http pattern="/controller/web/css/**" security="none" />
         <http pattern="/controller/web/js/**" security="none" />
-        <http pattern="/controller/web/images/**" security="none" />
+        <http pattern="/controller/web/img/**" security="none" />
 
 
         <http auto-config="false" authentication-manager-ref="authenticationManager"

diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/web.xml b/opendaylight/web/root/src/main/resources/WEB-INF/web.xml
index 072f08f581eadb4b6b9290c92e93776f7b560c87..062766d1ab9ccba44f964e592fb21cd7ee97b004 100644 (file)
--- a/opendaylight/web/root/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/web/root/src/main/resources/WEB-INF/web.xml
@@ -43,7 +43,7 @@
           <web-resource-collection>
              <web-resource-name>free access</web-resource-name>
              <url-pattern>/js/*</url-pattern>
-             <url-pattern>/images/*</url-pattern>
+             <url-pattern>/img/*</url-pattern>
              <url-pattern>/css/*</url-pattern>
              <url-pattern>/favicon.ico</url-pattern>
              <url-pattern>/versionProperty/*</url-pattern>