Move config file under src/main/config

Instead have having a seperate bundle for the config file, let's use the src/main/config
source package and the config-parent parent from controller project

This patch also fixes:

- header violation
- proper .gitignore entry for maven-metadata-local.xml

Change-Id: I738e592f8d7e559d9609b8c8f1d4cf9102311367
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>

diff --git a/.gitignore b/.gitignore
index 5b757fa5e7c37363f966f2d4622cad4992d955a7..23f084b386256f403d14f1e377126928e1e98184 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,4 @@ renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/resolver/
 .checkstyle
 yang-gen-config/
 yang-gen-sal/
-maven-metadata-local
+maven-metadata-local.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 03af0723007c0a39bd012f1ecab10068f4f65a35..91f04572633cae48d57016a7bc7fc6c7be890b92 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -52,35 +52,35 @@
       <!-- GBP configuration -->
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>groupbasedpolicy-ofoverlay-config</artifactId>
+        <artifactId>ofoverlay-renderer</artifactId>
         <version>${project.version}</version>
         <type>xml</type>
         <classifier>config</classifier>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>groupbasedpolicy-faas-config</artifactId>
+        <artifactId>faas-renderer</artifactId>
         <version>${project.version}</version>
         <type>xml</type>
         <classifier>config</classifier>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>neutron-mapper-config</artifactId>
+        <artifactId>neutron-mapper</artifactId>
         <version>${project.version}</version>
         <type>xml</type>
         <classifier>config</classifier>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>neutron-ovsdb-config</artifactId>
+        <artifactId>neutron-ovsdb</artifactId>
         <version>${project.version}</version>
         <type>xml</type>
         <classifier>config</classifier>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>ui-backend-config</artifactId>
+        <artifactId>ui-backend</artifactId>
         <version>${project.version}</version>
         <type>xml</type>
         <classifier>config</classifier>

diff --git a/features/pom.xml b/features/pom.xml
index dc51f878402943bafdbf152b6061e480abc0ba94..d08a709a55ff3c58dbcf6f9808a1e1a79b172066 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -226,31 +226,31 @@
     <!-- GBP configuration -->
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>groupbasedpolicy-ofoverlay-config</artifactId>
+      <artifactId>ofoverlay-renderer</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>groupbasedpolicy-faas-config</artifactId>
+      <artifactId>faas-renderer</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>neutron-mapper-config</artifactId>
+      <artifactId>neutron-mapper</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>neutron-ovsdb-config</artifactId>
+      <artifactId>neutron-ovsdb</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>ui-backend-config</artifactId>
+      <artifactId>ui-backend</artifactId>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index a8c0c3f0d46ac702aaf5148198850c0d2be1689b..ff5671c374ca5b98a578a261f623dbd9b1e03cf5 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -58,7 +58,7 @@
         <feature version='${sfc.version}'>odl-sfc-ui</feature>
         <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-ofoverlay.xml">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ofoverlay-config/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-ofoverlay.xml">mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <!--
@@ -72,7 +72,7 @@
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version='${openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/faas-renderer/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-faas.xml">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-faas-config/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/15-groupbasedpolicy-faas.xml">mvn:org.opendaylight.groupbasedpolicy/faas-renderer/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <!--
@@ -85,8 +85,8 @@
         <feature version="${project.version}">odl-groupbasedpolicy-ofoverlay</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/neutron-ovsdb/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/15-neutron-mapper.xml">mvn:org.opendaylight.groupbasedpolicy/neutron-mapper-config/{{VERSION}}/xml/config</configfile>
-        <configfile finalname="${config.configfile.directory}/15-neutron-ovsdb.xml">mvn:org.opendaylight.groupbasedpolicy/neutron-ovsdb-config/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/15-neutron-mapper.xml">mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/15-neutron-ovsdb.xml">mvn:org.opendaylight.groupbasedpolicy/neutron-ovsdb/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <!--
@@ -97,7 +97,7 @@
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${restconf.version}">odl-restconf</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ui-backend/{{VERSION}}</bundle>
-        <configfile finalname="${config.configfile.directory}/15-ui-backend.xml">mvn:org.opendaylight.groupbasedpolicy/ui-backend-config/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/15-ui-backend.xml">mvn:org.opendaylight.groupbasedpolicy/ui-backend/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <!--

