Refactor alarm poms to match latest conventions

Change-Id: I11944df261393aa119c6081cc6e884ce2e29a6b7
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/vpnservice/alarm/alarm-impl/pom.xml b/vpnservice/alarm/impl/pom.xml
similarity index 67%
rename from vpnservice/alarm/alarm-impl/pom.xml
rename to vpnservice/alarm/impl/pom.xml
index 81964f35d16127fa98cb86b21dee5e4bf3bbdff6..38fbada065c56cc9fd5c3a8652c49efa33bea2fd 100644 (file)
--- a/vpnservice/alarm/alarm-impl/pom.xml
+++ b/vpnservice/alarm/impl/pom.xml
@@ -8,6 +8,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>
+
     <parent>
         <groupId>org.opendaylight.netvirt</groupId>
         <artifactId>binding-parent</artifactId>
@@ -15,10 +17,10 @@
         <relativePath>../../commons/binding-parent</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>alarm-impl</artifactId>
     <name>ODL :: netvirt :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
@@ -28,33 +30,15 @@
     </dependencies>
 
     <build>
-
-    <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-pmd-plugin</artifactId>
-        </plugin>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>findbugs-maven-plugin</artifactId>
-            <configuration>
-                 <failOnError>true</failOnError>
-            </configuration>
-        </plugin>
-        <!--
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-                <skip>true</skip>
-            </configuration>
-        </plugin>
-         -->
-    </plugins>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <configuration>
+                     <failOnError>true</failOnError>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <!--

diff --git a/vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java b/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java
similarity index 99%
rename from vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java
rename to vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java
index 7a61c4d3ec9bd1eb4390d9a3347108c778eda8b5..34aa486806bf6d78e4a3f934e413f8698ecd8eb4 100644 (file)
--- a/vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java
+++ b/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java
@@ -51,4 +51,3 @@ public class NeutronvpnAlarms {
         return enabledPropertyStr != null && enabledPropertyStr.equalsIgnoreCase("true");
     }
 }
-

diff --git a/vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java b/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java
similarity index 100%
rename from vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java
rename to vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java

diff --git a/vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java b/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java
similarity index 100%
rename from vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java
rename to vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java

diff --git a/vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java b/vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java
similarity index 100%
rename from vpnservice/alarm/alarm-impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java
rename to vpnservice/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarmMBean.java

diff --git a/vpnservice/alarm/alarm-impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java b/vpnservice/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java
similarity index 100%
rename from vpnservice/alarm/alarm-impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java
rename to vpnservice/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/ExtraRouteConfigFaultAlarmTest.java

diff --git a/vpnservice/alarm/alarm-impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java b/vpnservice/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java
similarity index 100%
rename from vpnservice/alarm/alarm-impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java
rename to vpnservice/alarm/impl/src/test/java/org/opendaylight/netvirt/alarm/test/NeutronvpnAlarmsTest.java

diff --git a/vpnservice/alarm/pom.xml b/vpnservice/alarm/pom.xml
index fa0d8a484346d92da513c93b2b7d4476f4ed0555..1458b6559225b6754086b88718175de5e86fe928 100644 (file)
--- a/vpnservice/alarm/pom.xml
+++ b/vpnservice/alarm/pom.xml
@@ -6,67 +6,59 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<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">
+<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>
 
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
-    <relativePath/>
-  </parent>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.0.5</version>
+        <relativePath/>
+    </parent>
 
-  <groupId>org.opendaylight.netvirt</groupId>
-  <artifactId>alarm</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
-  <name>ODL :: netvirt :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>alarm</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <name>ODL :: netvirt :: ${project.artifactId}</name>
+    <packaging>pom</packaging>
 
-  <modules>
-    <module>alarm-impl</module>
-  </modules>
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <!--
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      -->
-    </plugins>
-  </build>
+    <modules>
+        <module>impl</module>
+    </modules>
 
-  <!--
-      Maven Site Configuration
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+    <!--
+        Maven Site Configuration
 
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
+        The following configuration is necessary for maven-site-plugin to
+        correctly identify the correct deployment path for OpenDaylight Maven
+        sites.
+    -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
 </project>