Enable checkstyle for other non-source files 74/474/2
authorGiovanni Meo <gmeo@cisco.com>
Thu, 13 Jun 2013 10:00:36 +0000 (12:00 +0200)
committerGiovanni Meo <gmeo@cisco.com>
Fri, 14 Jun 2013 14:34:02 +0000 (16:34 +0200)
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 <gmeo@cisco.com>
56 files changed:
opendaylight/clustering/integrationtest/pom.xml
opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml
opendaylight/commons/integrationtest/pom.xml
opendaylight/commons/opendaylight/logback.xml
opendaylight/commons/opendaylight/pom.xml
opendaylight/commons/parent/logback.xml
opendaylight/containermanager/implementation/pom.xml
opendaylight/distribution/opendaylight/pom.xml
opendaylight/distribution/opendaylight/src/assemble/bin.xml
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml
opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-server.xml
opendaylight/distribution/opendaylight/src/main/resources/run.bat
opendaylight/distribution/p2site/pom.xml
opendaylight/distribution/sdk/pom.xml
opendaylight/distribution/sdk/src/assemble/bin.xml
opendaylight/forwarding/staticrouting/pom.xml
opendaylight/northbound/commons/pom.xml
opendaylight/northbound/flowprogrammer/enunciate.xml
opendaylight/northbound/flowprogrammer/pom.xml
opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/hosttracker/enunciate.xml
opendaylight/northbound/hosttracker/pom.xml
opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/integrationtest/pom.xml
opendaylight/northbound/integrationtest/src/test/resources/tomcat-server.xml
opendaylight/northbound/staticrouting/enunciate.xml
opendaylight/northbound/staticrouting/pom.xml
opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/statistics/enunciate.xml
opendaylight/northbound/statistics/pom.xml
opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/subnets/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/switchmanager/enunciate.xml
opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/topology/enunciate.xml
opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml
opendaylight/northboundtest/unit_test_suite/pom.xml
opendaylight/protocol_plugins/stub/pom.xml
opendaylight/samples/northbound/loadbalancer/enunciate.xml
opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml
opendaylight/statisticsmanager/api/pom.xml
opendaylight/switchmanager/integrationtest/pom.xml
opendaylight/usermanager/api/pom.xml
opendaylight/usermanager/implementation/pom.xml
opendaylight/web/devices/src/main/resources/WEB-INF/Devices-servlet.xml
opendaylight/web/devices/src/main/resources/WEB-INF/web.xml
opendaylight/web/flows/src/main/resources/WEB-INF/Flows-servlet.xml
opendaylight/web/flows/src/main/resources/WEB-INF/web.xml
opendaylight/web/root/src/main/resources/WEB-INF/RootGUI-servlet.xml
opendaylight/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml
opendaylight/web/root/src/main/resources/WEB-INF/web.xml
opendaylight/web/topology/src/main/resources/WEB-INF/Topology-servlet.xml
opendaylight/web/topology/src/main/resources/WEB-INF/web.xml
opendaylight/web/troubleshoot/src/main/resources/WEB-INF/Troubleshoot-servlet.xml
opendaylight/web/troubleshoot/src/main/resources/WEB-INF/web.xml

index 460b09e..52c5682 100644 (file)
@@ -32,7 +32,7 @@
       <artifactId>sal.implementation</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-       <dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>clustering.services-implementation</artifactId>
       <version>0.4.0-SNAPSHOT</version>
index 03a9b4d..2aa3fdb 100644 (file)
@@ -19,7 +19,7 @@
     <!--
         Used to register JMX statistics in any available MBean server
     -->
-    <jmxStatistics enabled="true"/>    
+    <jmxStatistics enabled="true"/>
   </default>
   <!-- transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" -->
   <namedCache name="transactional-type">
index 1f4b442..89dbb77 100644 (file)
@@ -49,7 +49,7 @@
       <version>0.8.0.v201110170705</version>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>
index 043ceef..05e6075 100644 (file)
@@ -1,11 +1,11 @@
 <configuration scan="true">
-  
+
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
       <pattern>%date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </encoder>
   </appender>
-  
+
   <root level="error">
     <appender-ref ref="STDOUT" />
   </root>
index 4062e18..142c9d5 100644 (file)
           <configLocation>${project.parent.basedir}/space_and_tabs_checks.xml</configLocation>
           <consoleOutput>true</consoleOutput>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <sourceDirectory>${project.basedir}</sourceDirectory>
+          <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
         </configuration>
       </plugin>
       <plugin>
index 043ceef..05e6075 100644 (file)
@@ -1,11 +1,11 @@
 <configuration scan="true">
-  
+
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
       <pattern>%date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </encoder>
   </appender>
-  
+
   <root level="error">
     <appender-ref ref="STDOUT" />
   </root>
index 42ff338..a324fca 100644 (file)
       <artifactId>containermanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-       <dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
-       </dependency> 
+    </dependency>
   </dependencies>
 </project>
index bb8ac9d..50b34fa 100644 (file)
     <module>../../samples/northbound/loadbalancer</module>
     <module>../../commons/concepts</module>
     <module>../../commons/integrationtest</module>
-    
+
   </modules>
 
   <build>
index 8be21f6..67a4735 100644 (file)
@@ -1,6 +1,6 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
   <id>osgipackage</id>
   <formats>
     <format>dir</format>
@@ -12,9 +12,9 @@
       <excludes>
         <exclude>org.opendaylight.controller.thirdparty:org.openflow.openflowj</exclude>
         <exclude>org.opendaylight.controller:clustering.stub</exclude>
-               <exclude>org.opendaylight.controller:logging.bridge</exclude>
-               <exclude>org.opendaylight.controller:protocol_plugins.stub</exclude>
-               <exclude>org.opendaylight.controller:*.integrationtest</exclude>
+        <exclude>org.opendaylight.controller:logging.bridge</exclude>
+        <exclude>org.opendaylight.controller:protocol_plugins.stub</exclude>
+        <exclude>org.opendaylight.controller:*.integrationtest</exclude>
         <exclude>org.opendaylight.controller:hosttracker_new</exclude>
         <exclude>org.opendaylight.controller:hosttracker_new.implementation</exclude>
       </excludes>
         <includeDependencies>false</includeDependencies>
       </binaries>
     </moduleSet>
