From: Giovanni Meo Date: Thu, 13 Jun 2013 10:00:36 +0000 (+0200) Subject: Enable checkstyle for other non-source files X-Git-Tag: releasepom-0.1.0~355^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=bfe1f4b13e07f7b4f4f19e8f0b5f8ab5e619de0b Enable checkstyle for other non-source files Just to make sure there is uniformity of threatment, also other files are being exposed to checkstyle, limited to space and tabs rules. Along with the rules, bulk changing the code to avoid breakages in the build. Change-Id: I11c6a10d00fc7fc6a14d41369e2a39fd6ad01d6b Signed-off-by: Giovanni Meo --- diff --git a/opendaylight/clustering/integrationtest/pom.xml b/opendaylight/clustering/integrationtest/pom.xml index 460b09e9da..52c568203b 100644 --- a/opendaylight/clustering/integrationtest/pom.xml +++ b/opendaylight/clustering/integrationtest/pom.xml @@ -32,7 +32,7 @@ sal.implementation 0.4.0-SNAPSHOT - + org.opendaylight.controller clustering.services-implementation 0.4.0-SNAPSHOT diff --git a/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml b/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml index 03a9b4d93e..2aa3fdb849 100644 --- a/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml +++ b/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml @@ -19,7 +19,7 @@ - + diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/commons/integrationtest/pom.xml index 1f4b442ea4..89dbb77ecd 100644 --- a/opendaylight/commons/integrationtest/pom.xml +++ b/opendaylight/commons/integrationtest/pom.xml @@ -49,7 +49,7 @@ 0.8.0.v201110170705 - + diff --git a/opendaylight/commons/opendaylight/logback.xml b/opendaylight/commons/opendaylight/logback.xml index 043ceef329..05e607573e 100644 --- a/opendaylight/commons/opendaylight/logback.xml +++ b/opendaylight/commons/opendaylight/logback.xml @@ -1,11 +1,11 @@ - + %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} - %msg%n - + diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 4062e1839b..142c9d5d6c 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -303,6 +303,8 @@ ${project.parent.basedir}/space_and_tabs_checks.xml true true + ${project.basedir} + **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat diff --git a/opendaylight/commons/parent/logback.xml b/opendaylight/commons/parent/logback.xml index 043ceef329..05e607573e 100644 --- a/opendaylight/commons/parent/logback.xml +++ b/opendaylight/commons/parent/logback.xml @@ -1,11 +1,11 @@ - + %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} - %msg%n - + diff --git a/opendaylight/containermanager/implementation/pom.xml b/opendaylight/containermanager/implementation/pom.xml index 42ff3387f7..a324fca0d9 100644 --- a/opendaylight/containermanager/implementation/pom.xml +++ b/opendaylight/containermanager/implementation/pom.xml @@ -59,10 +59,10 @@ containermanager 0.4.0-SNAPSHOT - + org.opendaylight.controller sal 0.5.0-SNAPSHOT - + diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index bb8ac9dc16..50b34faac8 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -103,7 +103,7 @@ ../../samples/northbound/loadbalancer ../../commons/concepts ../../commons/integrationtest - + diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml index 8be21f6450..67a4735813 100644 --- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml +++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml @@ -1,6 +1,6 @@ - + osgipackage dir @@ -12,9 +12,9 @@ org.opendaylight.controller.thirdparty:org.openflow.openflowj org.opendaylight.controller:clustering.stub - org.opendaylight.controller:logging.bridge - org.opendaylight.controller:protocol_plugins.stub - org.opendaylight.controller:*.integrationtest + org.opendaylight.controller:logging.bridge + org.opendaylight.controller:protocol_plugins.stub + org.opendaylight.controller:*.integrationtest org.opendaylight.controller:hosttracker_new org.opendaylight.controller:hosttracker_new.implementation @@ -27,19 +27,19 @@ false - - - org.opendaylight.controller:logging.bridge - - - opendaylight/lib - - ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} - - false - false - - + + + org.opendaylight.controller:logging.bridge + + + opendaylight/lib + + ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} + + false + false + + @@ -54,15 +54,15 @@ virgomirror:org.eclipse.jdt.core.compiler.batch org.apache.felix:org.apache.felix.fileinstall geminiweb:org.eclipse.virgo.kernel.equinox.extensions - org.slf4j:slf4j-api - ch.qos.logback:logback-core - ch.qos.logback:logback-classic - com.sun.jersey:jersey-core - com.sun.jersey:jersey-json - com.sun.jersey:jersey-server + org.slf4j:slf4j-api + ch.qos.logback:logback-core + ch.qos.logback:logback-classic + com.sun.jersey:jersey-core + com.sun.jersey:jersey-json + com.sun.jersey:jersey-server - ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} + ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} false runtime @@ -80,16 +80,16 @@ virgomirror:org.eclipse.jdt.core.compiler.batch org.apache.felix:org.apache.felix.fileinstall geminiweb:org.eclipse.virgo.kernel.equinox.extensions - org.slf4j:slf4j-api - ch.qos.logback:logback-core - ch.qos.logback:logback-classic - com.sun.jersey:jersey-core - com.sun.jersey:jersey-json - com.sun.jersey:jersey-server + org.slf4j:slf4j-api + ch.qos.logback:logback-core + ch.qos.logback:logback-classic + com.sun.jersey:jersey-core + com.sun.jersey:jersey-json + com.sun.jersey:jersey-server false - ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} + ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} false runtime diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index a8d7beb49b..460145ee87 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -1,13 +1,13 @@ osgi.bundles=\ - reference\:file\:../lib/org.apache.felix.fileinstall-3.1.6.jar@1:start,\ - reference\:file\:../lib/org.eclipse.jdt.core.compiler.batch-3.8.0.I20120518-2145.jar@1:start,\ - reference\:file\:../lib/org.eclipse.equinox.ds-1.4.0.v20120522-1841.jar@2:start,\ - reference\:file\:../lib/org.eclipse.equinox.util-1.0.400.v20120522-2049.jar@2:start,\ - reference\:file\:../lib/org.eclipse.osgi.services-3.3.100.v20120522-1822@2:start,\ - reference\:file\:../lib/org.eclipse.equinox.console-1.0.0.v20120522-1841.jar@start,\ - reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\ - reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\ - reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\ + reference\:file\:../lib/org.apache.felix.fileinstall-3.1.6.jar@1:start,\ + reference\:file\:../lib/org.eclipse.jdt.core.compiler.batch-3.8.0.I20120518-2145.jar@1:start,\ + reference\:file\:../lib/org.eclipse.equinox.ds-1.4.0.v20120522-1841.jar@2:start,\ + reference\:file\:../lib/org.eclipse.equinox.util-1.0.400.v20120522-2049.jar@2:start,\ + reference\:file\:../lib/org.eclipse.osgi.services-3.3.100.v20120522-1822@2:start,\ + reference\:file\:../lib/org.eclipse.equinox.console-1.0.0.v20120522-1841.jar@start,\ + reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\ + reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\ + reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\ reference\:file\:../lib/logging.bridge-0.4.0-SNAPSHOT@1:start,\ reference\:file\:../lib/jersey-core-1.17.jar@2:start,\ reference\:file\:../lib/jersey-json-1.17.jar@2:start,\ @@ -19,7 +19,7 @@ osgi.bundles.defaultStartLevel=4 org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc # This is not Eclipse App eclipse.ignoreApp=true -# Don't shutdown equinox if the eclipse App has ended, +# Don't shutdown equinox if the eclipse App has ended, # which is our case because we are not running any eclipse application osgi.noShutdown=true # Clean any cached data on restart of the framework @@ -33,7 +33,7 @@ felix.fileinstall.dir=./plugins felix.fileinstall.noInitialDelay=true # Auto start the bundles at level 4 felix.fileinstall.start.level=4 -# Avoid to auto-install following bundles, that means those need +# Avoid to auto-install following bundles, that means those need # to be started manually or in other way like osgi.bundles felix.fileinstall.filter=^(?!org.apache.felix.fileinstall).* @@ -69,7 +69,7 @@ org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml # TLS configuration # To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files. -# The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate +# The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate # entries, including switches' Certification Authority (CA) certificates. For example, # secureChannelEnabled=true # controllerKeyStore=./configuration/ctlKeyStore diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml index a99d17d37c..de70a52a31 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml @@ -54,5 +54,5 @@ - + diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-server.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-server.xml index 4be075451e..56d469b599 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-server.xml +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-server.xml @@ -30,13 +30,13 @@ connectionTimeout="20000" redirectPort="8443" /> - - - ../../northbound/commons - + diff --git a/opendaylight/distribution/sdk/src/assemble/bin.xml b/opendaylight/distribution/sdk/src/assemble/bin.xml index bb3c6734f6..b2f45c38c9 100644 --- a/opendaylight/distribution/sdk/src/assemble/bin.xml +++ b/opendaylight/distribution/sdk/src/assemble/bin.xml @@ -1,4 +1,4 @@ - package diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml index 80eea57b8f..ea22c4f1ca 100644 --- a/opendaylight/forwarding/staticrouting/pom.xml +++ b/opendaylight/forwarding/staticrouting/pom.xml @@ -70,7 +70,7 @@ org.opendaylight.controller configuration 0.4.0-SNAPSHOT - + junit junit diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml index 7c0835a903..56da363d3e 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@ -33,7 +33,7 @@ org.opendaylight.controller.sal.authorization, org.opendaylight.controller.containermanager, org.opendaylight.controller.usermanager, - javax.servlet.http, + javax.servlet.http, org.slf4j diff --git a/opendaylight/northbound/flowprogrammer/enunciate.xml b/opendaylight/northbound/flowprogrammer/enunciate.xml index a49d9f8265..90bf6de1d6 100644 --- a/opendaylight/northbound/flowprogrammer/enunciate.xml +++ b/opendaylight/northbound/flowprogrammer/enunciate.xml @@ -1,7 +1,7 @@ - + diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml index 0a873ca065..c7e9a771c1 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@ -24,7 +24,7 @@ 0.5.0-SNAPSHOT - + org.apache.felix maven-bundle-plugin @@ -43,7 +43,7 @@ org.opendaylight.controller.northbound.commons.utils, org.opendaylight.controller.sal.authorization, org.opendaylight.controller.usermanager, - com.sun.jersey.spi.container.servlet, + com.sun.jersey.spi.container.servlet, javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, @@ -70,7 +70,7 @@ org.opendaylight.controller switchmanager 0.4.0-SNAPSHOT - + org.opendaylight.controller forwardingrulesmanager @@ -87,10 +87,10 @@ ${enunciate.version} - org.opendaylight.controller - commons.northbound - 0.4.0-SNAPSHOT - + org.opendaylight.controller + commons.northbound + 0.4.0-SNAPSHOT + org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml index 83f7e4b35d..4cedf2df89 100644 --- a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml @@ -1,51 +1,51 @@ - - - JAXRSFlowProgrammer - com.sun.jersey.spi.container.servlet.ServletContainer - - javax.ws.rs.Application - org.opendaylight.controller.flowprogrammer.northbound.FlowProgrammerNorthboundRSApplication - - 1 - - - - JAXRSFlowProgrammer - /* - + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> + + + JAXRSFlowProgrammer + com.sun.jersey.spi.container.servlet.ServletContainer + + javax.ws.rs.Application + org.opendaylight.controller.flowprogrammer.northbound.FlowProgrammerNorthboundRSApplication + + 1 + + + + JAXRSFlowProgrammer + /* + + + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - - NB api - /* - - - System-Admin - Network-Admin - Network-Operator - Container-User - - - - System-Admin - - - Network-Admin - - - Network-Operator - - - Container-User - - - - BASIC - opendaylight - + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + + + + BASIC + opendaylight + \ No newline at end of file diff --git a/opendaylight/northbound/hosttracker/enunciate.xml b/opendaylight/northbound/hosttracker/enunciate.xml index 8f0d7e6ab8..e0c7dcd2ac 100644 --- a/opendaylight/northbound/hosttracker/enunciate.xml +++ b/opendaylight/northbound/hosttracker/enunciate.xml @@ -1,7 +1,7 @@ - + diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index 853c54ec2c..f0caa52d63 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -24,7 +24,7 @@ 0.5.0-SNAPSHOT - + org.apache.felix maven-bundle-plugin diff --git a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml index 7eb940875a..0fa8b95dd0 100644 --- a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> JAXRSHostTracker com.sun.jersey.spi.container.servlet.ServletContainer @@ -17,34 +17,34 @@ /* - - - NB api - /* - - - System-Admin - Network-Admin - Network-Operator - Container-User - - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - System-Admin - - - Network-Admin - - - Network-Operator - - - Container-User - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - BASIC - opendaylight - + + BASIC + opendaylight + \ No newline at end of file diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml index aa4469e452..90acc8c59f 100644 --- a/opendaylight/northbound/integrationtest/pom.xml +++ b/opendaylight/northbound/integrationtest/pom.xml @@ -607,7 +607,7 @@ jersey-core ${jersey.version} - com.sun.jersey @@ -627,4 +627,3 @@ - diff --git a/opendaylight/northbound/integrationtest/src/test/resources/tomcat-server.xml b/opendaylight/northbound/integrationtest/src/test/resources/tomcat-server.xml index 4be075451e..56d469b599 100644 --- a/opendaylight/northbound/integrationtest/src/test/resources/tomcat-server.xml +++ b/opendaylight/northbound/integrationtest/src/test/resources/tomcat-server.xml @@ -30,13 +30,13 @@ connectionTimeout="20000" redirectPort="8443" /> - - - - diff --git a/opendaylight/usermanager/implementation/pom.xml b/opendaylight/usermanager/implementation/pom.xml index 96d6426cc2..a558fa2048 100644 --- a/opendaylight/usermanager/implementation/pom.xml +++ b/opendaylight/usermanager/implementation/pom.xml @@ -48,7 +48,7 @@ org.opendaylight.controller.usermanager - diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml b/opendaylight/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml index 6b0a731b99..af5cd8d456 100644 --- a/opendaylight/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml +++ b/opendaylight/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - + - - + + diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/web.xml b/opendaylight/web/devices/src/main/resources/WEB-INF/web.xml index 0c7edce249..6294a9fb5b 100644 --- a/opendaylight/web/devices/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/web/devices/src/main/resources/WEB-INF/web.xml @@ -1,75 +1,75 @@ - - - free access - /js/* - /images/* - /css/* - /favicon.ico - - + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> + + + free access + /js/* + /images/* + /css/* + /favicon.ico + + - - DevicesApp - - DevicesGUI - /* - - - System-Admin - Network-Admin - Network-Operator - Container-User - - + + DevicesApp + + DevicesGUI + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - System-Admin - - - Network-Admin - - - Network-Operator - - - Container-User - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - FORM - - /WEB-INF/jsp/login.jsp - /WEB-INF/jsp/error.jsp - - + + FORM + + /WEB-INF/jsp/login.jsp + /WEB-INF/jsp/error.jsp + + 403 /WEB-INF/jsp/autherror.jsp - - Devices - org.springframework.web.servlet.DispatcherServlet - 1 - + + Devices + org.springframework.web.servlet.DispatcherServlet + 1 + - - Devices - / - + + Devices + / + - - org.opendaylight.controller.web.ControllerUISessionManager - - - - / - - + + org.opendaylight.controller.web.ControllerUISessionManager + + + + / + + diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml b/opendaylight/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml index fbe69795c2..293fa77ef1 100644 --- a/opendaylight/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml +++ b/opendaylight/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - + - - + + diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/web.xml b/opendaylight/web/flows/src/main/resources/WEB-INF/web.xml index 5660a37a14..c5d2479f6b 100644 --- a/opendaylight/web/flows/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/web/flows/src/main/resources/WEB-INF/web.xml @@ -1,79 +1,79 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> - - Flows - org.springframework.web.servlet.DispatcherServlet - 1 - + + Flows + org.springframework.web.servlet.DispatcherServlet + 1 + - - Flows - / - + + Flows + / + - - - free access - /js/* - /images/* - /css/* - /favicon.ico - - + + + free access + /js/* + /images/* + /css/* + /favicon.ico + + - - FlowApp - - FlowMgrGUI - /* - - - System-Admin - Network-Admin - Network-Operator - Container-User - - - - System-Admin - - - Network-Admin - - - Network-Operator - - - Container-User - + + FlowApp + + FlowMgrGUI + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - FORM - - /WEB-INF/jsp/login.jsp - /WEB-INF/jsp/error.jsp - - + + FORM + + /WEB-INF/jsp/login.jsp + /WEB-INF/jsp/error.jsp + + 403 /WEB-INF/jsp/autherror.jsp - - org.opendaylight.controller.web.ControllerUISessionManager - + + org.opendaylight.controller.web.ControllerUISessionManager + - - - / - - + + + / + + diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml b/opendaylight/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml index a818c8e6c9..a8cb864367 100644 --- a/opendaylight/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml +++ b/opendaylight/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - + - - + + \ No newline at end of file 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 18ac6e7ecb..1e373fb56c 100644 --- 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 @@ -1,82 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler" /> + + @@ -88,33 +88,33 @@ - - + + + + + + + + - - - - - + + + + + + + - - - - - - - + - + + + - - - - 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 d96fb6eba2..557b9c74f5 100644 --- a/opendaylight/web/root/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/web/root/src/main/resources/WEB-INF/web.xml @@ -1,84 +1,84 @@ - + + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> - - - free access - /js/* - /images/* - /css/* - /favicon.ico - - + + + free access + /js/* + /images/* + /css/* + /favicon.ico + + - - RootApp - - RootGUI - /* - - - System-Admin - Network-Admin - Network-Operator - Container-User - - + + RootApp + + RootGUI + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - System-Admin - - - Network-Admin - - - Network-Operator - - - Container-User - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - FORM - - /WEB-INF/jsp/login.jsp - /WEB-INF/jsp/error.jsp - - + + FORM + + /WEB-INF/jsp/login.jsp + /WEB-INF/jsp/error.jsp + + 403 /WEB-INF/jsp/autherror.jsp - - RootGUI - org.springframework.web.servlet.DispatcherServlet - 1 - + + RootGUI + org.springframework.web.servlet.DispatcherServlet + 1 + - - RootGUI - / - + + RootGUI + / + - OpenDaylight Controller - OpenDaylight Controller + OpenDaylight Controller + OpenDaylight Controller - - org.opendaylight.controller.web.ControllerUISessionManager - + + org.opendaylight.controller.web.ControllerUISessionManager + - - - / - - + + + / + + diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml b/opendaylight/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml index 1c05bbcd7e..cb6f2b6973 100644 --- a/opendaylight/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml +++ b/opendaylight/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - + - - + + diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml b/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml index 274908caec..c37fffe500 100644 --- a/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/web/topology/src/main/resources/WEB-INF/web.xml @@ -1,78 +1,78 @@ - - - free access - /js/* - /images/* - /css/* - /favicon.ico - - + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> + + + free access + /js/* + /images/* + /css/* + /favicon.ico + + - - TopologyApp - - TopoGUI - /* - - - System-Admin - Network-Admin - Network-Operator - Container-User - - - - System-Admin - - - Network-Admin - - - Network-Operator - - - Container-User - + + TopologyApp + + TopoGUI + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - FORM - - /WEB-INF/jsp/login.jsp - /WEB-INF/jsp/error.jsp - - + + FORM + + /WEB-INF/jsp/login.jsp + /WEB-INF/jsp/error.jsp + + 403 /WEB-INF/jsp/autherror.jsp - - Topology - org.springframework.web.servlet.DispatcherServlet - 1 - + + Topology + org.springframework.web.servlet.DispatcherServlet + 1 + - - Topology - / - + + Topology + / + - - org.opendaylight.controller.web.ControllerUISessionManager - + + org.opendaylight.controller.web.ControllerUISessionManager + - - - / - - + + + / + + diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml b/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml index 877617a975..91e22f6dad 100644 --- a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml +++ b/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - + - - + + diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/web.xml b/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/web.xml index 47d38f9a53..2d89e9d975 100644 --- a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/web.xml @@ -1,81 +1,81 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> - - Troubleshoot - org.springframework.web.servlet.DispatcherServlet - 1 - + + Troubleshoot + org.springframework.web.servlet.DispatcherServlet + 1 + - - Troubleshoot - / - + + Troubleshoot + / + - - - free access - /js/* - /images/* - /css/* - /favicon.ico - - + + + free access + /js/* + /images/* + /css/* + /favicon.ico + + - - TroubleShootApp - - TroubleShootGUI - /* - - - System-Admin - Network-Admin - Network-Operator - Container-User - - + + TroubleShootApp + + TroubleShootGUI + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - System-Admin - - - Network-Admin - - - Network-Operator - - - Container-User - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - FORM - - /WEB-INF/jsp/login.jsp - /WEB-INF/jsp/error.jsp - - + + FORM + + /WEB-INF/jsp/login.jsp + /WEB-INF/jsp/error.jsp + + 403 /WEB-INF/jsp/autherror.jsp - - org.opendaylight.controller.web.ControllerUISessionManager - + + org.opendaylight.controller.web.ControllerUISessionManager + - - - / - - + + + / + +