diff --git a/groupbasedpolicy-faas-config/pom.xml b/groupbasedpolicy-faas-config/pom.xml
deleted file mode 100644 (file)
index 8ba374d..0000000
--- a/groupbasedpolicy-faas-config/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Huawei Technologies and others. All rights reserved. 
-  This program and the accompanying materials are made available under the 
-  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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
-  </parent>
-
-  <artifactId>groupbasedpolicy-faas-config</artifactId>
-  <description>Controller Configuration files for groupbasedpolicy</description>
-  <packaging>jar</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/initial/15-groupbasedpolicy-faas.xml</file>
-                  <type>xml</type>
-                  <classifier>config</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/groupbasedpolicy-ofoverlay-config/pom.xml b/groupbasedpolicy-ofoverlay-config/pom.xml
deleted file mode 100644 (file)
index b0981ac..0000000
--- a/groupbasedpolicy-ofoverlay-config/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. 
-  This program and the accompanying materials are made available under the 
-  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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
-  </parent>
-
-  <artifactId>groupbasedpolicy-ofoverlay-config</artifactId>
-  <description>Controller Configuration files for groupbasedpolicy</description>
-  <packaging>jar</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/initial/15-groupbasedpolicy-ofoverlay.xml</file>
-                  <type>xml</type>
-                  <classifier>config</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/neutron-mapper-config/pom.xml b/neutron-mapper-config/pom.xml
deleted file mode 100644 (file)
index 282cb5b..0000000
--- a/neutron-mapper-config/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. 
-  This program and the accompanying materials are made available under the 
-  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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
-  </parent>
-
-  <artifactId>neutron-mapper-config</artifactId>
-  <description>Controller Configuration files for neutron-mapper</description>
-  <packaging>jar</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/initial/15-neutron-mapper.xml</file>
-                  <type>xml</type>
-                  <classifier>config</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/neutron-mapper/pom.xml b/neutron-mapper/pom.xml
index c4d8c61629705c99894f0ad5dc88b826dc705467..0f76a2a07eda2fb5bb4d569c14d2a7178acc6103 100644 (file)
--- a/neutron-mapper/pom.xml
+++ b/neutron-mapper/pom.xml
@@ -9,23 +9,31 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>groupbasedpolicy.project</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>config-parent</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
+  <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>neutron-mapper</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+  <properties>
+    <neutron.version>0.6.0-SNAPSHOT</neutron.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>groupbasedpolicy</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ofoverlay-renderer</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>

diff --git a/neutron-mapper-config/src/main/resources/initial/15-neutron-mapper.xml b/neutron-mapper/src/main/config/default-config.xml
similarity index 100%
rename from neutron-mapper-config/src/main/resources/initial/15-neutron-mapper.xml
rename to neutron-mapper/src/main/config/default-config.xml

