Changed package name from controller to affinity

Signed-off-by: Katrina LaCurts <katrina.lacurts@plexxi.com>

diff --git a/affinity/api/pom.xml b/affinity/api/pom.xml
index 21162f69696e1ae9663bac41abd896a0536de7ff..a5a653e47e777356cc36072606e53f5d9c0ec23b 100644 (file)
--- a/affinity/api/pom.xml
+++ b/affinity/api/pom.xml
@@ -2,27 +2,19 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-<!--   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>affinity</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent> -->
 
-  <groupId>org.opendaylight.controller</groupId>
+  <parent>
+    <groupId>org.opendaylight.affinity</groupId>
+    <artifactId>affinityParent</artifactId>
+    <version>0.4.1-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.opendaylight.affinity</groupId>
   <artifactId>affinity</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <properties>
-    <!-- Sonar properties using jacoco to retrieve integration test results -->
-    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-    <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-    <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
-    <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <sonar.language>java</sonar.language>
-    <junit.version>4.10</junit.version>
-    <enunciate.version>1.26.2</enunciate.version>
-  </properties>
   <build>
     <pluginManagement>
       <plugins>
@@ -42,24 +34,16 @@
         <configuration>
           <instructions>
             <Export-Package>
-              org.opendaylight.controller.affinity
+              org.opendaylight.affinity.affinity
             </Export-Package>
             <Import-Package>
-              javax.ws.rs,
-              javax.ws.rs.core,
               javax.xml.bind.annotation,
-              javax.xml.bind,
-              org.apache.commons.lang3.builder,
-              org.apache.felix.dm,
-              org.eclipse.osgi.framework.console,
               org.opendaylight.controller.clustering.services,
               org.opendaylight.controller.configuration,
               org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.sal.packet,
               org.opendaylight.controller.sal.inventory,
-              org.osgi.framework,
-              org.slf4j,
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
           </instructions>
@@ -91,7 +75,7 @@
     </plugins>
   </build>
   <dependencies>
-    <dependency>
+   <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>
@@ -112,12 +96,10 @@
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
-
   </dependencies>
 </project>

diff --git a/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityGroup.java b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityGroup.java
similarity index 98%
rename from affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityGroup.java
rename to affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityGroup.java
index 19119809591135111859a0772fb82e4a5e25ebb6..d8d017d9caef7ba0edec8dcf6e1ececa10199075 100644 (file)
--- a/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityGroup.java
+++ b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityGroup.java
@@ -1,4 +1,4 @@
-package org.opendaylight.controller.affinity;
+package org.opendaylight.affinity.affinity;
 
 import org.opendaylight.controller.sal.utils.NetUtils;
 import java.io.Serializable;

diff --git a/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityIdentifier.java b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityIdentifier.java
similarity index 92%
rename from affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityIdentifier.java
rename to affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityIdentifier.java
index ad3bdd2b7934ef41bede4199e9d665b0f0861b4c..4388ec3558a55458ae312a7e38d286c3e56656a0 100644 (file)
--- a/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityIdentifier.java
+++ b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityIdentifier.java
@@ -1,4 +1,4 @@
-package org.opendaylight.controller.affinity;
+package org.opendaylight.affinity.affinity;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityLink.java b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityLink.java
similarity index 98%
rename from affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityLink.java
rename to affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityLink.java
index 9eb58cac8b61709eedffe19a4e1a7496ccb2303c..9406c5991e477a2452c69733ab0dc1109b991d0b 100644 (file)
--- a/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityLink.java
+++ b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityLink.java
@@ -1,4 +1,4 @@
-package org.opendaylight.controller.affinity;
+package org.opendaylight.affinity.affinity;
 
 import org.opendaylight.controller.sal.utils.NetUtils;
 import java.io.Serializable;

diff --git a/affinity/api/src/main/java/org/opendaylight/controller/affinity/IAffinityManager.java b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/IAffinityManager.java
similarity index 94%
rename from affinity/api/src/main/java/org/opendaylight/controller/affinity/IAffinityManager.java
rename to affinity/api/src/main/java/org/opendaylight/affinity/affinity/IAffinityManager.java
index a30e940e181358ce9334ffe54e96688364871b40..d89a7c8b0a1525f84be0fa864dbda7f3dfd7a9f6 100644 (file)
--- a/affinity/api/src/main/java/org/opendaylight/controller/affinity/IAffinityManager.java
+++ b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/IAffinityManager.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2013 Plexxi, Inc. and others.  All rights reserved.
  *
@@ -7,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity;
+package org.opendaylight.affinity.affinity;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
@@ -24,7 +23,7 @@ import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.core.Property;
 import org.opendaylight.controller.sal.utils.Status;
 