-       <moduleSet>
-         <includes>
-               <include>org.opendaylight.controller:logging.bridge</include>
-         </includes>
-         <binaries>
-               <outputDirectory>opendaylight/lib</outputDirectory>
-               <outputFileNameMapping>
-                 ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
-               </outputFileNameMapping>
-               <unpack>false</unpack>
-               <includeDependencies>false</includeDependencies>
-         </binaries>
-       </moduleSet>
+    <moduleSet>
+      <includes>
+        <include>org.opendaylight.controller:logging.bridge</include>
+      </includes>
+      <binaries>
+        <outputDirectory>opendaylight/lib</outputDirectory>
+        <outputFileNameMapping>
+          ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
+        </outputFileNameMapping>
+        <unpack>false</unpack>
+        <includeDependencies>false</includeDependencies>
+      </binaries>
+    </moduleSet>
   </moduleSets>
   <dependencySets>
     <dependencySet>
         <exclude>virgomirror:org.eclipse.jdt.core.compiler.batch</exclude>
         <exclude>org.apache.felix:org.apache.felix.fileinstall</exclude>
         <exclude>geminiweb:org.eclipse.virgo.kernel.equinox.extensions</exclude>
-               <exclude>org.slf4j:slf4j-api</exclude>
-               <exclude>ch.qos.logback:logback-core</exclude>
-               <exclude>ch.qos.logback:logback-classic</exclude>
-               <exclude>com.sun.jersey:jersey-core</exclude>
-               <exclude>com.sun.jersey:jersey-json</exclude>
-               <exclude>com.sun.jersey:jersey-server</exclude>
+        <exclude>org.slf4j:slf4j-api</exclude>
+        <exclude>ch.qos.logback:logback-core</exclude>
+        <exclude>ch.qos.logback:logback-classic</exclude>
+        <exclude>com.sun.jersey:jersey-core</exclude>
+        <exclude>com.sun.jersey:jersey-json</exclude>
+        <exclude>com.sun.jersey:jersey-server</exclude>
       </excludes>
       <outputFileNameMapping>
-        ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}      
+        ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
       </outputFileNameMapping>
       <unpack>false</unpack>
       <scope>runtime</scope>
         <include>virgomirror:org.eclipse.jdt.core.compiler.batch</include>
         <include>org.apache.felix:org.apache.felix.fileinstall</include>
         <include>geminiweb:org.eclipse.virgo.kernel.equinox.extensions</include>
-               <include>org.slf4j:slf4j-api</include>
-               <include>ch.qos.logback:logback-core</include>
-               <include>ch.qos.logback:logback-classic</include>
-               <include>com.sun.jersey:jersey-core</include>
-               <include>com.sun.jersey:jersey-json</include>
-               <include>com.sun.jersey:jersey-server</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>ch.qos.logback:logback-core</include>
+        <include>ch.qos.logback:logback-classic</include>
+        <include>com.sun.jersey:jersey-core</include>
+        <include>com.sun.jersey:jersey-json</include>
+        <include>com.sun.jersey:jersey-server</include>
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputFileNameMapping>
-        ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}      
+        ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
       </outputFileNameMapping>
       <unpack>false</unpack>
       <scope>runtime</scope>
index a8d7beb..460145e 100644 (file)
@@ -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
index a99d17d..de70a52 100644 (file)
@@ -54,5 +54,5 @@
   <logger name="org.opendaylight.controller.topologymanager" level="INFO"/>
   <logger name="org.opendaylight.controller.usermanager" level="INFO"/>
   <!-- Web modules -->
-  <logger name="org.opendaylight.controller.web" level="INFO"/>        
+  <logger name="org.opendaylight.controller.web" level="INFO"/>
 </configuration>
index 4be0754..56d469b 100644 (file)
                connectionTimeout="20000"
                redirectPort="8443" />
 
-<!-- 
-       Please remove the comments around the following Connector tag to enable HTTPS Authentication support.
-       Remember to add a valid keystore in the configuration folder.
-       More info : http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration 
+<!--
+        Please remove the comments around the following Connector tag to enable HTTPS Authentication support.
+        Remember to add a valid keystore in the configuration folder.
+        More info : http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration
 -->
- <!-- 
+
+ <!--
     <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
                maxThreads="150" scheme="https" secure="true"
                clientAuth="false" sslProtocol="TLS"
             unpackWARs="false" autoDeploy="false"
             deployOnStartup="false" createDirs="false">
         <Realm className="org.opendaylight.controller.security.ControllerCustomRealm" />
-           <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-     
+            <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
-                       prefix="web_access_log_" suffix=".txt" resolveHosts="false"
-                       rotatable="true" fileDateFormat="yyyy-MM"
-                       pattern="%{yyyy-MM-dd HH:mm:ss.SSS z}t - [%a] - %r"/>
-               
+                        prefix="web_access_log_" suffix=".txt" resolveHosts="false"
+                        rotatable="true" fileDateFormat="yyyy-MM"
+                        pattern="%{yyyy-MM-dd HH:mm:ss.SSS z}t - [%a] - %r"/>
+
       </Host>
     </Engine>
   </Service>
index 79a00f3..6fb9f06 100644 (file)
@@ -2,7 +2,7 @@
 SETLOCAL
 SETLOCAL ENABLEDELAYEDEXPANSION
 IF EXIST "%JAVA_HOME%" (
-               set basedir=%~dp0
+        set basedir=%~dp0
 REM       Now set the classpath:
                 set cp="!basedir!lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar;!basedir!lib\org.eclipse.virgo.kernel.equinox.extensions-3.6.0.RELEASE.jar;!basedir!lib\org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar"
 
@@ -19,4 +19,4 @@ REM echo %JAVA_HOME%\bin\java.exe %* -Djava.io.tmpdir=!basedir!work\tmp -Dosgi.i
     ECHO JAVA_HOME environment variable is not set
     PAUSE
 )
-ENDLOCAL
\ No newline at end of file
+ENDLOCAL
index 2efb674..e7c7f49 100644 (file)
@@ -29,7 +29,7 @@
   <artifactId>distribution.p2site</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  
+
   <build>
     <plugins>
       <plugin>
index b4afa61..07ba376 100644 (file)
@@ -38,7 +38,7 @@
     <!-- Northbound common hooks -->
     <module>../../northbound/commons</module>
   </modules>
-  
+
   <build>
     <plugins>
       <plugin>
index bb3c673..b2f45c3 100644 (file)
@@ -1,4 +1,4 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
   <id>package</id>
index 80eea57..ea22c4f 100644 (file)
@@ -70,7 +70,7 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
index 7c0835a..56da363 100644 (file)
@@ -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
             </Import-Package>
           </instructions>
