Added schema inforamtion to Karaf features.xml files and cleaned up X…

…ML prologs in Trapd test XML files.
OpenNMS · Mar 19, 2015 · 9809a38 · 9809a38
1 parent bf412ff
commit 9809a38
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml
@@ -1,4 +1,10 @@
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="opennms-${project.version}">    
+<?xml version="1.0" encoding="UTF-8"?>
+<features 
+  name="opennms-${project.version}"
+  xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.0.0 http://karaf.apache.org/xmlns/features/v1.0.0"
+>
     <!-- camel features -->
     <repository>mvn:org.apache.camel.karaf/apache-camel/${camelVersion}/xml/features</repository>
 

diff --git a/container/standalone/src/main/filtered-resources/features.xml b/container/standalone/src/main/filtered-resources/features.xml
@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features name="branding" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+<features 
+  name="branding"
+  xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.0.0 http://karaf.apache.org/xmlns/features/v1.0.0"
+>
 </features>
diff --git a/features/events/traps/src/test/resources/org/opennms/netmgt/trapd/eventconf.xml b/features/events/traps/src/test/resources/org/opennms/netmgt/trapd/eventconf.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <events xmlns="http://xmlns.opennms.org/xsd/eventconf">
   <global>
     <security>

diff --git a/features/events/traps/src/test/resources/org/opennms/netmgt/trapd/trapd-configuration.xml b/features/events/traps/src/test/resources/org/opennms/netmgt/trapd/trapd-configuration.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <trapd-configuration snmp-trap-port="162" new-suspect-on-trap="true"/>
diff --git a/features/vaadin-dashlets/dashlet-features/src/main/resources/features.xml b/features/vaadin-dashlets/dashlet-features/src/main/resources/features.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features>
+<features 
+  name="dashlet-features"
+  xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.0.0 http://karaf.apache.org/xmlns/features/v1.0.0"
+>
 
   <feature name="dashlet-alarms" version="${pom.version}" description="OpenNMS :: Features :: Dashlets :: Alarms">
     <feature>opennms-core</feature>