Merge "BUG-272: remove trailing whitespace from XML files"

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml b/opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml
index 840887ecec60920372b9d343283e4fd852c68dd4..4b62bf7c2fcb2a1c219c7936063f721e1e7a2f9b 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml
@@ -31,7 +31,7 @@
         </init-param>
         <init-param>
             <param-name>cors.allowed.headers</param-name>
-            <param-value>Content-Type,X-Requested-With,accept,authorization, 
+            <param-value>Content-Type,X-Requested-With,accept,authorization,
         origin,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
         </init-param>
         <init-param>

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/choice/xml/data_various_path_err.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/choice/xml/data_various_path_err.xml
index 65abd19d31de3ad97abd7d539968e16a57686f15..e8634682cd524fb7c9adef64dc42605c7f49c775 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/choice/xml/data_various_path_err.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/choice/xml/data_various_path_err.xml
@@ -2,5 +2,5 @@
     <lf1aa>lf1aa val</lf1aa>
     <lf1>lf1 val</lf1>
     <lf1a>121</lf1a>
-    <lf1ab>lf1ab value</lf1ab>    
+    <lf1ab>lf1ab value</lf1ab>
 </cont>
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-data-types/xml/data.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-data-types/xml/data.xml
index 5fcc9e65a18e70a1542fd70e6bd487f75fd32bed..28d355dbab0a44375559dad7e57670f87cc7b047 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-data-types/xml/data.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-data-types/xml/data.xml
@@ -6,7 +6,7 @@
     <lfnint32Min>-2147483648</lfnint32Min>
     <lfnint32Max>2147483647</lfnint32Max>
     <lfnint64Min>-9223372036854775808</lfnint64Min>
-    <lfnint64Max>9223372036854775807</lfnint64Max>    
+    <lfnint64Max>9223372036854775807</lfnint64Max>
     <lfnuint8Max>255</lfnuint8Max>
     <lfnuint16Max>65535</lfnuint16Max>
     <lfnuint32Max>4294967295</lfnuint32Max>
@@ -21,7 +21,7 @@
     <lfdecimal4>43E3</lfdecimal4>
     <lfdecimal6>33.12345</lfdecimal6>
     <lfenum>enum3</lfenum>
-    <lfbits>bit3 bit2</lfbits>    
+    <lfbits>bit3 bit2</lfbits>
     <lfbinary>ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz</lfbinary>
     <lfempty />
     <lfunion1>324</lfunion1>

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-yang-types/xml/data.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-yang-types/xml/data.xml
index 89746e5db8ac2bd7552e83214c380b29a1cbbbb7..61858d28b6042f64d669924de0b839318b910c6c 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-yang-types/xml/data.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-yang-types/xml/data.xml
@@ -7,12 +7,12 @@
     <lst11>
         <lst112>
             <lf1121>lf1121 str22</lf1121>
-        </lst112>    
+        </lst112>
         <lf111>141</lf111>
         <lf112>lf112 str2</lf112>
         <lst111>
             <lf1111>55</lf1111>
-        </lst111>    
+        </lst111>
         <cont111>
             <lflst1111>4097</lflst1111>
             <lflst1111>2049</lflst1111>
@@ -29,12 +29,12 @@
         </cont111>
         <lst111>
             <lf1111>56</lf1111>
-        </lst111>    
+        </lst111>
         <lst112>
             <lf1121>lf1121 str21</lf1121>
-        </lst112>    
+        </lst112>
     </lst11>
-    <lflst12>lflst12 str1</lflst12>    
+    <lflst12>lflst12 str1</lflst12>
     <lst11>
         <lf111>140</lf111>
         <lf112>lf112 str</lf112>
@@ -54,10 +54,10 @@
         </cont111>
         <lst111>
             <lf1111>65</lf1111>
-        </lst111>    
+        </lst111>
         <lst112>
             <lf1121>lf1121 str11</lf1121>
         </lst112>
     </lst11>
-    <lflst12>lflst12 str2</lflst12>    
+    <lflst12>lflst12 str2</lflst12>
 </cont1>

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-yang-types/xml/empty_data.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-yang-types/xml/empty_data.xml
index 955104b6e2808d825f1b9cf53fa7b9faac870769..9cd503e09b4c5960686fc4555e2cbc4048318c10 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-yang-types/xml/empty_data.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/cnsn-to-json/simple-yang-types/xml/empty_data.xml
@@ -1,15 +1,15 @@
 <cont1>
     <lst11>
         <lf111>1</lf111>
-        <lst111></lst111>    
-        <lst111></lst111>    
+        <lst111></lst111>
+        <lst111></lst111>
         <lst111>
             <lf1111></lf1111>
-        </lst111>    
+        </lst111>
         <lst111>
             <lf1111>35</lf1111>
-        </lst111>    
-        <cont111></cont111>        
+        </lst111>
+        <cont111></cont111>
     </lst11>
     <lst11>
         <lf111>2</lf111>

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/data-container.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/data-container.xml
index d41b872a9b91e035440951b8a57acd9cc90fd980..841d351049b5dccb19a58ceb47dcafac3af020bd 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/data-container.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/data-container.xml
@@ -7,7 +7,7 @@
     <lflst1>str1</lflst1>
     <lst1>
         <lf11>str2</lf11>
-    </lst1>            
+    </lst1>
     <cont1>
         <lf11>100</lf11>
     </cont1>

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list.xml
index ec3afd720a0f0412a0bdeda38b3352ee600ab688..9c4256a50c270a5b5c47580856c0ab9a5042fece 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/data-list.xml
@@ -6,7 +6,7 @@
         <lflst11>str1</lflst11>
         <lst11>
             <lf111>str2</lf111>