index a49d9f8..90bf6de 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <enunciate label="full" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
-  
+
   <services>
     <rest defaultRestSubcontext="/controller/nb/v2/flow"/>
   </services>
index 0a873ca..c7e9a77 100644 (file)
@@ -24,7 +24,7 @@
             <version>0.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
-      </plugin>    
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -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 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>switchmanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>forwardingrulesmanager</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
     <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>commons.northbound</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
-       </dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>commons.northbound</artifactId>
+          <version>0.4.0-SNAPSHOT</version>
+        </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
index 83f7e4b..4cedf2d 100644 (file)
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
-  
-       <servlet>
-         <servlet-name>JAXRSFlowProgrammer</servlet-name>
-         <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-         <init-param>
-           <param-name>javax.ws.rs.Application</param-name>
-           <param-value>org.opendaylight.controller.flowprogrammer.northbound.FlowProgrammerNorthboundRSApplication</param-value>
-         </init-param>
-         <load-on-startup>1</load-on-startup>
-       </servlet>
-       
-       <servlet-mapping>
-         <servlet-name>JAXRSFlowProgrammer</servlet-name>
-         <url-pattern>/*</url-pattern>
-       </servlet-mapping>
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
+
+        <servlet>
+          <servlet-name>JAXRSFlowProgrammer</servlet-name>
+          <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+          <init-param>
+            <param-name>javax.ws.rs.Application</param-name>
+            <param-value>org.opendaylight.controller.flowprogrammer.northbound.FlowProgrammerNorthboundRSApplication</param-value>
+          </init-param>
+          <load-on-startup>1</load-on-startup>
+        </servlet>
+
+        <servlet-mapping>
+          <servlet-name>JAXRSFlowProgrammer</servlet-name>
+          <url-pattern>/*</url-pattern>
+        </servlet-mapping>
+
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>NB api</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>NB api</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
-    
     <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
-       
-       <login-config>
-               <auth-method>BASIC</auth-method>
-               <realm-name>opendaylight</realm-name>
-       </login-config>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
+
+        <login-config>
+                <auth-method>BASIC</auth-method>
+                <realm-name>opendaylight</realm-name>
+        </login-config>
 </web-app>
\ No newline at end of file
index 8f0d7e6..e0c7dcd 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <enunciate label="full" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
-  
+
   <services>
     <rest defaultRestSubcontext="/controller/nb/v2/host"/>
   </services>
index 853c54e..f0caa52 100644 (file)
@@ -24,7 +24,7 @@
             <version>0.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
-      </plugin>    
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
index 7eb9408..0fa8b95 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
   <servlet>
     <servlet-name>JAXRSHostTracker</servlet-name>
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>NB api</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>NB api</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>BASIC</auth-method>
-               <realm-name>opendaylight</realm-name>
-       </login-config>
+        <login-config>
+                <auth-method>BASIC</auth-method>
+                <realm-name>opendaylight</realm-name>
+        </login-config>
 </web-app>
\ No newline at end of file
index aa4469e..90acc8c 100644 (file)
       <artifactId>jersey-core</artifactId>
       <version>${jersey.version}</version>
     </dependency>
-    <!-- <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> 
+    <!-- <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId>
       <version>${jersey.version}</version> </dependency> -->
     <dependency>
       <groupId>com.sun.jersey</groupId>
 
   </dependencies>
 </project>
-
index 4be0754..56d469b 100644 (file)
                connectionTimeout="20000"
                redirectPort="8443" />
 
-<!-- 
-       Please remove the comments around the following Connector tag to enable HTTPS Authentication support.
-       Remember to add a valid keystore in the configuration folder.
-       More info : http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration 
+<!--
+        Please remove the comments around the following Connector tag to enable HTTPS Authentication support.
+        Remember to add a valid keystore in the configuration folder.
+        More info : http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration
 -->
- <!-- 
+
+ <!--
     <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
                maxThreads="150" scheme="https" secure="true"
                clientAuth="false" sslProtocol="TLS"
             unpackWARs="false" autoDeploy="false"
             deployOnStartup="false" createDirs="false">
         <Realm className="org.opendaylight.controller.security.ControllerCustomRealm" />
-           <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-     
+            <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
-                       prefix="web_access_log_" suffix=".txt" resolveHosts="false"
-                       rotatable="true" fileDateFormat="yyyy-MM"
-                       pattern="%{yyyy-MM-dd HH:mm:ss.SSS z}t - [%a] - %r"/>
-               
+                        prefix="web_access_log_" suffix=".txt" resolveHosts="false"
+                        rotatable="true" fileDateFormat="yyyy-MM"
+                        pattern="%{yyyy-MM-dd HH:mm:ss.SSS z}t - [%a] - %r"/>
+
       </Host>
     </Engine>
   </Service>
index 4d6bed0..402b655 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <enunciate label="full" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
-  
+
   <services>
     <rest defaultRestSubcontext="/controller/nb/v2/staticroute"/>
   </services>
index f656faf..bb88465 100644 (file)
@@ -91,6 +91,6 @@
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
       <version>1.17-SNAPSHOT</version>
-    </dependency>   
+    </dependency>
   </dependencies>
 </project>
index 37901a6..4a040c1 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
   <servlet>
     <servlet-name>JAXRSStaticRouting</servlet-name>
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-       <servlet-mapping>
-               <servlet-name>JAXRSStaticRouting</servlet-name>
-               <url-pattern>/*</url-pattern>
-       </servlet-mapping>
+        <servlet-mapping>
+                <servlet-name>JAXRSStaticRouting</servlet-name>
+                <url-pattern>/*</url-pattern>
+        </servlet-mapping>
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>NB api</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>NB api</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>BASIC</auth-method>
-               <realm-name>opendaylight</realm-name>
-       </login-config>  
+        <login-config>
+                <auth-method>BASIC</auth-method>
+                <realm-name>opendaylight</realm-name>
+        </login-config>
 </web-app>
\ No newline at end of file
index 3f2759d..63ae439 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <enunciate label="full" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
-  
+
   <services>
     <rest defaultRestSubcontext="/controller/nb/v2/statistics"/>
   </services>
index 7ce5c43..cad50e2 100644 (file)
@@ -24,7 +24,7 @@
             <version>0.5.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
-      </plugin>        
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
index 24242d3..f152aa7 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
   <servlet>
     <servlet-name>JAXRSStatistics</servlet-name>
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>NB api</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>NB api</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>BASIC</auth-method>
-               <realm-name>opendaylight</realm-name>
-       </login-config>
+        <login-config>
+                <auth-method>BASIC</auth-method>
+                <realm-name>opendaylight</realm-name>
+        </login-config>
 </web-app>
\ No newline at end of file
index 1c201d3..f7eccef 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">  
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
   <servlet>
     <servlet-name>JAXRSSubnets</servlet-name>
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <servlet-name>JAXRSSubnets</servlet-name>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>NB api</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>NB api</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>BASIC</auth-method>
-               <realm-name>opendaylight</realm-name>
-       </login-config>
+        <login-config>
+                <auth-method>BASIC</auth-method>
+                <realm-name>opendaylight</realm-name>
+        </login-config>
 </web-app>
index 9338b55..8a8bfdb 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <enunciate label="full" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
-  
+
   <services>
     <rest defaultRestSubcontext="/controller/nb/v2/switch"/>
   </services>
index a16cdfa..188b21b 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
   <servlet>
     <servlet-name>JAXRSSwitchManager</servlet-name>
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>NB api</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>NB api</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>BASIC</auth-method>
-               <realm-name>opendaylight</realm-name>
-       </login-config>
+        <login-config>
+                <auth-method>BASIC</auth-method>
+                <realm-name>opendaylight</realm-name>
+        </login-config>
 </web-app>
\ No newline at end of file
index c955d8c..b7c451c 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <enunciate label="full" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
-  
+
   <services>
     <rest defaultRestSubcontext="/controller/nb/v2/topology"/>
   </services>
index e40c5fb..a46e433 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
   <servlet>
     <servlet-name>JAXRSTopology</servlet-name>
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>NB api</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>NB api</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>BASIC</auth-method>
-               <realm-name>opendaylight</realm-name>
-       </login-config>
+        <login-config>
+                <auth-method>BASIC</auth-method>
+                <realm-name>opendaylight</realm-name>
+        </login-config>
 </web-app>
index 0a22a57..ed4f330 100644 (file)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+        <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
-  
-       <groupId>org.opendaylight.controller</groupId>
-       <artifactId>northboundtest</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.6</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Import-Package>
-                                                       org.opendaylight.controller.sal.core,
-                                                       org.eclipse.osgi.framework.console,
-                                                       org.osgi.framework,
-                                       org.apache.felix.dm
-                                               </Import-Package>
-                                               <Export-Package>
-                                               </Export-Package>
-                                               <Bundle-Activator>
-                                         org.opendaylight.controller.northboundtest.unittestsuite.internal.Activator
-                                       </Bundle-Activator>
-                                               <Service-Component>
-                                               </Service-Component>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
-               </dependency>    
-       </dependencies>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>northboundtest</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+        <packaging>bundle</packaging>
+
+        <build>
+                <plugins>
+                        <plugin>
+                                <groupId>org.apache.felix</groupId>
+                                <artifactId>maven-bundle-plugin</artifactId>
+                                <version>2.3.6</version>
+                                <extensions>true</extensions>
+                                <configuration>
+                                        <instructions>
+                                                <Import-Package>
+                                                        org.opendaylight.controller.sal.core,
+                                                        org.eclipse.osgi.framework.console,
+                                                        org.osgi.framework,
+                                        org.apache.felix.dm
+                                                </Import-Package>
+                                                <Export-Package>
+                                                </Export-Package>
+                                                <Bundle-Activator>
+                                          org.opendaylight.controller.northboundtest.unittestsuite.internal.Activator
+                                        </Bundle-Activator>
+                                                <Service-Component>
+                                                </Service-Component>
+                                        </instructions>
+                                </configuration>
+                        </plugin>
+                </plugins>
+        </build>
+        <dependencies>
+                <dependency>
+                        <groupId>org.opendaylight.controller</groupId>
+                        <artifactId>sal</artifactId>
+                        <version>0.4.0-SNAPSHOT</version>
+                </dependency>
+        </dependencies>
 </project>
index faefe4c..750c395 100644 (file)
@@ -39,7 +39,7 @@
               org.opendaylight.controller.protocol_plugins.stub.internal
             </Export-Package>
             <Bundle-Activator>
-              org.opendaylight.controller.protocol_plugins.stub.internal.Activator 
+              org.opendaylight.controller.protocol_plugins.stub.internal.Activator
             </Bundle-Activator>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
@@ -60,4 +60,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
index e666af7..13ec7ca 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <enunciate label="full" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
-  
+
   <services>
     <rest defaultRestSubcontext="/one/nb/v2/lb"/>
   </services>
index 365e4b2..aac4647 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
   <servlet>
     <servlet-name>JAXRSLoadBalancer</servlet-name>
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>NB api</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>NB api</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>BASIC</auth-method>
-               <realm-name>opendaylight</realm-name>
-       </login-config>
+        <login-config>
+                <auth-method>BASIC</auth-method>
+                <realm-name>opendaylight</realm-name>
+        </login-config>
 </web-app>
index 7ee475e..1bf1c7c 100644 (file)
@@ -29,7 +29,7 @@
               org.apache.felix.dm
             </Import-Package>
             <Export-Package>
-              org.opendaylight.controller.statisticsmanager 
+              org.opendaylight.controller.statisticsmanager
             </Export-Package>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
index 44ad73c..e774dae 100644 (file)
@@ -21,7 +21,7 @@
       <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>switchmanager.implementation</artifactId>
-         <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.0-SNAPSHOT</version>
     </dependency>
      <dependency>
       <groupId>org.opendaylight.controller</groupId>
index 057955f..877461d 100644 (file)
             </Import-Package>
             <Export-Package>
               org.opendaylight.controller.usermanager,
-<!-- 
+<!--
               org.opendaylight.controller.usermanager.internal
  -->
              </Export-Package>
             <Bundle-Activator>
-<!-- 
+<!--
               org.opendaylight.controller.usermanager.internal.Activator
  -->
              </Bundle-Activator>
index 96d6426..a558fa2 100644 (file)
@@ -48,7 +48,7 @@
               org.opendaylight.controller.usermanager
             </Import-Package>
             <Export-Package>
-<!-- 
+<!--
               org.opendaylight.controller.usermanager,
               org.opendaylight.controller.usermanager.internal
  -->
index 6b0a731..af5cd8d 100644 (file)
@@ -3,19 +3,19 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xmlns:context="http://www.springframework.org/schema/context"\r
   xmlns:mvc="http://www.springframework.org/schema/mvc"\r
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd \r
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd\r
                       http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd\r
                       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">\r
 \r
   <context:component-scan base-package="org.opendaylight.controller.devices.web"/>\r
-  \r
+\r
   <mvc:resources mapping="/js/**" location="/js/" />\r
   <mvc:resources mapping="/css/**" location="/css/" />\r
   <mvc:resources mapping="/img/**" location="/img/" />\r
   <mvc:annotation-driven/>\r
-  \r
+\r
   <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">\r
-       <property name="prefix" value="/WEB-INF/jsp/"/>\r
-       <property name="suffix" value=".jsp"/>\r
+        <property name="prefix" value="/WEB-INF/jsp/"/>\r
+        <property name="suffix" value=".jsp"/>\r
   </bean>\r
 </beans>\r
index 0c7edce..6294a9f 100644 (file)
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>free access</web-resource-name>
-                       <url-pattern>/js/*</url-pattern>
-                       <url-pattern>/images/*</url-pattern>
-                       <url-pattern>/css/*</url-pattern>
-                       <url-pattern>/favicon.ico</url-pattern>
-               </web-resource-collection>
-       </security-constraint>
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>free access</web-resource-name>
+                        <url-pattern>/js/*</url-pattern>
+                        <url-pattern>/images/*</url-pattern>
+                        <url-pattern>/css/*</url-pattern>
+                        <url-pattern>/favicon.ico</url-pattern>
+                </web-resource-collection>
+        </security-constraint>
 
-       <security-constraint>
-               <display-name>DevicesApp</display-name>
-               <web-resource-collection>
-                       <web-resource-name>DevicesGUI</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <display-name>DevicesApp</display-name>
+                <web-resource-collection>
+                        <web-resource-name>DevicesGUI</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>FORM</auth-method>
-               <form-login-config>
-                       <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
-                       <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
-               </form-login-config>
-       </login-config>
+        <login-config>
+                <auth-method>FORM</auth-method>
+                <form-login-config>
+                        <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
+                        <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
+                </form-login-config>
+        </login-config>
 
     <error-page>
             <error-code>403</error-code>
             <location>/WEB-INF/jsp/autherror.jsp</location>
     </error-page>
 
-       <servlet>
-               <servlet-name>Devices</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
+        <servlet>
+                <servlet-name>Devices</servlet-name>
+                <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+                <load-on-startup>1</load-on-startup>
+        </servlet>
 
-       <servlet-mapping>
-               <servlet-name>Devices</servlet-name>
-               <url-pattern>/</url-pattern>
-       </servlet-mapping>
+        <servlet-mapping>
+                <servlet-name>Devices</servlet-name>
+                <url-pattern>/</url-pattern>
+        </servlet-mapping>
 
-       <listener>
-               <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
-       </listener>
-       <session-config>
-               <cookie-config>
-                       <path>/</path>
-               </cookie-config>
-       </session-config>
+        <listener>
+                <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
+        </listener>
+        <session-config>
+                <cookie-config>
+                        <path>/</path>
+                </cookie-config>
+        </session-config>
 
 </web-app>
index fbe6979..293fa77 100644 (file)
@@ -3,19 +3,19 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xmlns:context="http://www.springframework.org/schema/context"\r
   xmlns:mvc="http://www.springframework.org/schema/mvc"\r
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd \r
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd\r
                       http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd\r
                       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">\r
 \r
   <context:component-scan base-package="org.opendaylight.controller.flows.web"/>\r
-  \r
+\r
   <mvc:resources mapping="/js/**" location="/js/" />\r
   <mvc:resources mapping="/css/**" location="/css/" />\r
   <mvc:resources mapping="/img/**" location="/img/" />\r
   <mvc:annotation-driven/>\r
-  \r
+\r
   <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">\r
-       <property name="prefix" value="/WEB-INF/jsp/"/>\r
-       <property name="suffix" value=".jsp"/>\r
+        <property name="prefix" value="/WEB-INF/jsp/"/>\r
+        <property name="suffix" value=".jsp"/>\r
   </bean>\r
 </beans>\r
index 5660a37..c5d2479 100644 (file)
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
 
 
-       <servlet>
-               <servlet-name>Flows</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
+        <servlet>
+                <servlet-name>Flows</servlet-name>
+                <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+                <load-on-startup>1</load-on-startup>
+        </servlet>
 
-       <servlet-mapping>
-               <servlet-name>Flows</servlet-name>
-               <url-pattern>/</url-pattern>
-       </servlet-mapping>
+        <servlet-mapping>
+                <servlet-name>Flows</servlet-name>
+                <url-pattern>/</url-pattern>
+        </servlet-mapping>
 
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>free access</web-resource-name>
-                       <url-pattern>/js/*</url-pattern>
-                       <url-pattern>/images/*</url-pattern>
-                       <url-pattern>/css/*</url-pattern>
-                       <url-pattern>/favicon.ico</url-pattern>
-               </web-resource-collection>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>free access</web-resource-name>
+                        <url-pattern>/js/*</url-pattern>
+                        <url-pattern>/images/*</url-pattern>
+                        <url-pattern>/css/*</url-pattern>
+                        <url-pattern>/favicon.ico</url-pattern>
+                </web-resource-collection>
+        </security-constraint>
 
-       <security-constraint>
-               <display-name>FlowApp</display-name>
-               <web-resource-collection>
-                       <web-resource-name>FlowMgrGUI</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-constraint>
+                <display-name>FlowApp</display-name>
+                <web-resource-collection>
+                        <web-resource-name>FlowMgrGUI</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>FORM</auth-method>
-               <form-login-config>
-                       <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
-                       <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
-               </form-login-config>
-       </login-config>
+        <login-config>
+                <auth-method>FORM</auth-method>
+                <form-login-config>
+                        <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
+                        <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
+                </form-login-config>
+        </login-config>
 
     <error-page>
             <error-code>403</error-code>
             <location>/WEB-INF/jsp/autherror.jsp</location>
     </error-page>
 
-       <listener>
-               <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
-       </listener>
+        <listener>
+                <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
+        </listener>
 
-       <session-config>
-               <cookie-config>
-                       <path>/</path>
-               </cookie-config>
-       </session-config>
+        <session-config>
+                <cookie-config>
+                        <path>/</path>
+                </cookie-config>
+        </session-config>
 
 
 
index a818c8e..a8cb864 100644 (file)
@@ -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">
 
   <context:component-scan base-package="org.opendaylight.controller.web"/>
-  
+
   <mvc:resources mapping="/js/**" location="/js/" />
   <mvc:resources mapping="/css/**" location="/css/" />
   <mvc:resources mapping="/img/**" location="/img/" />
   <mvc:annotation-driven/>
-  
+
   <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-       <property name="prefix" value="/WEB-INF/jsp/"/>
-       <property name="suffix" value=".jsp"/>
+        <property name="prefix" value="/WEB-INF/jsp/"/>
+        <property name="suffix" value=".jsp"/>
   </bean>
 </beans>
\ No newline at end of file
index 18ac6e7..1e373fb 100644 (file)
@@ -1,82 +1,82 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security"
-       xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            http://www.springframework.org/schema/security
            http://www.springframework.org/schema/security/spring-security-3.1.xsd">
 
 
-       <http pattern="/css/**" security="none" />
-       <http pattern="/js/**" security="none" />
-       <http pattern="/images/**" 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 auto-config="false" authentication-manager-ref="authenticationManager"
-               security-context-repository-ref="securityContextRepo" entry-point-ref="loginUrlAuthenticationEntryPoint">
-               <intercept-url pattern="/login*" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-               <intercept-url pattern="/logout*" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-
-
-               <intercept-url pattern="/**"
-                       access="ROLE_SYSTEM-ADMIN, ROLE_NETWORK-ADMIN, ROLE_NETWORK-OPERATOR, ROLE_CONTAINER-USER" />
-               <custom-filter ref="authenticationFilter" position="FORM_LOGIN_FILTER" />
-               <custom-filter position="LOGOUT_FILTER" ref="logoutFilter" />
-               <custom-filter position="LAST" ref="controllerFilter" />
-               <remember-me services-ref="rememberMeServices" key="SDN" />
-       </http>
-       
-       <beans:bean id="controllerFilter"
-               class="org.opendaylight.controller.web.ControllerCustomFilter" />
-
-       <authentication-manager id="authenticationManager">
-               <authentication-provider ref="authenticationProviderWrapper" />
-       </authentication-manager>
-
-       <beans:bean id="authenticationFilter"
-               class="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter">
-               <beans:property name="authenticationManager" ref="authenticationManager" />
-               <beans:property name="authenticationFailureHandler"
-                       ref="authenticationFailureHandler" />
-               <beans:property name="authenticationSuccessHandler">
-                       <beans:bean
-                               class="org.opendaylight.controller.web.ControllerAuthenticationSuccessHandler">
-                               <beans:property name="targetUrlParameter" value="x-page-url" />
-                               <beans:property name="defaultTargetUrl" value="/" />
-                       </beans:bean>
-               </beans:property>
-               <beans:property name="rememberMeServices" ref="rememberMeServices" />
-       </beans:bean>
-
-       <beans:bean id="securityContextRepo"
-               class="org.opendaylight.controller.web.ControllerWebSecurityContextRepository" />
-
-       <beans:bean id="authenticationFailureHandler"
-               class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler">
-               <beans:property name="useForward" value="false" />
-               <beans:property name="defaultFailureUrl" value="/login" />              
-       </beans:bean>
-
-       <beans:bean id="loginUrlAuthenticationEntryPoint"
-               class="org.opendaylight.controller.web.ControllerLoginUrlAuthEntryPoint">
-               <beans:property name="loginFormUrl" value="/login" />
-       </beans:bean>
-
-       <beans:bean id="authenticationProviderWrapper"
-               class="org.opendaylight.controller.web.AuthenticationProviderWrapper" />
+        <http pattern="/css/**" security="none" />
+        <http pattern="/js/**" security="none" />
+        <http pattern="/images/**" 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 auto-config="false" authentication-manager-ref="authenticationManager"
+                security-context-repository-ref="securityContextRepo" entry-point-ref="loginUrlAuthenticationEntryPoint">
+                <intercept-url pattern="/login*" access="IS_AUTHENTICATED_ANONYMOUSLY" />
+                <intercept-url pattern="/logout*" access="IS_AUTHENTICATED_ANONYMOUSLY" />
+
+
+                <intercept-url pattern="/**"
+                        access="ROLE_SYSTEM-ADMIN, ROLE_NETWORK-ADMIN, ROLE_NETWORK-OPERATOR, ROLE_CONTAINER-USER" />
+                <custom-filter ref="authenticationFilter" position="FORM_LOGIN_FILTER" />
+                <custom-filter position="LOGOUT_FILTER" ref="logoutFilter" />
+                <custom-filter position="LAST" ref="controllerFilter" />
+                <remember-me services-ref="rememberMeServices" key="SDN" />
+        </http>
+
+        <beans:bean id="controllerFilter"
+                class="org.opendaylight.controller.web.ControllerCustomFilter" />
+
+        <authentication-manager id="authenticationManager">
+                <authentication-provider ref="authenticationProviderWrapper" />
+        </authentication-manager>
+
+        <beans:bean id="authenticationFilter"
+                class="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter">
+                <beans:property name="authenticationManager" ref="authenticationManager" />
+                <beans:property name="authenticationFailureHandler"
+                        ref="authenticationFailureHandler" />
+                <beans:property name="authenticationSuccessHandler">
+                        <beans:bean
+                                class="org.opendaylight.controller.web.ControllerAuthenticationSuccessHandler">
+                                <beans:property name="targetUrlParameter" value="x-page-url" />
+                                <beans:property name="defaultTargetUrl" value="/" />
+                        </beans:bean>
+                </beans:property>
+                <beans:property name="rememberMeServices" ref="rememberMeServices" />
+        </beans:bean>
+
+        <beans:bean id="securityContextRepo"
+                class="org.opendaylight.controller.web.ControllerWebSecurityContextRepository" />
+
+        <beans:bean id="authenticationFailureHandler"
+                class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler">
+                <beans:property name="useForward" value="false" />
+                <beans:property name="defaultFailureUrl" value="/login" />
+        </beans:bean>
+
+        <beans:bean id="loginUrlAuthenticationEntryPoint"
+                class="org.opendaylight.controller.web.ControllerLoginUrlAuthEntryPoint">
+                <beans:property name="loginFormUrl" value="/login" />
+        </beans:bean>
+
+        <beans:bean id="authenticationProviderWrapper"
+                class="org.opendaylight.controller.web.AuthenticationProviderWrapper" />
 
     <!-- logout related -->
-    
+
     <beans:bean id="logoutHandler"
         class="org.opendaylight.controller.web.ControllerLogoutHandler" />
-        
+
     <beans:bean id="securityContextLogoutHandler"
-        class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler" />    
-        
-            
+        class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler" />
+
+
     <beans:bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
         <!-- if logout succeed then this is the URL -->
         <beans:constructor-arg value="/login" />
             </beans:list>
         </beans:constructor-arg>
         <beans:property name="filterProcessesUrl" value="/logout" />
-    </beans:bean>       
-        
+    </beans:bean>
+
+
 
 
+        <!-- remember me related -->
+        <beans:bean id="rememberMeFilter"
+                class="org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter">
+                <beans:property name="rememberMeServices" ref="rememberMeServices" />
+                <beans:property name="authenticationManager" ref="authenticationManager" />
+        </beans:bean>
 
-       <!-- remember me related -->
-       <beans:bean id="rememberMeFilter"
-               class="org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter">
-               <beans:property name="rememberMeServices" ref="rememberMeServices" />
-               <beans:property name="authenticationManager" ref="authenticationManager" />
-       </beans:bean>
+        <beans:bean id="rememberMeServices"
+                class="org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices">
+                <beans:property name="userDetailsService" ref="userDetailsServiceRef" />
+                <beans:property name="key" value="SDN" />
+                <beans:property name="alwaysRemember" value="true"></beans:property>
+                <beans:property name="tokenValiditySeconds" value="3600" />
+                <beans:property name="cookieName" value="SDN-Controller" />
+        </beans:bean>
 
-       <beans:bean id="rememberMeServices"
-               class="org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices">
-               <beans:property name="userDetailsService" ref="userDetailsServiceRef" />
-               <beans:property name="key" value="SDN" />
-               <beans:property name="alwaysRemember" value="true"></beans:property>
-               <beans:property name="tokenValiditySeconds" value="3600" />
-               <beans:property name="cookieName" value="SDN-Controller" />
-       </beans:bean>
+        <beans:bean id="userDetailsServiceRef" class="org.opendaylight.controller.web.ControllerUserDetailsService" />
 
-       <beans:bean id="userDetailsServiceRef" class="org.opendaylight.controller.web.ControllerUserDetailsService" />
 
+        <beans:bean id="rememberMeAuthenticationProvider"
+                class="org.springframework.security.authentication.RememberMeAuthenticationProvider">
+                <beans:property name="key" value="SDN" />
+        </beans:bean>
 
-       <beans:bean id="rememberMeAuthenticationProvider"
-               class="org.springframework.security.authentication.RememberMeAuthenticationProvider">
-               <beans:property name="key" value="SDN" />
-       </beans:bean>
-       
 </beans:beans>
index d96fb6e..557b9c7 100644 (file)
@@ -1,84 +1,84 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-       xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
-       version="2.4"> -->
+<!-- <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+        version="2.4"> -->
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>free access</web-resource-name>
-                       <url-pattern>/js/*</url-pattern>
-                       <url-pattern>/images/*</url-pattern>
-                       <url-pattern>/css/*</url-pattern>
-                       <url-pattern>/favicon.ico</url-pattern>
-               </web-resource-collection>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>free access</web-resource-name>
+                        <url-pattern>/js/*</url-pattern>
+                        <url-pattern>/images/*</url-pattern>
+                        <url-pattern>/css/*</url-pattern>
+                        <url-pattern>/favicon.ico</url-pattern>
+                </web-resource-collection>
+        </security-constraint>
 
-       <security-constraint>
-               <display-name>RootApp</display-name>
-               <web-resource-collection>
-                       <web-resource-name>RootGUI</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <display-name>RootApp</display-name>
+                <web-resource-collection>
+                        <web-resource-name>RootGUI</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
 
-       <login-config>
-               <auth-method>FORM</auth-method>
-               <form-login-config>
-                       <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
-                       <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
-               </form-login-config>
-       </login-config>
+        <login-config>
+                <auth-method>FORM</auth-method>
+                <form-login-config>
+                        <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
+                        <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
+                </form-login-config>
+        </login-config>
 
     <error-page>
             <error-code>403</error-code>
             <location>/WEB-INF/jsp/autherror.jsp</location>
     </error-page>
 
-       <servlet>
-               <servlet-name>RootGUI</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
+        <servlet>
+                <servlet-name>RootGUI</servlet-name>
+                <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+                <load-on-startup>1</load-on-startup>
+        </servlet>
 
-       <servlet-mapping>
-               <servlet-name>RootGUI</servlet-name>
-               <url-pattern>/</url-pattern>
-       </servlet-mapping>
+        <servlet-mapping>
+                <servlet-name>RootGUI</servlet-name>
+                <url-pattern>/</url-pattern>
+        </servlet-mapping>
 
-       <display-name>OpenDaylight Controller</display-name>
-       <description>OpenDaylight Controller</description>
+        <display-name>OpenDaylight Controller</display-name>
+        <description>OpenDaylight Controller</description>
 
-       <listener>
-               <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
-       </listener>
+        <listener>
+                <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
+        </listener>
 
-       <session-config>
-               <cookie-config>
-                       <path>/</path>
-               </cookie-config>
-       </session-config>
+        <session-config>
+                <cookie-config>
+                        <path>/</path>
+                </cookie-config>
+        </session-config>
 
 </web-app>
index 1c05bbc..cb6f2b6 100644 (file)
@@ -3,19 +3,19 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xmlns:context="http://www.springframework.org/schema/context"\r
   xmlns:mvc="http://www.springframework.org/schema/mvc"\r
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd \r
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd\r
                       http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd\r
                       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">\r
 \r
   <context:component-scan base-package="org.opendaylight.controller.topology.web"/>\r
-  \r
+\r
   <mvc:resources mapping="/js/**" location="/js/" />\r
   <mvc:resources mapping="/css/**" location="/css/" />\r
   <mvc:resources mapping="/img/**" location="/img/" />\r
   <mvc:annotation-driven/>\r
-  \r
+\r
   <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">\r
-       <property name="prefix" value="/WEB-INF/jsp/"/>\r
-       <property name="suffix" value=".jsp"/>\r
+        <property name="prefix" value="/WEB-INF/jsp/"/>\r
+        <property name="suffix" value=".jsp"/>\r
   </bean>\r
 </beans>\r
index 274908c..c37fffe 100644 (file)
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>free access</web-resource-name>
-                       <url-pattern>/js/*</url-pattern>
-                       <url-pattern>/images/*</url-pattern>
-                       <url-pattern>/css/*</url-pattern>
-                       <url-pattern>/favicon.ico</url-pattern>
-               </web-resource-collection>
-       </security-constraint>
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>free access</web-resource-name>
+                        <url-pattern>/js/*</url-pattern>
+                        <url-pattern>/images/*</url-pattern>
+                        <url-pattern>/css/*</url-pattern>
+                        <url-pattern>/favicon.ico</url-pattern>
+                </web-resource-collection>
+        </security-constraint>
 
-       <security-constraint>
-               <display-name>TopologyApp</display-name>
-               <web-resource-collection>
-                       <web-resource-name>TopoGUI</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-constraint>
+                <display-name>TopologyApp</display-name>
+                <web-resource-collection>
+                        <web-resource-name>TopoGUI</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
-       <login-config>
-               <auth-method>FORM</auth-method>
-               <form-login-config>
-                       <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
-                       <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
-               </form-login-config>
-       </login-config>
+        <login-config>
+                <auth-method>FORM</auth-method>
+                <form-login-config>
+                        <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
+                        <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
+                </form-login-config>
+        </login-config>
 
     <error-page>
             <error-code>403</error-code>
             <location>/WEB-INF/jsp/autherror.jsp</location>
     </error-page>
 
-       <servlet>
-               <servlet-name>Topology</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
+        <servlet>
+                <servlet-name>Topology</servlet-name>
+                <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+                <load-on-startup>1</load-on-startup>
+        </servlet>
 
 
 
-       <servlet-mapping>
-               <servlet-name>Topology</servlet-name>
-               <url-pattern>/</url-pattern>
-       </servlet-mapping>
+        <servlet-mapping>
+                <servlet-name>Topology</servlet-name>
+                <url-pattern>/</url-pattern>
+        </servlet-mapping>
 
-       <listener>
-               <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
-       </listener>
+        <listener>
+                <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
+        </listener>
 
-       <session-config>
-               <cookie-config>
-                       <path>/</path>
-               </cookie-config>
-       </session-config>
+        <session-config>
+                <cookie-config>
+                        <path>/</path>
+                </cookie-config>
+        </session-config>
 
 
 </web-app>
index 877617a..91e22f6 100644 (file)
@@ -3,19 +3,19 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xmlns:context="http://www.springframework.org/schema/context"\r
   xmlns:mvc="http://www.springframework.org/schema/mvc"\r
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd \r
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd\r
                       http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd\r
                       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">\r
 \r
   <context:component-scan base-package="org.opendaylight.controller.troubleshoot.web"/>\r
-  \r
+\r
   <mvc:resources mapping="/js/**" location="/js/" />\r
   <mvc:resources mapping="/css/**" location="/css/" />\r
   <mvc:resources mapping="/img/**" location="/img/" />\r
   <mvc:annotation-driven/>\r
-  \r
+\r
   <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">\r
-       <property name="prefix" value="/WEB-INF/jsp/"/>\r
-       <property name="suffix" value=".jsp"/>\r
+        <property name="prefix" value="/WEB-INF/jsp/"/>\r
+        <property name="suffix" value=".jsp"/>\r
   </bean>\r
 </beans>\r
index 47d38f9..2d89e9d 100644 (file)
@@ -1,81 +1,81 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-       version="3.0">
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
 
-       <servlet>
-               <servlet-name>Troubleshoot</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
+        <servlet>
+                <servlet-name>Troubleshoot</servlet-name>
+                <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+                <load-on-startup>1</load-on-startup>
+        </servlet>
 
-       <servlet-mapping>
-               <servlet-name>Troubleshoot</servlet-name>
-               <url-pattern>/</url-pattern>
-       </servlet-mapping>
+        <servlet-mapping>
+                <servlet-name>Troubleshoot</servlet-name>
+                <url-pattern>/</url-pattern>
+        </servlet-mapping>
 
 
 
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>free access</web-resource-name>
-                       <url-pattern>/js/*</url-pattern>
-                       <url-pattern>/images/*</url-pattern>
-                       <url-pattern>/css/*</url-pattern>
-                       <url-pattern>/favicon.ico</url-pattern>
-               </web-resource-collection>
-       </security-constraint>
+        <security-constraint>
+                <web-resource-collection>
+                        <web-resource-name>free access</web-resource-name>
+                        <url-pattern>/js/*</url-pattern>
+                        <url-pattern>/images/*</url-pattern>
+                        <url-pattern>/css/*</url-pattern>
+                        <url-pattern>/favicon.ico</url-pattern>
+                </web-resource-collection>
+        </security-constraint>
 
-       <security-constraint>
-               <display-name>TroubleShootApp</display-name>
-               <web-resource-collection>
-                       <web-resource-name>TroubleShootGUI</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <auth-constraint>
-                       <role-name>System-Admin</role-name>
-                       <role-name>Network-Admin</role-name>
-                       <role-name>Network-Operator</role-name>
-                       <role-name>Container-User</role-name>
-               </auth-constraint>
-       </security-constraint>
+        <security-constraint>
+                <display-name>TroubleShootApp</display-name>
+                <web-resource-collection>
+                        <web-resource-name>TroubleShootGUI</web-resource-name>
+                        <url-pattern>/*</url-pattern>
+                </web-resource-collection>
+                <auth-constraint>
+                        <role-name>System-Admin</role-name>
+                        <role-name>Network-Admin</role-name>
+                        <role-name>Network-Operator</role-name>
+                        <role-name>Container-User</role-name>
+                </auth-constraint>
+        </security-constraint>
 
-       <security-role>
-               <role-name>System-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Admin</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Network-Operator</role-name>
-       </security-role>
-       <security-role>
-               <role-name>Container-User</role-name>
-       </security-role>
+        <security-role>
+                <role-name>System-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Admin</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Network-Operator</role-name>
+        </security-role>
+        <security-role>
+                <role-name>Container-User</role-name>
+        </security-role>
 
 
-       <login-config>
-               <auth-method>FORM</auth-method>
-               <form-login-config>
-                       <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
-                       <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
-               </form-login-config>
-       </login-config>
+        <login-config>
+                <auth-method>FORM</auth-method>
+                <form-login-config>
+                        <form-login-page>/WEB-INF/jsp/login.jsp</form-login-page>
+                        <form-error-page>/WEB-INF/jsp/error.jsp</form-error-page>
+                </form-login-config>
+        </login-config>
 
     <error-page>
             <error-code>403</error-code>
             <location>/WEB-INF/jsp/autherror.jsp</location>
     </error-page>
 
-       <listener>
-               <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
-       </listener>
+        <listener>
+                <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
+        </listener>
 
-       <session-config>
-               <cookie-config>
-                       <path>/</path>
-               </cookie-config>
-       </session-config>
+        <session-config>
+                <cookie-config>
+                        <path>/</path>
+                </cookie-config>
+        </session-config>
 
 
 

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.