diff --git a/neutron-ovsdb-config/pom.xml b/neutron-ovsdb-config/pom.xml
deleted file mode 100644 (file)
index 63900ff..0000000
--- a/neutron-ovsdb-config/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
-  This program and the accompanying materials are made available under the
-  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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
-  </parent>
-
-  <artifactId>neutron-ovsdb-config</artifactId>
-  <description>Controller Configuration files for neutron-ovsdb</description>
-  <packaging>jar</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/initial/15-neutron-ovsdb.xml</file>
-                  <type>xml</type>
-                  <classifier>config</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/neutron-ovsdb/pom.xml b/neutron-ovsdb/pom.xml
index 2adb9c0b9612843c1e58b15ceaeedfec5a020774..8311b9c888c5f83ac0688b3e033e1d0849d35836 100644 (file)
--- a/neutron-ovsdb/pom.xml
+++ b/neutron-ovsdb/pom.xml
@@ -9,27 +9,36 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>groupbasedpolicy.project</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>config-parent</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
+  <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>neutron-ovsdb</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+  <properties>
+    <ovsdb.version>1.2.1-SNAPSHOT</ovsdb.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>groupbasedpolicy</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ofoverlay-renderer</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>neutron-mapper</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -46,10 +55,12 @@
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>southbound-api</artifactId>
+      <version>${ovsdb.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>southbound-impl</artifactId>
+      <version>${ovsdb.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/neutron-ovsdb-config/src/main/resources/initial/15-neutron-ovsdb.xml b/neutron-ovsdb/src/main/config/default-config.xml
similarity index 100%
rename from neutron-ovsdb-config/src/main/resources/initial/15-neutron-ovsdb.xml
rename to neutron-ovsdb/src/main/config/default-config.xml

diff --git a/pom.xml b/pom.xml
index 6a1c8c80c6f7a8baec7915cc12c03eeeab4387b9..3a69c9d3a24933c6448ae9672e7f3418a803048d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,14 +25,9 @@
     <module>commons/parent</module>
     <module>groupbasedpolicy</module>
     <module>renderers</module>
-    <module>groupbasedpolicy-ofoverlay-config</module>
-    <module>groupbasedpolicy-faas-config</module>
     <module>neutron-mapper</module>
-    <module>neutron-mapper-config</module>
     <module>neutron-ovsdb</module>
-    <module>neutron-ovsdb-config</module>
     <module>ui-backend</module>
-    <module>ui-backend-config</module>
     <module>groupbasedpolicy-ui</module>
     <module>distribution-karaf</module>
     <module>features</module>

diff --git a/renderers/faas/pom.xml b/renderers/faas/pom.xml
index 42efe13ff7c5b11608fad480c010d0dc48b1b01d..8cea0bcadde348ecb50ef74a8573a219084add5b 100644 (file)
--- a/renderers/faas/pom.xml
+++ b/renderers/faas/pom.xml
@@ -17,6 +17,10 @@
   <artifactId>faas-renderer</artifactId>
   <packaging>bundle</packaging>
 
+  <properties>
+    <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
@@ -25,6 +29,7 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-extension-nicira</artifactId>
+      <version>${openflowplugin.version}</version>
     </dependency>
     <!-- testing dependencies -->
     <dependency>

diff --git a/groupbasedpolicy-faas-config/src/main/resources/initial/15-groupbasedpolicy-faas.xml b/renderers/faas/src/main/config/default-config.xml
similarity index 99%
rename from groupbasedpolicy-faas-config/src/main/resources/initial/15-groupbasedpolicy-faas.xml
rename to renderers/faas/src/main/config/default-config.xml
index fd0ffb7dd1f4faf0dbc9218fe7a7813eb0699170..670e8514490edf9168cbbf579c6c0d987e3e7696 100644 (file)
--- a/groupbasedpolicy-faas-config/src/main/resources/initial/15-groupbasedpolicy-faas.xml
+++ b/renderers/faas/src/main/config/default-config.xml
@@ -41,4 +41,4 @@
         <capability>urn:opendaylight:params:xml:ns:yang:controller:config:faas-provider:impl?module=faas-provider-impl&amp;revision=2015-10-09</capability>
     </required-capabilities>
 
-</snapshot>
+</snapshot>
\ No newline at end of file

diff --git a/renderers/faas/src/main/java/org/opendaylight/groupbasedpolicy/renderer/faas/FaasEndpointManagerListener.java b/renderers/faas/src/main/java/org/opendaylight/groupbasedpolicy/renderer/faas/FaasEndpointManagerListener.java
index 0b5999df8087cf686035be0aa844a65042f9e44a..ea574641927c907831fce985cedb91ca7576dfbb 100644 (file)
--- a/renderers/faas/src/main/java/org/opendaylight/groupbasedpolicy/renderer/faas/FaasEndpointManagerListener.java
+++ b/renderers/faas/src/main/java/org/opendaylight/groupbasedpolicy/renderer/faas/FaasEndpointManagerListener.java
@@ -1,12 +1,13 @@
-package org.opendaylight.groupbasedpolicy.renderer.faas;
-
 /*
  * Copyright (c) 2015 Huawei Technologies and others. All rights reserved.
- * 
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
+package org.opendaylight.groupbasedpolicy.renderer.faas;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Map;

diff --git a/renderers/faas/src/main/java/org/opendaylight/groupbasedpolicy/renderer/faas/FaasRenderer.java b/renderers/faas/src/main/java/org/opendaylight/groupbasedpolicy/renderer/faas/FaasRenderer.java
index 7f18f0521a95110fbfe04b388ed2f7d77ca9f330..3e1807e0c5e86b965c611ba3cd6125d6c5ea6359 100644 (file)
--- a/renderers/faas/src/main/java/org/opendaylight/groupbasedpolicy/renderer/faas/FaasRenderer.java
+++ b/renderers/faas/src/main/java/org/opendaylight/groupbasedpolicy/renderer/faas/FaasRenderer.java
@@ -1,5 +1,3 @@
-package org.opendaylight.groupbasedpolicy.renderer.faas;
-
 /*
  * Copyright (c) 2015 Huawei Technologies and others. All rights reserved.
  *
@@ -8,6 +6,8 @@ package org.opendaylight.groupbasedpolicy.renderer.faas;
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
+package org.opendaylight.groupbasedpolicy.renderer.faas;
+
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 

diff --git a/renderers/ofoverlay/pom.xml b/renderers/ofoverlay/pom.xml
index e95088cb36143baa27a949f76bba59e5b89cea5c..90614a6650ab2dc4532a863e5590f7c518d7930e 100644 (file)
--- a/renderers/ofoverlay/pom.xml
+++ b/renderers/ofoverlay/pom.xml
@@ -17,6 +17,13 @@
   <artifactId>ofoverlay-renderer</artifactId>
   <packaging>bundle</packaging>
 
+  <properties>
+    <ovsdb.version>1.2.1-SNAPSHOT</ovsdb.version>
+    <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
+    <liblldp.version>0.10.0-SNAPSHOT</liblldp.version>
+    <sfc.version>0.2.0-SNAPSHOT</sfc.version>
+  </properties>
+
   <dependencies>
     <!-- model dependencies -->
     <dependency>
@@ -26,16 +33,18 @@
   <dependency>
     <groupId>org.opendaylight.ovsdb</groupId>
     <artifactId>southbound-api</artifactId>
+    <version>${ovsdb.version}</version>
   </dependency>
-
     <!-- project specific dependencies -->
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-extension-nicira</artifactId>
+      <version>${openflowplugin.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>liblldp</artifactId>
+      <version>${liblldp.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>

diff --git a/groupbasedpolicy-ofoverlay-config/src/main/resources/initial/15-groupbasedpolicy-ofoverlay.xml b/renderers/ofoverlay/src/main/config/default-config.xml
similarity index 100%
rename from groupbasedpolicy-ofoverlay-config/src/main/resources/initial/15-groupbasedpolicy-ofoverlay.xml
rename to renderers/ofoverlay/src/main/config/default-config.xml

diff --git a/renderers/pom.xml b/renderers/pom.xml
index 9f43134981efaec47447baaab86bb9673c851dad..94bb8e78b23a4ea2039dc1ea103b8b04379422ba 100644 (file)
--- a/renderers/pom.xml
+++ b/renderers/pom.xml
@@ -7,14 +7,16 @@
   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.groupbasedpolicy</groupId>
-    <artifactId>groupbasedpolicy.project</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+ <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>config-parent</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
+  <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>groupbasedpolicy-renderers</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -26,16 +28,7 @@
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>groupbasedpolicy</artifactId>
-    </dependency>
-
-    <!-- controller dependencies -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/ui-backend-config/pom.xml b/ui-backend-config/pom.xml
deleted file mode 100644 (file)
index 4291746..0000000
--- a/ui-backend-config/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. 
-  This program and the accompanying materials are made available under the 
-  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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
-  </parent>
-
-  <artifactId>ui-backend-config</artifactId>
-  <description>Controller Configuration files for ui-backend</description>
-  <packaging>jar</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/initial/15-ui-backend.xml</file>
-                  <type>xml</type>
-                  <classifier>config</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/ui-backend/pom.xml b/ui-backend/pom.xml
index 762423ea9b9defdf7cbff15012d6aab8aeeb97e0..db8586013b5e8c747debe3feb97c43477879f4e0 100644 (file)
--- a/ui-backend/pom.xml
+++ b/ui-backend/pom.xml
@@ -5,12 +5,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>groupbasedpolicy.project</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>config-parent</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
+  <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>ui-backend</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <!-- project build -->
@@ -46,16 +49,7 @@
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>groupbasedpolicy</artifactId>
-    </dependency>
-
-    <!-- controller dependencies -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/ui-backend-config/src/main/resources/initial/15-ui-backend.xml b/ui-backend/src/main/config/default-config.xml
similarity index 100%
rename from ui-backend-config/src/main/resources/initial/15-ui-backend.xml
rename to ui-backend/src/main/config/default-config.xml