Commits

Anonymous committed 51fbfbb

fix files with Windows CR/LF

Comments (0)

Files changed (44)

features/acl/src/main/webapp/WEB-INF/conf/config.properties

 #     desmax74@yahoo.it
 ###############################################################################
 
-jndi.datasource=java:comp/env/jdbc/acl_web
-jdbc.url=jdbc:postgresql://localhost:5432/acl
-jdbc.username=postgres
-jdbc.password=postgres
-jdbc.production.driver=org.postgresql.Driver
-jdbc.debug.driver=com.p6spy.engine.spy.P6SpyDriver
-jndi.onms.datasource=java:comp/env/jdbc/opennms
-jdbc.onms.url=jdbc:postgresql://localhost:5432/opennms
-jdbc.onms.username=postgres
-jdbc.onms.password=postgres
-sqlMapClient.config=postgresql
+jndi.datasource=java:comp/env/jdbc/acl_web
+jdbc.url=jdbc:postgresql://localhost:5432/acl
+jdbc.username=postgres
+jdbc.password=postgres
+jdbc.production.driver=org.postgresql.Driver
+jdbc.debug.driver=com.p6spy.engine.spy.P6SpyDriver
+jndi.onms.datasource=java:comp/env/jdbc/opennms
+jdbc.onms.url=jdbc:postgresql://localhost:5432/opennms
+jdbc.onms.username=postgres
+jdbc.onms.password=postgres
+sqlMapClient.config=postgresql
 numberItemsOnPage=15

features/acl/src/main/webapp/WEB-INF/decorators.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<decorators defaultdir="/WEB-INF/jsp/decorators">
-<decorator name="adminScripts" page="admin/adminScriptsLayout.jsp">
-    <pattern>/user.*.page</pattern>
-</decorator>
-<decorator name="adminScripts" page="admin/adminScriptsLayout.jsp">
-    <pattern>/authority.*.page</pattern>
-</decorator>
-<decorator name="adminScripts" page="admin/adminScriptsLayout.jsp">
-    <pattern>/group.*.page</pattern>
-</decorator>           
+<?xml version="1.0" encoding="UTF-8"?>
+<decorators defaultdir="/WEB-INF/jsp/decorators">
+<decorator name="adminScripts" page="admin/adminScriptsLayout.jsp">
+    <pattern>/user.*.page</pattern>
+</decorator>
+<decorator name="adminScripts" page="admin/adminScriptsLayout.jsp">
+    <pattern>/authority.*.page</pattern>
+</decorator>
+<decorator name="adminScripts" page="admin/adminScriptsLayout.jsp">
+    <pattern>/group.*.page</pattern>
+</decorator>           
 </decorators>

features/acl/src/main/webapp/WEB-INF/web.xml

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.4" 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

features/acl/src/test/java/org/opennms/acl/conf/Config.java

  *     desmax74@yahoo.it
  *******************************************************************************/
 