-        </lst11>            
+        </lst11>
         <cont11>
             <lf111>100</lf111>
         </cont11>
@@ -16,6 +16,6 @@
         <cont11>
             <lf111>100</lf111>
         </cont11>
-    </lst1>    
+    </lst1>
     <lf1>lf1</lf1>
 </cont>

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/empty-data.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/empty-data.xml
index 02c3f65438e1c1ecd626ff3e7aad298b7f6a389b..7d62b9e24d04f855f04af0044a3ae7236d65857b 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/empty-data.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/empty-data.xml
@@ -2,7 +2,7 @@
     <lf1></lf1>
     <lflst1></lflst1>
     <lflst1></lflst1>
-    <lst1>        
+    <lst1>
         <lf11></lf11>
-    </lst1>            
+    </lst1>
 </cont>

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-element.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-element.xml
index aae2af36d1049922aac169c15f4cdb407b6240d9..ebf7ac61ea3530d290c028e321ab62c01d0359b9 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-element.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-element.xml
@@ -1,5 +1,5 @@
 <cont xmlns="general:module" xmlns:x="x:namespace" xmlns:y="y:namespace">
-    <cont1 xmlns:z="z:namespace" xmlns:a="a:namespace" xmlns:b="b:namespace">        
-        <lf11 xmlns="identityref:module" xmlns:c="c:namespace">iden</lf11>  
+    <cont1 xmlns:z="z:namespace" xmlns:a="a:namespace" xmlns:b="b:namespace">
+        <lf11 xmlns="identityref:module" xmlns:c="c:namespace">iden</lf11>
     </cont1>
 </cont>
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-parrent-element.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-parrent-element.xml
index 621d2bc84c8273bb3d08d70aadcd759e98d6c88c..3fe1e4bf488ea79b9da843e67f1c7706cb354603 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-parrent-element.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-default-nmspc-in-parrent-element.xml
@@ -1,5 +1,5 @@
 <cont xmlns:x="x:namespace" xmlns:y="y:namespace">
-    <cont1 xmlns="identityref:module" xmlns:z="z:namespace" xmlns:a="a:namespace" xmlns:b="b:namespace">        
-        <lf11 xmlns:c="c:namespace">iden</lf11>  
+    <cont1 xmlns="identityref:module" xmlns:z="z:namespace" xmlns:a="a:namespace" xmlns:b="b:namespace">
+        <lf11 xmlns:c="c:namespace">iden</lf11>
     </cont1>
 </cont>
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-parrent-element.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-parrent-element.xml
index 497c35f2fc6127f5cd6fcd4eeb818ceadad3f924..30a54185ff2d95d7f3bb0ee05712c40c39229174 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-parrent-element.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-nmspc-in-parrent-element.xml
@@ -1,5 +1,5 @@
 <cont xmlns="identityref:module" xmlns:x="x:namespace" xmlns:y="y:namespace">
-    <cont1 xmlns:c="identity:module" xmlns:z="z:namespace" xmlns:a="a:namespace" xmlns:b="b:namespace">        
-        <lf11>z:iden</lf11>  
+    <cont1 xmlns:c="identity:module" xmlns:z="z:namespace" xmlns:a="a:namespace" xmlns:b="b:namespace">
+        <lf11>z:iden</lf11>
     </cont1>
 </cont>
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-with-prefix.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-with-prefix.xml
index 925442fee1af4c912766c22d6413b050fd4f379c..7d31fa7a95db4fbbbb739a1daddc852314cb803d 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-with-prefix.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-with-prefix.xml
@@ -1,5 +1,5 @@
 <cont>
-    <cont1>   
-        <lf11>x:iden</lf11>  
+    <cont1>
+        <lf11>x:iden</lf11>
     </cont1>
 </cont>
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-without-prefix.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-without-prefix.xml
index 5a86eb02a84a4695a71300020e9255bdf65b86f0..c65df1ab1e1ffad3244000b15dde2be46bf50ceb 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-without-prefix.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/xml-to-cnsn/identityref/xml/data-no-nmspc-value-without-prefix.xml
@@ -1,5 +1,5 @@
 <cont>
     <cont1>
-        <lf11>iden</lf11>  
+        <lf11>iden</lf11>
     </cont1>
 </cont>
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-rest-docgen/src/main/resources/WEB-INF/web.xml b/opendaylight/md-sal/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
index 356a395b97ba81200dc59ad9fc40adeb4a864c94..2a778180d4448dd33ce7cabb17f911e77151df9f 100644 (file)
--- a/opendaylight/md-sal/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/md-sal/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
@@ -31,7 +31,7 @@
         </init-param>
         <init-param>
             <param-name>cors.allowed.headers</param-name>
-            <param-value>Content-Type,X-Requested-With,accept,authorization, 
+            <param-value>Content-Type,X-Requested-With,accept,authorization,
         origin,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
         </init-param>
         <init-param>

diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/resources/controller.xml b/opendaylight/md-sal/samples/toaster-it/src/test/resources/controller.xml
index c5a2a0d340cfbfb982d62da396bc7bda2c48b178..61c24c6b6413cae9012916bf93001af11fc77f92 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-it/src/test/resources/controller.xml
+++ b/opendaylight/md-sal/samples/toaster-it/src/test/resources/controller.xml
@@ -55,7 +55,7 @@
                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
                               <name>ref_binding-data-broker</name>
                             </data-broker>
-                    
+
                             <notification-service>
                                 <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
                                     binding:binding-notification-service