-import org.opendaylight.controller.affinity.AffinityLink;
+import org.opendaylight.affinity.affinity.AffinityLink;
 
 /**
  * Primary purpose of this interface is to provide methods for

diff --git a/affinity/api/src/main/java/org/opendaylight/controller/affinity/IAffinityManagerAware.java b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/IAffinityManagerAware.java
similarity index 96%
rename from affinity/api/src/main/java/org/opendaylight/controller/affinity/IAffinityManagerAware.java
rename to affinity/api/src/main/java/org/opendaylight/affinity/affinity/IAffinityManagerAware.java
index 1dad4ffe6726d2bebe1e9b906c5362bd228ea7ae..0fab078ec4140a85a403ea4dbf568a8541939146 100644 (file)
--- a/affinity/api/src/main/java/org/opendaylight/controller/affinity/IAffinityManagerAware.java
+++ b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/IAffinityManagerAware.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity;
+package org.opendaylight.affinity.affinity;
 
 /**
  * The interface which describes the methods forwarding rules manager will call

diff --git a/affinity/api/src/test/java/org/opendaylight/controller/affinity/AffinityGroupTest.java b/affinity/api/src/test/java/org/opendaylight/affinity/affinity/AffinityGroupTest.java
similarity index 97%
rename from affinity/api/src/test/java/org/opendaylight/controller/affinity/AffinityGroupTest.java
rename to affinity/api/src/test/java/org/opendaylight/affinity/affinity/AffinityGroupTest.java
index 58c3f88923c038669294b206ff6ea1f43cf101cb..629f1ba892bf280bf91ddb01d136d94d5f4fb6bc 100644 (file)
--- a/affinity/api/src/test/java/org/opendaylight/controller/affinity/AffinityGroupTest.java
+++ b/affinity/api/src/test/java/org/opendaylight/affinity/affinity/AffinityGroupTest.java
@@ -1,4 +1,4 @@
-package org.opendaylight.controller.affinity;
+package org.opendaylight.affinity.affinity;
 
 import java.net.Inet6Address;
 import java.net.InetAddress;

diff --git a/affinity/implementation/pom.xml b/affinity/implementation/pom.xml
index 562161c9f378f982f32bc60801e456a1419184e0..f7f80008d26672f08eb32377c56a57e5d3be010b 100644 (file)
--- a/affinity/implementation/pom.xml
+++ b/affinity/implementation/pom.xml
@@ -2,26 +2,19 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-<!--  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>affinity</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent> -->
 
-  <groupId>org.opendaylight.controller.affinity</groupId>
-  <artifactId>implementation</artifactId>
+  <parent>
+    <groupId>org.opendaylight.affinity</groupId>
+    <artifactId>affinityParent</artifactId>
+    <version>0.4.1-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.opendaylight.affinity</groupId>
+  <artifactId>affinity.implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <properties>
-    <!-- Sonar properties using jacoco to retrieve integration test results -->
-    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-    <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-    <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
-    <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <sonar.language>java</sonar.language>
-    <junit.version>4.10</junit.version>
-  </properties>
   <build>
     <pluginManagement>
       <plugins>
@@ -40,10 +33,8 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Export-Package>
-            </Export-Package>
             <Import-Package>
-              org.opendaylight.controller.affinity,
+              org.opendaylight.affinity.affinity,
               org.opendaylight.controller.clustering.services,
               org.opendaylight.controller.configuration,
               org.opendaylight.controller.hosttracker,
@@ -60,7 +51,7 @@
               org.apache.commons.lang3.builder
             </Import-Package>
             <Bundle-Activator>
-              org.opendaylight.controller.affinity.internal.Activator
+              org.opendaylight.affinity.affinity.internal.Activator
             </Bundle-Activator>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
@@ -123,7 +114,7 @@
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>

diff --git a/affinity/implementation/src/main/java/org/opendaylight/controller/affinity/internal/Activator.java b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java
similarity index 95%
rename from affinity/implementation/src/main/java/org/opendaylight/controller/affinity/internal/Activator.java
rename to affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java
index f2a5240d80042f79d965acd89d2f3ee729f2f2b3..18c011a173389576330042a57fa66509c1802d4b 100644 (file)
--- a/affinity/implementation/src/main/java/org/opendaylight/controller/affinity/internal/Activator.java
+++ b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2013 Plexxi, Inc. and others.  All rights reserved.
  *
@@ -7,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity.internal;
+package org.opendaylight.affinity.affinity.internal;
 
 import java.util.Dictionary;
 import java.util.HashSet;
@@ -19,8 +18,8 @@ import org.opendaylight.controller.clustering.services.ICacheUpdateAware;
 import org.opendaylight.controller.clustering.services.IClusterContainerServices;
 import org.opendaylight.controller.configuration.IConfigurationContainerAware;
 import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
-import org.opendaylight.controller.affinity.IAffinityManager;
-import org.opendaylight.controller.affinity.IAffinityManagerAware;
+import org.opendaylight.affinity.affinity.IAffinityManager;
+import org.opendaylight.affinity.affinity.IAffinityManagerAware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/affinity/implementation/src/main/java/org/opendaylight/controller/affinity/internal/AffinityManagerImpl.java b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
similarity index 97%
rename from affinity/implementation/src/main/java/org/opendaylight/controller/affinity/internal/AffinityManagerImpl.java
rename to affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
index 95101ce550228b9ac636e670587cbde26e7de4ce..43fe7d1427ca1d96f8f02cb9bd2555e401c487a6 100644 (file)
--- a/affinity/implementation/src/main/java/org/opendaylight/controller/affinity/internal/AffinityManagerImpl.java
+++ b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity.internal;
+package org.opendaylight.affinity.affinity.internal;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -72,11 +72,11 @@ import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
 
 import org.opendaylight.controller.sal.utils.ServiceHelper;
-import org.opendaylight.controller.affinity.AffinityGroup;
-import org.opendaylight.controller.affinity.AffinityLink;
-import org.opendaylight.controller.affinity.AffinityIdentifier;
-import org.opendaylight.controller.affinity.IAffinityManager;
-import org.opendaylight.controller.affinity.IAffinityManagerAware;
+import org.opendaylight.affinity.affinity.AffinityGroup;
+import org.opendaylight.affinity.affinity.AffinityLink;
+import org.opendaylight.affinity.affinity.AffinityIdentifier;
+import org.opendaylight.affinity.affinity.IAffinityManager;
+import org.opendaylight.affinity.affinity.IAffinityManagerAware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/affinity/implementation/src/test/java/org/opendaylight/controller/affinity/internal/AffinityManagerImplTest.java b/affinity/implementation/src/test/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImplTest.java
similarity index 93%
rename from affinity/implementation/src/test/java/org/opendaylight/controller/affinity/internal/AffinityManagerImplTest.java
rename to affinity/implementation/src/test/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImplTest.java
index 5c2d4c2f2d34613fedd9a5a178096a1299397873..0edaec371445a34cda4185680e50568399bc6058 100644 (file)
--- a/affinity/implementation/src/test/java/org/opendaylight/controller/affinity/internal/AffinityManagerImplTest.java
+++ b/affinity/implementation/src/test/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImplTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity.internal;
+package org.opendaylight.affinity.affinity.internal;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -22,9 +22,9 @@ import org.opendaylight.controller.sal.core.Property;
 import org.opendaylight.controller.sal.core.State;
 import org.opendaylight.controller.sal.core.UpdateType;
 import org.opendaylight.controller.sal.utils.Status;
-import org.opendaylight.controller.affinity.AffinityIdentifier;
-import org.opendaylight.controller.affinity.AffinityGroup;
-import org.opendaylight.controller.affinity.AffinityLink;
+import org.opendaylight.affinity.affinity.AffinityIdentifier;
+import org.opendaylight.affinity.affinity.AffinityGroup;
+import org.opendaylight.affinity.affinity.AffinityLink;
 import org.opendaylight.controller.sal.core.Host;
 
 public class AffinityManagerImplTest {

diff --git a/affinity/northbound/pom.xml b/affinity/northbound/pom.xml
index 03f9bcbf34c07a05786027ebc45eb4b0a97b7678..85fbbc24179ce1e4b3862acaf55a14939589f3ce 100644 (file)
--- a/affinity/northbound/pom.xml
+++ b/affinity/northbound/pom.xml
@@ -2,64 +2,17 @@
 <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.controller</groupId>
-    <artifactId>affinity</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent> -->
+  <parent>
+    <groupId>org.opendaylight.affinity</groupId>
+    <artifactId>affinityParent</artifactId>
+    <version>0.4.1-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
 
-  <groupId>org.opendaylight.controller.affinity</groupId> 
-  <artifactId>northbound</artifactId>
+  <groupId>org.opendaylight.affinity</groupId> 
+  <artifactId>affinity.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-      <properties>
-       <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
-       <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
-       <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
-       <siteplugin>3.2</siteplugin>
-       <projectinfo>2.6</projectinfo>
-       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       <compiler.version>2.3.2</compiler.version>
-       <surefire.version>2.15</surefire.version>
-       <failsafe.version>2.15</failsafe.version>
-       <exam.version>3.0.0</exam.version>
-       <url.version>1.5.0</url.version>
-       <enunciate.version>1.26.2</enunciate.version>
-       <sonar.branch>${user.name}-private-view</sonar.branch>
-       <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
-       <logback.version>1.0.9</logback.version>
-       <slf4j.version>1.7.2</slf4j.version>
-       <jackson.version>1.9.8</jackson.version>
-       <spring.version>3.1.3.RELEASE</spring.version>
-       <spring-security.version>3.1.3.RELEASE</spring-security.version>
-       <jersey.version>1.17</jersey.version>
-       <virgo.version>3.6.0.RELEASE</virgo.version>
-       <geminiweb.version>2.2.0.RELEASE</geminiweb.version>
-       <checkstyle.version>2.10</checkstyle.version>
-       <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
-       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-      </properties>
-
-    <repositories>
-    <!-- OpenDayLight Snapshot artifact -->
-    <repository>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </repository>
-    </repositories>
-  <distributionManagement>
-    <!-- OpenDayLight Snapshot artifact -->
-    <snapshotRepository>
-      <id>opendaylight-snapshot</id>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </snapshotRepository>
-    <!-- Site deployment -->
-    <site>
-      <id>website</id>
-      <url>${sitedeploy}</url>
-    </site>
-  </distributionManagement>
 
   <build>
     <plugins>
@@ -78,7 +31,6 @@
           </dependency>
         </dependencies>
       </plugin>
-
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -90,7 +42,7 @@
               org.opendaylight.controller.sal.core,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.containermanager,
-              org.opendaylight.controller.affinity,
+              org.opendaylight.affinity.affinity,
               org.opendaylight.controller.usermanager,
               org.apache.commons.lang3.tuple,
               org.apache.commons.logging,
@@ -107,9 +59,9 @@
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
            <Export-Package>
-              org.opendaylight.controller.affinity.northbound
+              org.opendaylight.affinity.affinity.northbound
            </Export-Package>
-            <Web-ContextPath>/controller/nb/v2/affinity</Web-ContextPath>
+            <Web-ContextPath>/affinity/nb/v2/affinity</Web-ContextPath>
           </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
@@ -122,44 +74,36 @@
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
       <version>1.17-SNAPSHOT</version>
     </dependency>
-
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>containermanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>commons.northbound</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
       <version>${spring.version}</version>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
-
   </dependencies>
-
 </project>

diff --git a/affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityGroupList.java b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityGroupList.java
similarity index 90%
rename from affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityGroupList.java
rename to affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityGroupList.java
index 8cd3946702f114d3190b9cb06b3f03a60d98d945..b2d9b98217d06e298ac0a8977222f5aa0944c6a8 100644 (file)
--- a/affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityGroupList.java
+++ b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityGroupList.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity.northbound;
+package org.opendaylight.affinity.affinity.northbound;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.opendaylight.controller.affinity.AffinityGroup;
+import org.opendaylight.affinity.affinity.AffinityGroup;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityLinkList.java b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityLinkList.java
similarity index 90%
rename from affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityLinkList.java
rename to affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityLinkList.java
index 133e312391f0a0f029d82f8a7059786be17167af..487235c6b792b110b6a5e141b5d41a69d94cacc7 100644 (file)
--- a/affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityLinkList.java
+++ b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityLinkList.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity.northbound;
+package org.opendaylight.affinity.affinity.northbound;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.opendaylight.controller.affinity.AffinityLink;
+import org.opendaylight.affinity.affinity.AffinityLink;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityNorthbound.java b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthbound.java
similarity index 96%
rename from affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityNorthbound.java
rename to affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthbound.java
index 8552e070d7cee9654cc9e9de7424843549014590..d065fae6f4ec7d3754c36b43f448b70ca66779d5 100644 (file)
--- a/affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityNorthbound.java
+++ b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthbound.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity.northbound;
+package org.opendaylight.affinity.affinity.northbound;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -42,9 +42,9 @@ import org.opendaylight.controller.sal.authorization.Privilege;
 import org.opendaylight.controller.sal.utils.GlobalConstants;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.controller.sal.utils.Status;
-import org.opendaylight.controller.affinity.IAffinityManager;
-import org.opendaylight.controller.affinity.AffinityLink;
-import org.opendaylight.controller.affinity.AffinityGroup;
+import org.opendaylight.affinity.affinity.IAffinityManager;
+import org.opendaylight.affinity.affinity.AffinityLink;
+import org.opendaylight.affinity.affinity.AffinityGroup;
 
 /**
  * The class provides Northbound REST APIs to access affinity configuration.

diff --git a/affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityNorthboundRSApplication.java b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthboundRSApplication.java
similarity index 93%
rename from affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityNorthboundRSApplication.java
rename to affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthboundRSApplication.java
index af0ccd4f7c746b594bddc062c587098204004354..d7f574350c4e1046f92867fdd71ee426981d9a60 100644 (file)
--- a/affinity/northbound/src/main/java/org/opendaylight/controller/affinity/northbound/AffinityNorthboundRSApplication.java
+++ b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthboundRSApplication.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2013 Plexxi, Inc. and others.  All rights reserved.
  *
@@ -7,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.affinity.northbound;
+package org.opendaylight.affinity.affinity.northbound;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/analytics/api/pom.xml b/analytics/api/pom.xml
index 5887b74fb1592192c9cae5f43d27f75d299d8466..ae6976f53c45e34bec1570bf3ef82ba7fd3e3c64 100644 (file)
--- a/analytics/api/pom.xml
+++ b/analytics/api/pom.xml
@@ -2,15 +2,26 @@
 <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.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../../commons/opendaylight</relativePath>
+    <groupId>org.opendaylight.affinity</groupId>
+    <artifactId>affinityParent</artifactId>
+    <version>0.4.1-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
+
+  <groupId>org.opendaylight.affinity</groupId>
   <artifactId>analytics</artifactId>
   <version>0.4.0-SNAPSHOT</version>
+
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
+
   <packaging>bundle</packaging>
+
   <build>
     <plugins>
       <plugin>
@@ -24,7 +35,7 @@
               org.opendaylight.controller.sal.core,
             </Import-Package>
             <Export-Package>
-              org.opendaylight.controller.analytics
+              org.opendaylight.affinity.analytics
             </Export-Package>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>

diff --git a/analytics/api/src/main/java/org/opendaylight/controller/analytics/IAnalyticsManager.java b/analytics/api/src/main/java/org/opendaylight/affinity/analytics/IAnalyticsManager.java
similarity index 91%
rename from analytics/api/src/main/java/org/opendaylight/controller/analytics/IAnalyticsManager.java
rename to analytics/api/src/main/java/org/opendaylight/affinity/analytics/IAnalyticsManager.java
index 8c44585103ea90a8233b230ac671e48dccfb7736..99b2753369abb3131b436b6842cb5fb3bd977802 100644 (file)
--- a/analytics/api/src/main/java/org/opendaylight/controller/analytics/IAnalyticsManager.java
+++ b/analytics/api/src/main/java/org/opendaylight/affinity/analytics/IAnalyticsManager.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.analytics;
+package org.opendaylight.affinity.analytics;
 
 import org.opendaylight.controller.sal.core.Host;
 

diff --git a/analytics/implementation/pom.xml b/analytics/implementation/pom.xml
index a8c0d5dcc60065f1246fbc639f7283deffb4c5a0..271b66b808d3da5afddb2d7e0be751fdaa83739f 100644 (file)
--- a/analytics/implementation/pom.xml
+++ b/analytics/implementation/pom.xml
@@ -2,18 +2,29 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../commons/opendaylight</relativePath>
+    <groupId>org.opendaylight.affinity</groupId>
+    <artifactId>affinityParent</artifactId>
+    <version>0.4.1-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
+  <groupId>org.opendaylight.affinity</groupId>
   <artifactId>analytics.implementation</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.5.3.201107060350</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -23,8 +34,8 @@
         <configuration>
           <instructions>
             <Import-Package>
-              org.opendaylight.controller.affinity,
-              org.opendaylight.controller.analytics,
+              org.opendaylight.affinity.affinity,
+              org.opendaylight.affinity.analytics,
               org.opendaylight.controller.clustering.services,
               org.opendaylight.controller.hosttracker,
               org.opendaylight.controller.hosttracker.hostAware,
@@ -39,22 +50,50 @@
               org.slf4j
             </Import-Package>
             <Bundle-Activator>
-              org.opendaylight.controller.analytics.internal.Activator
+              org.opendaylight.affinity.analytics.internal.Activator
             </Bundle-Activator>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <includes>org.opendaylight.controller.*</includes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>pre-test</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>post-test</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>

diff --git a/analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/Activator.java b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/Activator.java
similarity index 95%
rename from analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/Activator.java
rename to analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/Activator.java
index cf7de7fb90a961d2cd8ac129d57a83fbfa198406..04a5f1960d98c167d8f01dcccd38e08b64cf90ac 100644 (file)
--- a/analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/Activator.java
+++ b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/Activator.java
@@ -6,15 +6,15 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.analytics.internal;
+package org.opendaylight.affinity.analytics.internal;
 
 import org.apache.felix.dm.Component;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.opendaylight.controller.affinity.IAffinityManager;
-import org.opendaylight.controller.analytics.IAnalyticsManager;
+import org.opendaylight.affinity.affinity.IAffinityManager;
+import org.opendaylight.affinity.analytics.IAnalyticsManager;
 import org.opendaylight.controller.clustering.services.IClusterContainerServices;
 import org.opendaylight.controller.hosttracker.IfIptoHost;
 import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;

diff --git a/analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/AnalyticsManager.java b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/AnalyticsManager.java
similarity index 97%
rename from analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/AnalyticsManager.java
rename to analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/AnalyticsManager.java
index 8795289bce4f1645973c403a84d1b9b27385177c..f5d0d6881d815ff73d345962d9e39a79e9aee3b1 100644 (file)
--- a/analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/AnalyticsManager.java
+++ b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/AnalyticsManager.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.analytics.internal;
+package org.opendaylight.affinity.analytics.internal;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -20,9 +20,9 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.opendaylight.controller.affinity.AffinityGroup;
-import org.opendaylight.controller.affinity.IAffinityManager;
-import org.opendaylight.controller.analytics.IAnalyticsManager;
+import org.opendaylight.affinity.affinity.AffinityGroup;
+import org.opendaylight.affinity.affinity.IAffinityManager;
+import org.opendaylight.affinity.analytics.IAnalyticsManager;
 import org.opendaylight.controller.hosttracker.IfIptoHost;
 import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector;
 import org.opendaylight.controller.sal.core.Host;
@@ -273,4 +273,4 @@ public class AnalyticsManager implements IReadServiceListener, IAnalyticsManager
     public void descriptionStatisticsUpdated(Node node, NodeDescription nodeDescription) {
         // Not interested in this update
     }
-}
\ No newline at end of file
+}

diff --git a/analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/HostStats.java b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/HostStats.java
similarity index 95%
rename from analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/HostStats.java
rename to analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/HostStats.java
index 2965ecc55951257406a4104e260c8fb7c57156c5..479045552872636a0c4057d0c4a3d7bd5eb41720 100644 (file)
--- a/analytics/implementation/src/main/java/org/opendaylight/controller/analytics/internal/HostStats.java
+++ b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/HostStats.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.analytics.internal;
+package org.opendaylight.affinity.analytics.internal;
 
 import org.opendaylight.controller.sal.reader.FlowOnNode;
 
@@ -44,4 +44,4 @@ public class HostStats {
     public double getBitRate() {
         return (this.byteCount * 8)/(this.duration);
     }
-}
\ No newline at end of file
+}

diff --git a/analytics/implementation/src/test/java/org/opendaylight/controller/analytics/internal/AnalyticsManagerTest.java b/analytics/implementation/src/test/java/org/opendaylight/affinity/analytics/internal/AnalyticsManagerTest.java
similarity index 96%
rename from analytics/implementation/src/test/java/org/opendaylight/controller/analytics/internal/AnalyticsManagerTest.java
rename to analytics/implementation/src/test/java/org/opendaylight/affinity/analytics/internal/AnalyticsManagerTest.java
index f1c5afe8ce9d3c989d09b8fbc2f76a4ca8c71a40..182bdf47963993c285978643d6c7b36b33c400bd 100644 (file)
--- a/analytics/implementation/src/test/java/org/opendaylight/controller/analytics/internal/AnalyticsManagerTest.java
+++ b/analytics/implementation/src/test/java/org/opendaylight/affinity/analytics/internal/AnalyticsManagerTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
 \r
-package org.opendaylight.controller.analytics.internal;\r
+package org.opendaylight.affinity.analytics.internal;\r
 \r
 import java.net.InetAddress;\r
 import java.net.UnknownHostException;\r

diff --git a/analytics/northbound/pom.xml b/analytics/northbound/pom.xml
index 22f1371c9115261360c1fc8788ad894462d7df2f..80897810bef7fe6252ee59b29a63c67da9eb6eb6 100644 (file)
--- a/analytics/northbound/pom.xml
+++ b/analytics/northbound/pom.xml
@@ -1,16 +1,19 @@
 <?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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../../commons/opendaylight</relativePath>
+    <groupId>org.opendaylight.affinity</groupId>
+    <artifactId>affinityParent</artifactId>
+    <version>0.4.1-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
+  <groupId>org.opendaylight.affinity</groupId>
   <artifactId>analytics.northbound</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
+
   <build>
     <plugins>
       <plugin>
@@ -39,7 +42,7 @@
                 javax.ws.rs,
                 javax.ws.rs.core,
                 javax.xml.bind.annotation,
-                org.opendaylight.controller.analytics,
+                org.opendaylight.affinity.analytics,
                 org.opendaylight.controller.containermanager,
                 org.opendaylight.controller.hosttracker,
                 org.opendaylight.controller.hosttracker.hostAware,
@@ -54,7 +57,7 @@
               </Import-Package>
             <Export-Package>
             </Export-Package>
-            <Web-ContextPath>/controller/nb/v2/analytics</Web-ContextPath>
+            <Web-ContextPath>/affinity/nb/v2/analytics</Web-ContextPath>
           </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
@@ -63,7 +66,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>

diff --git a/analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/AnalyticsNorthbound.java b/analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/AnalyticsNorthbound.java
similarity index 98%
rename from analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/AnalyticsNorthbound.java
rename to analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/AnalyticsNorthbound.java
index 23758115a417559d0500134602cea667389d84f3..519552d95e69233938f83acfe1070d476d847436 100644 (file)
--- a/analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/AnalyticsNorthbound.java
+++ b/analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/AnalyticsNorthbound.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.analytics.northbound;
+package org.opendaylight.affinity.analytics.northbound;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -25,7 +25,7 @@ import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.codehaus.enunciate.jaxrs.TypeHint;
 
-import org.opendaylight.controller.analytics.IAnalyticsManager;
+import org.opendaylight.affinity.analytics.IAnalyticsManager;
 import org.opendaylight.controller.containermanager.IContainerManager;
 import org.opendaylight.controller.hosttracker.IfIptoHost;
 import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector;
@@ -184,4 +184,4 @@ public class AnalyticsNorthbound {
 
         return host;
     }
-}
\ No newline at end of file
+}

diff --git a/analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/AnalyticsNorthboundRSApplication.java b/analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/AnalyticsNorthboundRSApplication.java
similarity index 93%
rename from analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/AnalyticsNorthboundRSApplication.java
rename to analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/AnalyticsNorthboundRSApplication.java
index 5a60064b93e599c92630f87fd99e8da9fa800aaa..4e26fdab1c8359f7f42cd891e9bea007fabf837b 100644 (file)
--- a/analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/AnalyticsNorthboundRSApplication.java
+++ b/analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/AnalyticsNorthboundRSApplication.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.analytics.northbound;
+package org.opendaylight.affinity.analytics.northbound;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/HostStatistics.java b/analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/HostStatistics.java
similarity index 96%
rename from analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/HostStatistics.java
rename to analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/HostStatistics.java
index 905fd59fb4ac617fbb4bb63361b8a408cb4c3d35..ab5636506a9331b403d71d6813c8b200f8c69d38 100644 (file)
--- a/analytics/northbound/src/main/java/org/opendaylight/controller/analytics/northbound/HostStatistics.java
+++ b/analytics/northbound/src/main/java/org/opendaylight/affinity/analytics/northbound/HostStatistics.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.analytics.northbound;
+package org.opendaylight.affinity.analytics.northbound;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/analytics/northbound/test/java/org/opendaylight/controller/analytics/northbound/AnalyticsNorthboundTest.java b/analytics/northbound/test/java/org/opendaylight/affinity/analytics/northbound/AnalyticsNorthboundTest.java
similarity index 100%
rename from analytics/northbound/test/java/org/opendaylight/controller/analytics/northbound/AnalyticsNorthboundTest.java
rename to analytics/northbound/test/java/org/opendaylight/affinity/analytics/northbound/AnalyticsNorthboundTest.java

diff --git a/pom.xml b/pom.xml
index 05e833c8b05dfb080c8f970111b28be361e189d1..612ef1f30bed85454eda7befcf12ebc8f42f37db 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,50 +1,60 @@
 <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">\r
   <modelVersion>4.0.0</modelVersion>\r
-    <groupId>org.opendaylight.controller</groupId>\r
-    <artifactId>affinity</artifactId>\r
-    <version>0.4.1-SNAPSHOT</version>\r
-    <packaging>pom</packaging>\r
+\r
+  <groupId>org.opendaylight.affinity</groupId>\r
+  <artifactId>affinityParent</artifactId>\r
+  <version>0.4.1-SNAPSHOT</version>\r
+  <packaging>pom</packaging>\r
 \r
   <scm>\r
     <connection>scm:git:http://git.opendaylight.org/gerrit/p/affinity.git</connection>\r
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/affinity.git</developerConnection>\r
   </scm>\r
-      <properties>\r
-       <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>\r
-       <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>\r
-       <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>\r
-       <siteplugin>3.2</siteplugin>\r
-       <projectinfo>2.6</projectinfo>\r
-       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-       <compiler.version>2.3.2</compiler.version>\r
-       <surefire.version>2.15</surefire.version>\r
-       <failsafe.version>2.15</failsafe.version>\r
-       <exam.version>3.0.0</exam.version>\r
-       <url.version>1.5.0</url.version>\r
-       <enunciate.version>1.26.2</enunciate.version>\r
-       <sonar.branch>${user.name}-private-view</sonar.branch>\r
-       <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>\r
-       <logback.version>1.0.9</logback.version>\r
-       <slf4j.version>1.7.2</slf4j.version>\r
-       <jackson.version>1.9.8</jackson.version>\r
-       <spring.version>3.1.3.RELEASE</spring.version>\r
-       <spring-security.version>3.1.3.RELEASE</spring-security.version>\r
-       <jersey.version>1.17</jersey.version>\r
-       <virgo.version>3.6.0.RELEASE</virgo.version>\r
-       <geminiweb.version>2.2.0.RELEASE</geminiweb.version>\r
-       <checkstyle.version>2.10</checkstyle.version>\r
-       <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>\r
-       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
-      </properties>\r
+\r
+  <properties>\r
+    <checkstyle.version>2.10</checkstyle.version>\r
+    <commons.lang.version>3.1</commons.lang.version>\r
+    <compiler.version>2.3.2</compiler.version>\r
+    <enunciate.version>1.26.2</enunciate.version>\r
+    <exam.version>3.0.0</exam.version>\r
+    <failsafe.version>2.15</failsafe.version>\r
+    <geminiweb.version>2.2.0.RELEASE</geminiweb.version>\r
+    <jackson.version>1.9.8</jackson.version>\r
+    <jersey.version>1.17</jersey.version>\r
+    <junit.version>4.10</junit.version>\r
+    <logback.version>1.0.9</logback.version>\r
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+    <projectinfo>2.6</projectinfo>\r
+    <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>\r
+    <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>\r
+    <siteplugin>3.2</siteplugin>\r
+    <slf4j.version>1.7.2</slf4j.version>\r
+    <!-- Sonar properties using jacoco to retrieve integration test results -->\r
+    <sonar.branch>${user.name}-private-view</sonar.branch>\r
+    <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>\r
+    <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>\r
+    <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>\r
+    <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+    <sonar.language>java</sonar.language>\r
+    <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>\r
+    <spring.version>3.1.3.RELEASE</spring.version>\r
+    <spring-security.version>3.1.3.RELEASE</spring-security.version>\r
+    <surefire.version>2.15</surefire.version>\r
+    <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>\r
+    <url.version>1.5.0</url.version>\r
+    <virgo.version>3.6.0.RELEASE</virgo.version>\r
+  </properties>\r
 \r
     <modules>\r
-       <module>affinity/api</module>\r
+      <module>affinity/api</module>\r
       <module>affinity/yang</module>\r
-       <module>affinity/implementation</module>\r
-       <module>affinity/northbound</module>\r
-       <module>analytics/api</module>\r
-        <module>analytics/implementation</module>\r
-        <module>analytics/northbound</module>\r
+      <module>affinity/implementation</module>\r
+      <module>affinity/northbound</module>\r
+      <module>analytics/api</module>\r
+      <module>analytics/implementation</module>\r
+      <module>analytics/northbound</module>\r
     </modules>\r
 \r
     <repositories>\r
@@ -54,18 +64,24 @@
        <name>svnkit-snapshots</name>\r
        <url>${nexusproxy}/repositories/svnkit-snapshots/</url>\r
       </repository>\r
-    <!-- OpenDayLight Released artifact -->\r
-    <repository>\r
-      <id>opendaylight-release</id>\r
-      <name>opendaylight-release</name>\r
-      <url>${nexusproxy}/repositories/opendaylight.release/</url>\r
-    </repository>\r
-    <!-- OpenDayLight Snapshot artifact -->\r
-    <repository>\r
-      <id>opendaylight-snapshot</id>\r
-      <name>opendaylight-snapshot</name>\r
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
-    </repository>\r
+      <!-- OpenDayLight Released artifact -->\r
+      <repository>\r
+        <id>opendaylight-release</id>\r
+        <name>opendaylight-release</name>\r
+        <url>${nexusproxy}/repositories/opendaylight.release/</url>\r
+      </repository>\r
+      <!-- OpenDayLight Snapshot artifact -->\r
+      <repository>\r
+        <id>opendaylight-snapshot</id>\r
+        <name>opendaylight-snapshot</name>\r
+        <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>\r
+      </repository>\r
+      <!-- PAX Management -->\r
+      <repository>\r
+        <id>ops4j-releases</id>\r
+        <name>ops4j-releases</name>\r
+        <url>${nexusproxy}/repositories/ops4j-releases/</url>\r
+      </repository>\r
     </repositories>\r
 \r
   <pluginRepositories>\r
@@ -102,19 +118,18 @@
   </distributionManagement>\r
 \r
     <dependencies>\r
-\r
-        <dependency>\r
-            <groupId>junit</groupId>\r
-            <artifactId>junit</artifactId>\r
-            <version>4.10</version>\r
-            <scope>test</scope>\r
-            <optional>true</optional>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-simple</artifactId>\r
-            <version>1.7.2</version>\r
-        </dependency>\r
+      <dependency>\r
+        <groupId>junit</groupId>\r
+        <artifactId>junit</artifactId>\r
+        <version>4.10</version>\r
+        <scope>test</scope>\r
+        <optional>true</optional>\r
+      </dependency>\r
+      <dependency>\r
+        <groupId>org.slf4j</groupId>\r
+        <artifactId>slf4j-simple</artifactId>\r
+        <version>1.7.2</version>\r
+      </dependency>\r
     </dependencies>\r
 \r
   <build>\r