-package org.opennms.acl.conf;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import org.opennms.core.utils.LogUtils;
-
-public class Config {
-
-    public String getDbDriver() {
-        return dbDriver;
-    }
-
-    public String getDbUser() {
-        return dbUser;
-    }
-
-    public String getDbPass() {
-        return dbPass;
-    }
-
-    public String getDbUrl() {
-        return dbUrl;
-    }
-
-    public Config() {
-        Properties props = new Properties();
-        try {
-            props.load(Config.class.getResourceAsStream("/org/opennms/acl/conf/config.properties"));
-        } catch (final IOException e) {
-            LogUtils.warnf(this, e, "Unable to get configuration resource.");
-        }
-
-        dbDriver = props.getProperty("jdbc.driver");
-        dbUrl = props.getProperty("jdbc.url");
-        dbUser = props.getProperty("jdbc.username");
-        dbPass = props.getProperty("jdbc.password");
-    }
-
-    private String dbDriver;
-    private String dbUser;
-    private String dbPass;
-    private String dbUrl;
+package org.opennms.acl.conf;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import org.opennms.core.utils.LogUtils;
+
+public class Config {
+
+    public String getDbDriver() {
+        return dbDriver;
+    }
+
+    public String getDbUser() {
+        return dbUser;
+    }
+
+    public String getDbPass() {
+        return dbPass;
+    }
+
+    public String getDbUrl() {
+        return dbUrl;
+    }
+
+    public Config() {
+        Properties props = new Properties();
+        try {
+            props.load(Config.class.getResourceAsStream("/org/opennms/acl/conf/config.properties"));
+        } catch (final IOException e) {
+            LogUtils.warnf(this, e, "Unable to get configuration resource.");
+        }
+
+        dbDriver = props.getProperty("jdbc.driver");
+        dbUrl = props.getProperty("jdbc.url");
+        dbUser = props.getProperty("jdbc.username");
+        dbPass = props.getProperty("jdbc.password");
+    }
+
+    private String dbDriver;
+    private String dbUser;
+    private String dbPass;
+    private String dbUrl;
 }

features/acl/src/test/resources/org/opennms/acl/conf/config.properties

-jndi.datasource=java:comp/env/jdbc/acl_test
-jdbc.url=jdbc:postgresql://localhost:5432/acl_test
-jdbc.username=postgres
-jdbc.password=postgres
-jdbc.driver=org.postgresql.Driver
-jndi.onms.datasource=java:comp/env/jdbc/opennms
-jdbc.onms.url=jdbc:postgresql://localhost:5432/opennms
-jdbc.onms.username=postgres
-jdbc.onms.password=postgres
-jdbc.onms.driver=org.postgresql.Driver
+jndi.datasource=java:comp/env/jdbc/acl_test
+jdbc.url=jdbc:postgresql://localhost:5432/acl_test
+jdbc.username=postgres
+jdbc.password=postgres
+jdbc.driver=org.postgresql.Driver
+jndi.onms.datasource=java:comp/env/jdbc/opennms
+jdbc.onms.url=jdbc:postgresql://localhost:5432/opennms
+jdbc.onms.username=postgres
+jdbc.onms.password=postgres
+jdbc.onms.driver=org.postgresql.Driver
 numberItemsOnPage=15

features/gwt-ksc-add/pom.xml

-<?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/maven-v4_0_0.xsd">
-
-  <!-- POM file generated with GWT webAppCreator -->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>org.opennms.features</artifactId>
-    <groupId>org.opennms</groupId>
-    <version>1.13.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.opennms.features</groupId>
-  <artifactId>org.opennms.features.gwt-ksc-add</artifactId>
-  <packaging>jar</packaging>
-  <name>OpenNMS KSC GWT Graph Add</name>
-
-  <dependencies>
-    <dependency>
-        <groupId>org.opennms.dependencies</groupId>
-        <artifactId>gwt-dependencies</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-    </dependency>
-
-    <dependency>
-        <groupId>com.google.gwt</groupId>
-        <artifactId>gwt-user</artifactId>
-        <version>${gwtVersion}</version>
-        <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-        <groupId>org.opennms.features</groupId>
-        <artifactId>org.opennms.features.opennms-gwt-theme</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-
-    <resources>
-        <resource>
-            <directory>src/main/java</directory>
-            <includes>
-                <include>**/*.gwt.xml</include>
-                <include>**/*.java</include>
-                <include>**/*.css</include>
-                <include>**/*.ui.xml</include>
-            </includes>
-        </resource>
-    </resources>
-  </build>
-
-</project>
+<?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/maven-v4_0_0.xsd">
+
+  <!-- POM file generated with GWT webAppCreator -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.opennms.features</artifactId>
+    <groupId>org.opennms</groupId>
+    <version>1.13.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.opennms.features</groupId>
+  <artifactId>org.opennms.features.gwt-ksc-add</artifactId>
+  <packaging>jar</packaging>
+  <name>OpenNMS KSC GWT Graph Add</name>
+
+  <dependencies>
+    <dependency>
+        <groupId>org.opennms.dependencies</groupId>
+        <artifactId>gwt-dependencies</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+    </dependency>
+
+    <dependency>
+        <groupId>com.google.gwt</groupId>
+        <artifactId>gwt-user</artifactId>
+        <version>${gwtVersion}</version>
+        <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+        <groupId>org.opennms.features</groupId>
+        <artifactId>org.opennms.features.opennms-gwt-theme</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <resources>
+        <resource>
+            <directory>src/main/java</directory>
+            <includes>
+                <include>**/*.gwt.xml</include>
+                <include>**/*.java</include>
+                <include>**/*.css</include>
+                <include>**/*.ui.xml</include>
+            </includes>
+        </resource>
+    </resources>
+  </build>
+
+</project>

features/gwt-ksc-combobox/pom.xml

-<?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/maven-v4_0_0.xsd">
-
-  <!-- POM file generated with GWT webAppCreator -->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>org.opennms.features</artifactId>
-    <groupId>org.opennms</groupId>
-    <version>1.13.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.opennms.features</groupId>
-  <artifactId>org.opennms.features.gwt-ksc-combobox</artifactId>
-  <packaging>jar</packaging>
-  <name>OpenNMS KSC GWT combobox</name>
-
-  <dependencies>
-    <dependency>
-        <groupId>org.opennms.dependencies</groupId>
-        <artifactId>gwt-dependencies</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwtVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-        <groupId>org.opennms.features</groupId>
-        <artifactId>org.opennms.features.opennms-gwt-theme</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-
-    <resources>
-        <resource>
-            <directory>src/main/java</directory>
-            <includes>
-                <include>**/*.gwt.xml</include>
-                <include>**/*.java</include>
-                <include>**/*.css</include>
-                <include>**/*.ui.xml</include>
-            </includes>
-        </resource>
-    </resources>
-  </build>
-
-</project>
+<?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/maven-v4_0_0.xsd">
+
+  <!-- POM file generated with GWT webAppCreator -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.opennms.features</artifactId>
+    <groupId>org.opennms</groupId>
+    <version>1.13.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.opennms.features</groupId>
+  <artifactId>org.opennms.features.gwt-ksc-combobox</artifactId>
+  <packaging>jar</packaging>
+  <name>OpenNMS KSC GWT combobox</name>
+
+  <dependencies>
+    <dependency>
+        <groupId>org.opennms.dependencies</groupId>
+        <artifactId>gwt-dependencies</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <version>${gwtVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.opennms.features</groupId>
+        <artifactId>org.opennms.features.opennms-gwt-theme</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <resources>
+        <resource>
+            <directory>src/main/java</directory>
+            <includes>
+                <include>**/*.gwt.xml</include>
+                <include>**/*.java</include>
+                <include>**/*.css</include>
+                <include>**/*.ui.xml</include>
+            </includes>
+        </resource>
+    </resources>
+  </build>
+
+</project>

features/gwt-snmpselect-list/pom.xml

-<?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/maven-v4_0_0.xsd">
-
-  <!-- POM file generated with GWT webAppCreator -->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>org.opennms.features</artifactId>
-    <groupId>org.opennms</groupId>
-    <version>1.13.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.opennms.features</groupId>
-  <artifactId>org.opennms.features.gwt-snmpselect-list</artifactId>
-  <packaging>jar</packaging>
-  <name>OpenNMS GWT Snmp Select List</name>
-
-
-  <dependencies>
-    <dependency>
-        <groupId>org.opennms.dependencies</groupId>
-        <artifactId>gwt-dependencies</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwtVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-        <groupId>org.opennms.features</groupId>
-        <artifactId>org.opennms.features.opennms-gwt-theme</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-    
-    <dependency>
-        <groupId>org.opennms.features</groupId>
-        <artifactId>org.opennms.features.gwt.tableresources</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-  
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-        <resource>
-            <directory>src/main/java</directory>
-            <includes>
-                <include>**/*.gwt.xml</include>
-                <include>**/*.java</include>
-                <include>**/*.css</include>
-                <include>**/*.ui.xml</include>
-            </includes>
-        </resource>
-    </resources>
-  </build>
-
-</project>
+<?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/maven-v4_0_0.xsd">
+
+  <!-- POM file generated with GWT webAppCreator -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.opennms.features</artifactId>
+    <groupId>org.opennms</groupId>
+    <version>1.13.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.opennms.features</groupId>
+  <artifactId>org.opennms.features.gwt-snmpselect-list</artifactId>
+  <packaging>jar</packaging>
+  <name>OpenNMS GWT Snmp Select List</name>
+
+
+  <dependencies>
+    <dependency>
+        <groupId>org.opennms.dependencies</groupId>
+        <artifactId>gwt-dependencies</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <version>${gwtVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.opennms.features</groupId>
+        <artifactId>org.opennms.features.opennms-gwt-theme</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    
+    <dependency>
+        <groupId>org.opennms.features</groupId>
+        <artifactId>org.opennms.features.gwt.tableresources</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+  
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+        <resource>
+            <directory>src/main/java</directory>
+            <includes>
+                <include>**/*.gwt.xml</include>
+                <include>**/*.java</include>
+                <include>**/*.css</include>
+                <include>**/*.ui.xml</include>
+            </includes>
+        </resource>
+    </resources>
+  </build>
+
+</project>

features/gwt-suggestion-combobox/pom.xml

-<?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/maven-v4_0_0.xsd">
-
-  <!-- POM file generated with GWT webAppCreator -->
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>org.opennms.features</artifactId>
-    <groupId>org.opennms</groupId>
-    <version>1.13.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.opennms.features</groupId>
-  <artifactId>org.opennms.features.gwt-suggestion-combobox</artifactId>
-  <packaging>jar</packaging>
-  <name>OpenNMS GWT Suggestion Combobox</name>
-
-
-  <dependencies>
-    <dependency>
-        <groupId>org.opennms.dependencies</groupId>
-        <artifactId>gwt-dependencies</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwtVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-        <groupId>org.opennms.features</groupId>
-        <artifactId>org.opennms.features.opennms-gwt-theme</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-
-    <resources>
-        <resource>
-            <directory>src/main/java</directory>
-            <includes>
-                <include>**/*.gwt.xml</include>
-                <include>**/*.java</include>
-                <include>**/*.css</include>
-                <include>**/*.ui.xml</include>
-            </includes>
-        </resource>
-    </resources>
-  </build>
-
-</project>
+<?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/maven-v4_0_0.xsd">
+
+  <!-- POM file generated with GWT webAppCreator -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.opennms.features</artifactId>
+    <groupId>org.opennms</groupId>
+    <version>1.13.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.opennms.features</groupId>
+  <artifactId>org.opennms.features.gwt-suggestion-combobox</artifactId>
+  <packaging>jar</packaging>
+  <name>OpenNMS GWT Suggestion Combobox</name>
+
+
+  <dependencies>
+    <dependency>
+        <groupId>org.opennms.dependencies</groupId>
+        <artifactId>gwt-dependencies</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <version>${gwtVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.opennms.features</groupId>
+        <artifactId>org.opennms.features.opennms-gwt-theme</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <resources>
+        <resource>
+            <directory>src/main/java</directory>
+            <includes>
+                <include>**/*.gwt.xml</include>
+                <include>**/*.java</include>
+                <include>**/*.css</include>
+                <include>**/*.ui.xml</include>
+            </includes>
+        </resource>
+    </resources>
+  </build>
+
+</project>

features/isoc-ipv6-gui/pom.xml

-<?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/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>org.opennms.features</artifactId>
-    <groupId>org.opennms</groupId>
-    <version>1.13.0-SNAPSHOT</version>
-  </parent>
-    
-  <modelVersion>4.0.0</modelVersion>
-  
-  <groupId>org.opennms.features</groupId>
-  <artifactId>org.opennms.features.isoc-ipv6-gui</artifactId>
-  <packaging>war</packaging>
-  <name>ISOC World IPv6 UI</name>
-
-  <properties>
-    <moduleName>org.opennms.isoc.ipv6.gui.Application</moduleName>
-    <moduleHtml>index.html</moduleHtml>
-    <web.port>8080</web.port>
-  </properties>
-
-  
-
-  <build>
-<!--    <outputDirectory>war/WEB-INF/classes</outputDirectory>-->
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test</id>
-            <phase>test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-            
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <archiveClasses>true</archiveClasses>
-          <webResources>
-            <resource>
-              <filtering>true</filtering>
-              <directory>${basedir}/src/main/web-filtered</directory>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
-        <configuration>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
-          <systemProperties>
-            <systemProperty>
-              <name>log4j.configuration</name>
-              <value>file:${basedir}/runInPlace-log4j.properties</value>
-            </systemProperty>
-          </systemProperties>
-        </configuration>
-      </plugin>
-      <!-- Generates the GWT Container and Nature for GWT projects when eclipse:eclipse is run -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <additionalBuildcommands>
-            <buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand>
-            <buildcommand>com.google.gwt.eclipse.core.gwtProjectValidator</buildcommand>
-          </additionalBuildcommands>
-          <additionalProjectnatures>
-            <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
-            <projectnature>com.google.gwt.eclipse.core.gwtNature</projectnature>
-          </additionalProjectnatures>
-          <classpathContainers>
-            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-            <classpathContainer>com.google.gwt.eclipse.core.GWT_CONTAINER</classpathContainer>
-          </classpathContainers>
-        </configuration>
-      </plugin>
-      
-    </plugins>
-  </build>
-    
-    
-    <dependencies>
-
-     <!-- GWT -->
-    <dependency>
-      <groupId>org.opennms.dependencies</groupId>
-      <artifactId>gwt-dependencies</artifactId>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwtVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    
-    <!--GWT visualization-->
-    <dependency>
-        <groupId>com.google.gwt.google-apis</groupId>
-        <artifactId>gwt-visualization</artifactId>
-        <version>1.0.2</version>
-    </dependency>
-    
-    <!-- Jersey -->
-    <dependency>
-        <groupId>org.opennms.dependencies</groupId>
-        <artifactId>jersey-dependencies</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>provided</scope>
-      </dependency>
-
-    <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.5</version>
-        <scope>provided</scope>
-    </dependency>
-    
-    <!-- test -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <profiles>
-    <profile>
-        <id>runInPlace</id>
-        <dependencies>
-            <dependency>
-                <groupId>org.opennms.dependencies</groupId>
-                <artifactId>jersey-dependencies</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>compile</scope>
-            </dependency>
-        </dependencies>
-    </profile>
-  </profiles>
-  
-  
-</project>
+<?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/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>org.opennms.features</artifactId>
+    <groupId>org.opennms</groupId>
+    <version>1.13.0-SNAPSHOT</version>
+  </parent>
+    
+  <modelVersion>4.0.0</modelVersion>
+  
+  <groupId>org.opennms.features</groupId>
+  <artifactId>org.opennms.features.isoc-ipv6-gui</artifactId>
+  <packaging>war</packaging>
+  <name>ISOC World IPv6 UI</name>
+
+  <properties>
+    <moduleName>org.opennms.isoc.ipv6.gui.Application</moduleName>
+    <moduleHtml>index.html</moduleHtml>
+    <web.port>8080</web.port>
+  </properties>
+
+  
+
+  <build>
+<!--    <outputDirectory>war/WEB-INF/classes</outputDirectory>-->
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>gwt-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test</id>
+            <phase>test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+            
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <archiveClasses>true</archiveClasses>
+          <webResources>
+            <resource>
+              <filtering>true</filtering>
+              <directory>${basedir}/src/main/web-filtered</directory>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+          <systemProperties>
+            <systemProperty>
+              <name>log4j.configuration</name>
+              <value>file:${basedir}/runInPlace-log4j.properties</value>
+            </systemProperty>
+          </systemProperties>
+        </configuration>
+      </plugin>
+      <!-- Generates the GWT Container and Nature for GWT projects when eclipse:eclipse is run -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <additionalBuildcommands>
+            <buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand>
+            <buildcommand>com.google.gwt.eclipse.core.gwtProjectValidator</buildcommand>
+          </additionalBuildcommands>
+          <additionalProjectnatures>
+            <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
+            <projectnature>com.google.gwt.eclipse.core.gwtNature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>com.google.gwt.eclipse.core.GWT_CONTAINER</classpathContainer>
+          </classpathContainers>
+        </configuration>
+      </plugin>
+      
+    </plugins>
+  </build>
+    
+    
+    <dependencies>
+
+     <!-- GWT -->
+    <dependency>
+      <groupId>org.opennms.dependencies</groupId>
+      <artifactId>gwt-dependencies</artifactId>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <version>${gwtVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    
+    <!--GWT visualization-->
+    <dependency>
+        <groupId>com.google.gwt.google-apis</groupId>
+        <artifactId>gwt-visualization</artifactId>
+        <version>1.0.2</version>
+    </dependency>
+    
+    <!-- Jersey -->
+    <dependency>
+        <groupId>org.opennms.dependencies</groupId>
+        <artifactId>jersey-dependencies</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>provided</scope>
+      </dependency>
+
+    <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>2.5</version>
+        <scope>provided</scope>
+    </dependency>
+    
+    <!-- test -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+  <profiles>
+    <profile>
+        <id>runInPlace</id>
+        <dependencies>
+            <dependency>
+                <groupId>org.opennms.dependencies</groupId>
+                <artifactId>jersey-dependencies</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>compile</scope>
+            </dependency>
+        </dependencies>
+    </profile>
+  </profiles>
+  
+  
+</project>

features/isoc-ipv6-participants/pom.xml

-<?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/maven-v4_0_0.xsd">
-  <parent>
-	<artifactId>org.opennms.features</artifactId>
-	<groupId>org.opennms</groupId>
-	<version>1.13.0-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.opennms.features</groupId>
-  <artifactId>org.opennms.features.isoc-ipv6-participants</artifactId>
-  <name>ISOC World IPv6 Participant List</name>
-
-  <build>
-	<plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>xml-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>transform</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <transformationSets>
-            <transformationSet>
-              <dir>src/main/xml</dir>
-              <stylesheet>src/main/xslt/participants-requisition.xsl</stylesheet>
-			  <fileMappers>
-				<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
-				  <pattern>\.xml$</pattern>
-				  <replacement>-requisition.xml</replacement>
-				</fileMapper>
-			  </fileMappers>
-            </transformationSet>
-            <transformationSet>
-              <dir>src/main/xml</dir>
-              <stylesheet>src/main/xslt/participants-poller-configuration.xsl</stylesheet>
-              <parameters>
-                <parameter>
-                  <name>rrdDirectory</name>
-                  <!-- <value>${install.share.dir}</value> -->
-                  <value>/var/opennms</value>
-                </parameter>
-              </parameters>
-			  <fileMappers>
-				<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
-				  <pattern>\.xml$</pattern>
-				  <replacement>-poller-configuration.xml</replacement>
-				</fileMapper>
-			  </fileMappers>
-            </transformationSet>
-          </transformationSets>
-        </configuration>
-		<dependencies>
-		  <dependency>
-			<groupId>xalan</groupId>
-			<artifactId>xalan</artifactId>
-			<version>2.7.1</version>
-		  </dependency>
-		  <dependency>
-			<groupId>org.opennms</groupId>
-			<artifactId>opennms-util</artifactId>
-			<version>${project.version}</version>
-		  </dependency>
-		</dependencies>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?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/maven-v4_0_0.xsd">
+  <parent>
+	<artifactId>org.opennms.features</artifactId>
+	<groupId>org.opennms</groupId>
+	<version>1.13.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.opennms.features</groupId>
+  <artifactId>org.opennms.features.isoc-ipv6-participants</artifactId>
+  <name>ISOC World IPv6 Participant List</name>
+
+  <build>
+	<plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xml-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>transform</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <transformationSets>
+            <transformationSet>
+              <dir>src/main/xml</dir>
+              <stylesheet>src/main/xslt/participants-requisition.xsl</stylesheet>
+			  <fileMappers>
+				<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
+				  <pattern>\.xml$</pattern>
+				  <replacement>-requisition.xml</replacement>
+				</fileMapper>
+			  </fileMappers>
+            </transformationSet>
+            <transformationSet>
+              <dir>src/main/xml</dir>
+              <stylesheet>src/main/xslt/participants-poller-configuration.xsl</stylesheet>
+              <parameters>
+                <parameter>
+                  <name>rrdDirectory</name>
+                  <!-- <value>${install.share.dir}</value> -->
+                  <value>/var/opennms</value>
+                </parameter>
+              </parameters>
+			  <fileMappers>
+				<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
+				  <pattern>\.xml$</pattern>
+				  <replacement>-poller-configuration.xml</replacement>
+				</fileMapper>
+			  </fileMappers>
+            </transformationSet>
+          </transformationSets>
+        </configuration>
+		<dependencies>
+		  <dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.1</version>
+		  </dependency>
+		  <dependency>
+			<groupId>org.opennms</groupId>
+			<artifactId>opennms-util</artifactId>
+			<version>${project.version}</version>
+		  </dependency>
+		</dependencies>
+      </plugin>
+	</plugins>
+  </build>
+</project>

features/jmx-config-generator-webui/src/main/java/org/opennms/features/jmxconfiggenerator/webui/data/ModelChangeListener.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OpenNMS(R).  If not, see:
- *      http://www.gnu.org/licenses/
- *
- * For more information contact:
- *     OpenNMS(R) Licensing <license@opennms.org>
- *     http://www.opennms.org/
- *     http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.features.jmxconfiggenerator.webui.data;
-
-/**
- * One part of the observer pattern. It indicates if the given model <code>T</code> has changed.
- * In future releases a ModelChangeEvent may be introduced.
- * 
- * @author Markus von Rüden
- */
-public interface ModelChangeListener<T extends Object> {
-
-	/**
-	 * Is invoked after a model changes.
-	 * @param newModel the new model
-	 */
-	void modelChanged(T newModel);
-}
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2012 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenNMS(R).  If not, see:
+ *      http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ *     OpenNMS(R) Licensing <license@opennms.org>
+ *     http://www.opennms.org/
+ *     http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.features.jmxconfiggenerator.webui.data;
+
+/**
+ * One part of the observer pattern. It indicates if the given model <code>T</code> has changed.
+ * In future releases a ModelChangeEvent may be introduced.
+ * 
+ * @author Markus von Rüden
+ */
+public interface ModelChangeListener<T extends Object> {
+
+	/**
+	 * Is invoked after a model changes.
+	 * @param newModel the new model
+	 */
+	void modelChanged(T newModel);
+}

features/jmx-config-generator-webui/src/main/java/org/opennms/features/jmxconfiggenerator/webui/data/ModelChangeNotifier.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OpenNMS(R).  If not, see:
- *      http://www.gnu.org/licenses/
- *
- * For more information contact:
- *     OpenNMS(R) Licensing <license@opennms.org>
- *     http://www.opennms.org/
- *     http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.features.jmxconfiggenerator.webui.data;
-
-/**
- * One part of the Observer pattern.
- *
- * @author Markus von Rüden
- */
-public interface ModelChangeNotifier {
-
-	/**
-	 * Registers a ModelChangeListener.
-	 *
-	 * @param clazz The type of the Model. 
-	 * @param listener The listener to get invoked if the model of type <code>clazz</code> changed.
-	 */
-	void registerListener(Class<?> clazz, ModelChangeListener<?> listener);
-
-	/**
-	 * Notify all observers, which has been registered to type
-	 * <code>clazz</codE> models.
-	 *
-	 * @param clazz the type of the model.
-	 * @param newModel the model which has been changed.
-	 */
-	void notifyObservers(Class<?> clazz, Object newModel);
-}
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2012 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenNMS(R).  If not, see:
+ *      http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ *     OpenNMS(R) Licensing <license@opennms.org>
+ *     http://www.opennms.org/
+ *     http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.features.jmxconfiggenerator.webui.data;
+
+/**
+ * One part of the Observer pattern.
+ *
+ * @author Markus von Rüden
+ */
+public interface ModelChangeNotifier {
+
+	/**
+	 * Registers a ModelChangeListener.
+	 *
+	 * @param clazz The type of the Model. 
+	 * @param listener The listener to get invoked if the model of type <code>clazz</code> changed.
+	 */
+	void registerListener(Class<?> clazz, ModelChangeListener<?> listener);
+
+	/**
+	 * Notify all observers, which has been registered to type
+	 * <code>clazz</codE> models.
+	 *
+	 * @param clazz the type of the model.
+	 * @param newModel the model which has been changed.
+	 */
+	void notifyObservers(Class<?> clazz, Object newModel);
+}

features/jmx-config-generator-webui/src/test/java/org/opennms/features/jmxconfiggenerator/webui/data/SimpleEntryTest.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OpenNMS(R).  If not, see:
- *      http://www.gnu.org/licenses/
- *
- * For more information contact:
- *     OpenNMS(R) Licensing <license@opennms.org>
- *     http://www.opennms.org/
- *     http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.features.jmxconfiggenerator.webui.data;
-
-import org.opennms.features.jmxconfiggenerator.webui.data.SimpleEntry;
-import junit.framework.Assert;
-import org.junit.Test;
-
-/**
- *
- * @author Markus von Rüden
- */
-public class SimpleEntryTest {
-	
-	@Test
-	public void testHashCodeAndEquals() {
-		SimpleEntry one = new SimpleEntry("123", "456");
-		SimpleEntry two = new SimpleEntry("123", "456");
-		Assert.assertEquals(one, two);
-		Assert.assertEquals(one.hashCode(), two.hashCode());
-	}
-}
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2012 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenNMS(R).  If not, see:
+ *      http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ *     OpenNMS(R) Licensing <license@opennms.org>
+ *     http://www.opennms.org/
+ *     http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.features.jmxconfiggenerator.webui.data;
+
+import org.opennms.features.jmxconfiggenerator.webui.data.SimpleEntry;
+import junit.framework.Assert;
+import org.junit.Test;
+
+/**
+ *
+ * @author Markus von Rüden
+ */
+public class SimpleEntryTest {
+	
+	@Test
+	public void testHashCodeAndEquals() {
+		SimpleEntry one = new SimpleEntry("123", "456");
+		SimpleEntry two = new SimpleEntry("123", "456");
+		Assert.assertEquals(one, two);
+		Assert.assertEquals(one.hashCode(), two.hashCode());
+	}
+}

features/jmx-config-generator-webui/src/test/java/org/opennms/features/jmxconfiggenerator/webui/ui/validators/MBeansNameValidatorTest.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OpenNMS(R).  If not, see:
- *      http://www.gnu.org/licenses/
- *
- * For more information contact:
- *     OpenNMS(R) Licensing <license@opennms.org>
- *     http://www.opennms.org/
- *     http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.features.jmxconfiggenerator.webui.ui.validators;
-
-import org.opennms.features.jmxconfiggenerator.webui.ui.validators.NameValidator;
-import com.vaadin.data.Validator;
-import junit.framework.Assert;
-import org.junit.Test;
-
-/**
- *
- * @author Markus von Rüden
- */
-public class MBeansNameValidatorTest {
-	
-	public MBeansNameValidatorTest() {
-	}
-
-	
-	@Test
-	public void testValidate() {
-		final String[] OK = new String[]{
-			"com",  "com_webserver", "someEntry", 
-			"HELLO-WORLD", "Hello_woRlD", 
-			"some-additional-entry",  "some_Entry", 
-			"com.java.op-erating-system" /*strange seperation, but we must test this!*/, 
-			"some.entry.separated.by_.dots.a__.lot.of_.dots",
-			"a", "ab", "ab.cd", "a.bc", "ab.c"};
-		final String[] FAIL = new String[]{
-			"", ".", ".org", "opennms.", ".serviceopennms.org", "servicename!",
-			"service name", "service,name", "service, name", "straße", "schädel", "hühner", "hölle"};
-		NameValidator validator = new NameValidator();
-		validate(validator, OK, true);
-		validate(validator, FAIL, false);
-	}
-
-	public static void validate(Validator validator, String[] OK, boolean succeed) {
-		for (String validateMe : OK) {
-			Assert.assertEquals(validateMe, succeed, validator.isValid(validateMe));
-		}
-	}
-}
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2012 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenNMS(R).  If not, see:
+ *      http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ *     OpenNMS(R) Licensing <license@opennms.org>
+ *     http://www.opennms.org/
+ *     http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.features.jmxconfiggenerator.webui.ui.validators;
+
+import org.opennms.features.jmxconfiggenerator.webui.ui.validators.NameValidator;
+import com.vaadin.data.Validator;
+import junit.framework.Assert;
+import org.junit.Test;
+
+/**
+ *
+ * @author Markus von Rüden
+ */
+public class MBeansNameValidatorTest {
+	
+	public MBeansNameValidatorTest() {
+	}
+
+	
+	@Test
+	public void testValidate() {
+		final String[] OK = new String[]{
+			"com",  "com_webserver", "someEntry", 
+			"HELLO-WORLD", "Hello_woRlD", 
+			"some-additional-entry",  "some_Entry", 
+			"com.java.op-erating-system" /*strange seperation, but we must test this!*/, 
+			"some.entry.separated.by_.dots.a__.lot.of_.dots",
+			"a", "ab", "ab.cd", "a.bc", "ab.c"};
+		final String[] FAIL = new String[]{
+			"", ".", ".org", "opennms.", ".serviceopennms.org", "servicename!",
+			"service name", "service,name", "service, name", "straße", "schädel", "hühner", "hölle"};
+		NameValidator validator = new NameValidator();
+		validate(validator, OK, true);
+		validate(validator, FAIL, false);
+	}
+
+	public static void validate(Validator validator, String[] OK, boolean succeed) {
+		for (String validateMe : OK) {
+			Assert.assertEquals(validateMe, succeed, validator.isValid(validateMe));
+		}
+	}
+}

features/name-cutter/pom.xml

-<?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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>org.opennms.features</artifactId>
-        <groupId>org.opennms</groupId>
-        <version>1.13.0-SNAPSHOT</version>
-    </parent>
-    <groupId>org.opennms.features</groupId>
-    <artifactId>org.opennms.features.name-cutter</artifactId>
-    <packaging>bundle</packaging>
-    <name>OpenNMS Name Cutter</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
- 
-    <dependencies>
-      
-        <!-- Helpers -->
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+<?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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>org.opennms.features</artifactId>
+        <groupId>org.opennms</groupId>
+        <version>1.13.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.opennms.features</groupId>
+    <artifactId>org.opennms.features.name-cutter</artifactId>
+    <packaging>bundle</packaging>
+    <name>OpenNMS Name Cutter</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+ 
+    <dependencies>
+      
+        <!-- Helpers -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

features/ncs/ncs-drools/ServiceProvisionExample.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<component xmlns="http://xmlns.opennms.org/xsd/model/ncs" type="Service" foreignId="123" foreignSource="NA-Service">
-    <!-- service name, id (MOID) from NA model -->
-    <name>CokeP2P</name>
-    <component type="ServiceElement" foreignId="8765" foreignSource="NA-ServiceElement">
-            <!-- service name, id (DB id) from NA model -->
-        <name>PE1:SE1</name>
-        <node foreignSource="space" foreignId="1111-PE1" />
-        <component type="ServiceElementComponent" foreignSource="NA" foreignId="8765:jnxVpnIfVpn">
-            <!--  Service Element Component id is Service Element ID + component name -->
-            <name>jnxVpnIfVpn</name>
-            <upEventUei>jnxVpnVpnIfUp</upEventUei>
-            <downEventUei>jnxVpnIfVpnDown</downEventUei>
-            <attributes>
-                <attribute>
-                    <key>jnxVpnIfVpnType</key>
-                    <value>5</value>
-                </attribute>
-                <attribute>
-                    <key>jnxVpnIfVpnName</key>
-                    <value>ge-1/0/2.50</value>
-                </attribute>
-            </attributes>
-            <component type="ServiceElementComponent" foreignId="8765:link" foreignSource="NA-SvcElemComp">
-                <name>link</name>
-                <upEventUei>linkUp</upEventUei>
-                <downEventUei>linkDown</downEventUei>
-                <attributes>
-                    <attribute>
-                        <key>linkName</key>
-                        <value>ge-1/0/2</value>
-                    </attribute>
-                </attributes>
-            </component>
-        </component>
-        <component type="ServiceElementComponent" foreignId="8765:jnxVpnPwVpn-vcid(50)" foreignSource="NA-SvcElemComp">
-            <name>jnxVpnPwVpn-vcid(50)</name>
-            <upEventUei>jnxVpnPwVpnUp</upEventUei>
-            <downEventUei>jnxVpnPwVpnDown</downEventUei>
-            <!-- default dependency from parent to children is ALL -->
-            <dependenciesRequired>ANY</dependenciesRequired>
-            <attributes>
-                <attribute>
-                    <key>jnxVpnPwVpnType</key>
-                    <value>5</value>
-                </attribute>
-                <attribute>
-                    <key>jnxVpnPwVpnName</key>
-                    <value>ge-1/0/2.50</value>
-                </attribute>
-            </attributes>
-            <component type="ServiceElementComponent" foreignId="8765:lspA-PE1-PE2" foreignSource="NA-SvcElemComp">
-                <name>lspA-PE1-PE2</name>
-                <upEventUei>mplsLspPathUp</upEventUei>
-                <downEventUei>mplsLspPathDown</downEventUei>
-                <attributes>
-                    <attribute>
-                        <key>mplsLspName</key>
-                        <value>lspA-PE1-PE2</value>
-                    </attribute>
-                </attributes>
-            </component>
-            <component type="ServiceElementComponent" foreignId="8765:lspB-PE1-PE2" foreignSource="NA-SvcElemComp">
-                <name>lspB-PE1-PE2</name>
-                <upEventUei>mplsLspPathUp</upEventUei>
-                <downEventUei>mplsLspPathDown</downEventUei>
-                <attributes>
-                    <attribute>
-                        <key>mplsLspName</key>
-                        <value>lspA-PE1-PE2</value>
-                    </attribute>
-                </attributes>
-            </component>
-        </component>
-    </component>
-    <component type="ServiceElement" foreignId="9876" foreignSource="NA-ServiceElement">
-        <name>PE2:SE1</name>
-        <node foreignSource="space" foreignId="2222-PE2" />
-        <component type="ServiceElementComponent"  foreignId="9876:jnxVpnIfVpn" foreignSource="NA-SvcElemComp">
-            <name>jnxVpnIfVpn</name>
-            <upEventUei>jnxVpnIfVpnUp</upEventUei>
-            <downEventUei>jnxVpnIfVpnDown</downEventUei>
-            <attributes>
-                <attribute>
-                    <key>jnxVpnIfVpnType</key>
-                    <value>5</value>
-                </attribute>
-                <attribute>
-                    <key>jnxVpnIfVpnName</key>
-                    <value>ge-3/1/4.50</value>
-                </attribute>
-            </attributes>
-            <component type="ServiceElementComponent" foreignId="9876:link" foreignSource="NA-SvcElemComp">
-                <name>link</name>
-                <upEventUei>linkUp</upEventUei>
-                <downEventUei>linkDown</downEventUei>
-                <attributes>
-                    <attribute>
-                        <key>linkName</key>
-                        <value>ge-3/1/4</value>
-                    </attribute>
-                </attributes>
-            </component>
-        </component>
-        <component type="ServiceElementComponent" foreignId="9876:jnxVpnPwVpn-vcid(50)" foreignSource="NA-SvcElemComp">
-            <name>jnxVpnPwVpn-vcid(50)</name>
-            <upEventUei>jnxVpnPwVpnUp</upEventUei>
-            <downEventUei>jnxVpnPwVpnDown</downEventUei>
-            <dependenciesRequired>ANY</dependenciesRequired>
-            <attributes>
-                <attribute>
-                    <key>jnxVpnPwVpnType</key>
-                    <value>5</value>
-                </attribute>
-                <attribute>
-                    <key>jnxVpnPwVpnName</key>
-                    <value>ge-3/1/4.50</value>
-                </attribute>
-            </attributes>
-            <component type="ServiceElementComponent" foreignId="9876:lspA-PE2-PE1" foreignSource="NA-SvcElemComp">
-                <name>lspA-PE2-PE1</name>
-                <upEventUei>mplsLspPathUp</upEventUei>
-                <downEventUei>mplsLspPathDown</downEventUei>
-                <attributes>
-                    <attribute>
-                        <key>mplsLspName</key>
-                        <value>lspA-PE2-PE1</value>
-                    </attribute>
-                </attributes>
-            </component>
-            <component type="ServiceElementComponent" foreignId="9876:lspB-PE2-PE1" foreignSource="NA-SvcElemComp">
-                <name>lspB-PE2-PE1</name>
-                <upEventUei>mplsLspPathUp</upEventUei>
-                <downEventUei>mplsLspPathDown</downEventUei>
-                <attributes>
-                    <attribute>
-                        <key>mplsLspName</key>
-                        <value>lspB-PE2-PE1</value>