Merge commit 'refs/changes/20/18320/1' of ssh://git.opendaylight.org:29418/alto

Taken care of the checkstyle errors as well.

Change-Id: I3c744aaa8ee3cbb3987242830ff03a242af3ac0a
Signed-off-by: Emiapwil (Gao Kai) <gaok12@mails.tsinghua.edu.cn>

diff --git a/alto-commons/pom.xml b/alto-commons/pom.xml
index 1621940e6ed0442cfaf47287f7ee4fbc1ab76e34..d600db4f5c85b79dd4d74db08d052d71adfdc771 100644 (file)
--- a/alto-commons/pom.xml
+++ b/alto-commons/pom.xml
@@ -1,14 +1,11 @@
 <?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/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.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <version>0.1.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.opendaylight.alto</groupId>
@@ -17,37 +14,7 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-
-        <configuration>
-          <failsOnError>true</failsOnError>
-          <configLocation>controller/checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <sourceDirectory>${project.basedir}</sourceDirectory>
-          <excludes>**\/target\/,**\/bin\/,**\/third-party,**\/yang-gen-sal</excludes>
-        </configuration>
-
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${controller.checkstyle.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
-      <plugin>
+      <plugin> <!-- OSGi plugin -->
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
@@ -76,21 +43,17 @@
       <artifactId>alto-model</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      </dependency>
-
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      </dependency>
-
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      </dependency>
+    </dependency>
   </dependencies>
 </project>
-

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/Model2RFCConvertor.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/Model2RFCConvertor.java
index ecf7d66b054c87a1000bb368cd0e56a8c5e2eb41..dc4e704317fc122c39f7afe77ae5812dde638652 100644 (file)
--- a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/Model2RFCConvertor.java
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/Model2RFCConvertor.java
@@ -1,30 +1,4 @@
 package org.opendaylight.alto.commons.types.convertor;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.Map;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.MapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.MapKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMapKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.EndpointAddressType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.PidName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.TagString;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroupKey;
-
-import org.opendaylight.alto.commons.types.rfc7285.RFC7285Type;
-import org.opendaylight.alto.commons.types.model150404.ModelType;
-
 public class Model2RFCConvertor {
-
-    public static final String IPV4 = "ipv4";
-    public static final String IPV6 = "ipv6";
-
 }

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/RFC2ModelConvertor.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/RFC2ModelConvertor.java
index b4f17db75fdb34e2027dc15cc72bafa5c72d013e..82b98c88264a407bf4437fe1fb6d50604f113250 100644 (file)
--- a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/RFC2ModelConvertor.java
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/convertor/RFC2ModelConvertor.java
@@ -10,14 +10,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.MapBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.MapKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMapKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.EndpointAddressType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.PidName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ResourceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.TagString;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroupKey;
 
 import org.opendaylight.alto.commons.types.rfc7285.RFC7285Type;
 import org.opendaylight.alto.commons.types.model150404.ModelType;
@@ -65,7 +63,7 @@ public class RFC2ModelConvertor {
             buildAddressGroup(EndpointAddressType.Enumeration.Ipv6, str2IpPrefix(addressGroup.ipv6)),
         };
 
-        return Arrays.asList(result); 
+        return Arrays.asList(result);
     }
 
     private EndpointAddressGroup buildAddressGroup(EndpointAddressType.Enumeration type, List<IpPrefix> prefixes) {

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/JSONMapper.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/JSONMapper.java
index 5ef69a090d210c3a7898c87f8453fbe1717a7047..57aa0a6d89368ae64f3c342fff08dcb1e4919e74 100644 (file)
--- a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/JSONMapper.java
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/JSONMapper.java
@@ -1,33 +1,3 @@
 package org.opendaylight.alto.commons.types.model150404;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opendaylight.alto.commons.types.rfc7285.RFC7285Type;
-import org.opendaylight.alto.commons.types.convertor.RFC2ModelConvertor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.Map;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.MapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.MapKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMapKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.EndpointAddressType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.PidName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.TagString;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroupKey;
-
 public class JSONMapper {
-
-    private RFC7285Type.JSONMapper rfc7285Mapper = new RFC7285Type.JSONMapper();
-    private RFC2ModelConvertor convertor = new RFC2ModelConvertor();
-
-    public NetworkMap asNetworkMap(String rfc7285json) throws Exception {
-        return (NetworkMap)convertor.convert((RFC7285Type.NetworkMap)rfc7285Mapper.asNetworkMap(rfc7285json));
-    }
-
 }

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/ModelType.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/ModelType.java
index ebab7e878db7e3cfbff404bf3acfddddf000e65d..ddf5fa99ce32611021be8961280d646f365e7980 100644 (file)
--- a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/ModelType.java
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/model150404/ModelType.java
@@ -3,7 +3,7 @@ package org.opendaylight.alto.commons.types.model150404;
 public class ModelType {
 
     public static interface NetworkMap
-                       extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMap {}
+            extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMap {}
 
     public static interface NetworkMapData
             extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.Map {

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/Endpoint.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/Endpoint.java
index e31e49ce6e2ae8bba3d76883b5d3a4241ba23c8c..ab67a97780926e2af4cf0864901d9505d8fac3de 100644 (file)
--- a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/Endpoint.java
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/Endpoint.java
@@ -9,7 +9,7 @@ import java.util.Map;
 import java.util.LinkedHashMap;
 
 public class Endpoint {
-  
+
     public static class AddressGroup extends Extensible {
 
         @JsonIgnore

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/FormatValidator.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/FormatValidator.java
index b3346f73c2e90f251479229af6c805b8bb1a29fd..2cefed380307bb2ef8d6a067f449e217b804f9a3 100644 (file)
--- a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/FormatValidator.java
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/FormatValidator.java
@@ -14,7 +14,7 @@ public class FormatValidator {
     private static final Pattern VALID_ID_PATTERN_WITH_DOT
                             = Pattern.compile("^["+VALID_CHARSET_WITH_DOT+"]{1,64}$");
     private static final String VALID_TAG_CHARSET = "!-~";
-    private static final Pattern VALID_TAG_PATTERN 
+    private static final Pattern VALID_TAG_PATTERN
                             = Pattern.compile("^["+VALID_TAG_CHARSET+"]{1,64}$}");
 
     public static boolean validId(String id) {

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/JSONMapper.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/JSONMapper.java
index fd0c410c1b1677e9052647cca9b38d5fbeaecb78..51a6885e657591cc73bf7914d72e01b0f3af2aa8 100644 (file)
--- a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/JSONMapper.java
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/JSONMapper.java
@@ -59,7 +59,7 @@ public class JSONMapper {
     }
 
     public CostMap.Filter asCostMapFilter(String json) throws Exception {
-        return mapper.readValue(json, CostMap.Filter.class); 
+        return mapper.readValue(json, CostMap.Filter.class);
     }
 
     public VersionTag asVersionTag(String json) throws Exception {

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/RFC7285Type.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/RFC7285Type.java
index 21a555d50cb7e65f3b3fe89375252573440a17bc..7bf72f37ce8643dc83f398f1e10f757db8583e1d 100644 (file)
--- a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/RFC7285Type.java
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/rfc7285/RFC7285Type.java
@@ -9,19 +9,19 @@ public class RFC7285Type {
             extends org.opendaylight.alto.commons.types.rfc7285.CostMap {}
 
     public static class CostType
-                       extends org.opendaylight.alto.commons.types.rfc7285.CostType {}
+            extends org.opendaylight.alto.commons.types.rfc7285.CostType {}
 
     public static class Endpoint
-                       extends org.opendaylight.alto.commons.types.rfc7285.Endpoint {}
+            extends org.opendaylight.alto.commons.types.rfc7285.Endpoint {}
 
     public static class IRD
-                       extends org.opendaylight.alto.commons.types.rfc7285.IRD {}
+            extends org.opendaylight.alto.commons.types.rfc7285.IRD {}
 
     public static class MediaType
-                       extends org.opendaylight.alto.commons.types.rfc7285.MediaType {}
+            extends org.opendaylight.alto.commons.types.rfc7285.MediaType {}
 
     public static class JSONMapper
-                       extends org.opendaylight.alto.commons.types.rfc7285.JSONMapper {}
+            extends org.opendaylight.alto.commons.types.rfc7285.JSONMapper {}
 
     public static class VersionTag
             extends org.opendaylight.alto.commons.types.rfc7285.VersionTag {}

diff --git a/alto-config/pom.xml b/alto-config/pom.xml
index f6cb442830d4fbcdff80da07aaa7972940bd401d..8edbb8ab4798a046bf6187b3331a3dd5541208cd 100644 (file)
--- a/alto-config/pom.xml
+++ b/alto-config/pom.xml
@@ -1,21 +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/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.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>alto-config</artifactId>
   <packaging>jar</packaging>
+
   <build>
     <plugins>
-        <plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <executions>

diff --git a/alto-manager/pom.xml b/alto-manager/pom.xml
index 5276040bade1d4f4248f87c0ded94537b44af941..2414dcc6b7ae115290f52a687c78ed50cebccfce 100644 (file)
--- a/alto-manager/pom.xml
+++ b/alto-manager/pom.xml
@@ -1,21 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<?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.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
+  <groupId>org.opendaylight.alto</groupId>
+  <artifactId>alto-manager</artifactId>
+  <packaging>bundle</packaging>
+  <name>${project.artifactId}</name>
+
   <properties>
     <configfile>default.networkmap</configfile>
   </properties>
 
-  <artifactId>alto-manager</artifactId>
-  <packaging>bundle</packaging>
-  <name>${project.artifactId}</name>
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -25,30 +26,23 @@
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>2.2.11</version>
+      <version>${karaf.shell.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient-osgi</artifactId>
-      <version>${httpclient.version}</version>
-      <type>bundle</type>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore-osgi</artifactId>
-      <version>${httpclient.version}</version>
-      <type>bundle</type>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
   </dependencies>
 
@@ -57,15 +51,13 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle.plugin.version}</version>
         <configuration>
           <instructions>
             <Import-Package>
               org.apache.felix.service.command,
               org.apache.felix.gogo.commands,
               org.apache.karaf.shell.console,
-              org.apache.http.*,
-              *
+              org.apache.http.*
             </Import-Package>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
           </instructions>

diff --git a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManager.java b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManager.java
index 647a5492c3ecaf2e1718ab039d0628f2221c9fab..dd6cbb4da58362e8680d77223c7f71e016070acb 100644 (file)
--- a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManager.java
+++ b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManager.java
@@ -32,16 +32,16 @@ import com.fasterxml.jackson.core.JsonToken;
 
 @Command(scope = "alto", name = "load", description = "Alto Manager")
 public class AltoManager extends OsgiCommandSupport {
-  
+
   private static final Logger log = LoggerFactory.getLogger(AltoManager.class);
   private JsonFactory jsonF = new JsonFactory();
   private HttpClient httpClient;
-  
+
   public AltoManager () {
     httpClient = initiateHttpClient();
     log.info(this.getClass().getName() + " Initiated");
   }
-  
+
   private HttpClient initiateHttpClient() {
     CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
     credentialsProvider.setCredentials(AuthScope.ANY,
@@ -64,13 +64,13 @@ public class AltoManager extends OsgiCommandSupport {
     }
     return null;
   }
-  
+
   private void putResources() throws IOException {
     log.info("Loading Resources From " + path);
     String data = readFromFile(path);
     httpPut(AltoManagerConstants.HOST, data);
   }
-  
+
   private void putNetworkMap() throws IOException {
     log.info("Loading Network Map From " + this.path);
     String data = readFromFile(path);
@@ -83,7 +83,7 @@ public class AltoManager extends OsgiCommandSupport {
     log.info("Url: " + url);
     httpPut(url, data);
   }
-  
+
   private void httpPut(String url, String data) throws IOException {
     HttpPut httpput = new HttpPut(url);
     httpput.setHeader(HTTP.CONTENT_TYPE, AltoManagerConstants.JSON_CONTENT_TYPE);
@@ -96,7 +96,7 @@ public class AltoManager extends OsgiCommandSupport {
     return new String(Files.readAllBytes(Paths.get(path)),
         StandardCharsets.UTF_8);
   }
-  
+
   private void handleResponse(HttpResponse response) throws ParseException, IOException {
     HttpEntity entity = response.getEntity();
     if (entity != null) {
@@ -108,7 +108,7 @@ public class AltoManager extends OsgiCommandSupport {
       }
     }
   }
-  
+
   private String resourceIdFromNetworkMap(String jsonString) throws JsonParseException, IOException {
     JsonParser jParser = jsonF.createParser(jsonString);
     while (jParser.nextToken() != JsonToken.END_OBJECT) {
@@ -118,14 +118,14 @@ public class AltoManager extends OsgiCommandSupport {
         String resourceId = jParser.getText();
         return resourceId;
       }
-    }  
+    }
     return null;
   }
-  
+
   private void postResources(String path) throws IOException {
     log.info("Loading Resources From " + path);
     String content = readFromFile(path);
-     
+
     HttpPost httppost = new HttpPost(AltoManagerConstants.HOST);
     httppost.setHeader(HTTP.CONTENT_TYPE, AltoManagerConstants.JSON_CONTENT_TYPE);
     httppost.setEntity(new StringEntity(content));

diff --git a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManagerConstants.java b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManagerConstants.java
index 5cf01944a95268cb90def229f082519aec5d56e7..9c77eafcf125af8b934c2c8a92d8d132d8cc5983 100644 (file)
--- a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManagerConstants.java
+++ b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoManagerConstants.java
@@ -4,19 +4,19 @@ public class AltoManagerConstants {
   public static final String HOST = "http://127.0.0.1:8181/restconf/config/";
   public static final String MODULE = "alto-service";
   public static final String JSON_CONTENT_TYPE = "application/yang.data+json";
-  
+
   public static final String RESOURCES_LABEL = MODULE + ":resources";
   public static final String NETWORK_MAPS_LABEL = MODULE + ":network-maps";
   public static final String NETWORK_MAP_LABEL = MODULE + ":network-map";
-  
+
   public static final String RESOURCE_ID_LABEL = MODULE + ":resource-id";
 
   public static final String RESOURCES_HOST = HOST + RESOURCES_LABEL + "/";
   public static final String NETWORK_MAPS_HOST = RESOURCES_HOST + NETWORK_MAPS_LABEL + "/";
   public static final String NETWORK_MAP_HOST = NETWORK_MAPS_HOST + NETWORK_MAP_LABEL + "/";
-  
+
   public static final String DEFAULT_RESOURCES_PATH = "configuration/default.networkmap";
-  
+
   public static enum SERVICE_TYPE{
     RESOURCE, NETWORK, COST
   }

diff --git a/alto-manager/src/test/java/org/opendaylight/alto/AppTest.java b/alto-manager/src/test/java/org/opendaylight/alto/AppTest.java
index e11cb2ab0a57528b9fe5b80510f3b1f19138bfc0..b29498a97035acf14db3be00fc533f1e048d44c9 100644 (file)
--- a/alto-manager/src/test/java/org/opendaylight/alto/AppTest.java
+++ b/alto-manager/src/test/java/org/opendaylight/alto/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**

diff --git a/alto-model/pom.xml b/alto-model/pom.xml
index 097d2cad0d003f4eeb42ffac3171f52fbbf7a49d..fd9db9a8062fa7be4dfd59733e4fb21a79254a69 100644 (file)
--- a/alto-model/pom.xml
+++ b/alto-model/pom.xml
@@ -1,85 +1,21 @@
 <?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">
+<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.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>alto-model</artifactId>
   <packaging>bundle</packaging>
 
-  <properties>
-    <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
-  </properties>
-
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>target/generated-sources/sal</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <failsOnError>true</failsOnError>
-          <configLocation>controller/checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <sourceDirectory>${project.basedir}</sourceDirectory>
-          <includes>**\/*.yang</includes>
-          <excludes>**\/target\/,**\/bin\/,**\/third-party,**\/yang-gen-sal</excludes>
-        </configuration>
-
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${controller.checkstyle.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
+      <plugin> <!-- OSGi plugin -->
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
             <Export-Package>
@@ -93,19 +29,31 @@
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>yang-jmx-generator-plugin</artifactId>
+            <version>${config.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>maven-sal-api-gen-plugin</artifactId>
+            <version>${yangtools.version}</version>
+            <type>jar</type>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <goals>
               <goal>generate-sources</goal>
             </goals>
-
             <configuration>
               <codeGenerators>
                 <generator>
                   <codeGeneratorClass>
                     org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
                   </codeGeneratorClass>
-                  <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
+                  <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
                   <additionalConfiguration>
                     <namespaceToPackage1>
                       urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
@@ -116,57 +64,30 @@
                   <codeGeneratorClass>
                     org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                   </codeGeneratorClass>
-                  <outputBaseDir>${project.build.directory}/generated-sources/sal</outputBaseDir>
-                </generator>
-                <generator>
-                  <codeGeneratorClass>
-                    org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl
-                  </codeGeneratorClass>
-                  <outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
+                  <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                 </generator>
+                -->
               </codeGenerators>
               <inspectDependencies>true</inspectDependencies>
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>yang-jmx-generator-plugin</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>maven-sal-api-gen-plugin</artifactId>
-            <version>${yangtools.version}</version>
-            <type>jar</type>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
-    <dependency>
+    <dependency> <!-- yang generated -->
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.model.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-yang-types-20130715</artifactId>
-      <version>${ietf.yang.types.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-api</artifactId>
-      <version>${ovsdb.southbound.version}</version>
     </dependency>
   </dependencies>
 </project>
-

diff --git a/alto-northbound/pom.xml b/alto-northbound/pom.xml
index c5ad42b8c996872b773a0d314b2aad168e792423..78594f780adb08c7e99c5d4792308bcd94b58079 100644 (file)
--- a/alto-northbound/pom.xml
+++ b/alto-northbound/pom.xml
@@ -1,14 +1,14 @@
 <?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/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.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <version>0.1.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
+
+  <groupId>org.opendaylight.alto</groupId>
   <artifactId>alto-northbound</artifactId>
   <packaging>bundle</packaging>
 
@@ -61,36 +61,6 @@
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-
-        <configuration>
-          <failsOnError>true</failsOnError>
-          <configLocation>controller/checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <sourceDirectory>${project.basedir}</sourceDirectory>
-          <excludes>**\/target\/,**\/bin\/,**\/third-party,**\/yang-gen-sal</excludes>
-        </configuration>
-
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${controller.checkstyle.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
     </plugins>
   </build>
 
@@ -98,7 +68,7 @@
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-      </dependency>
+    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -109,28 +79,17 @@
     <dependency>
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-core-annotations</artifactId>
-      </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
-      <version>${corsfilter.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      </dependency>
+    </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      </dependency>
+    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -157,4 +116,3 @@
     </dependency>
   </dependencies>
 </project>
-

diff --git a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java
index 1af1236d46920860f1554cb6ba725fd15c4f04d3..4725b6b0726efc6a8d362e86c5c8ab761a77ad08 100644 (file)
--- a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java
+++ b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java
@@ -112,7 +112,7 @@ public class AltoNorthbound {
     @Produces({ MediaType.ALTO_NETWORKMAP, MediaType.ALTO_ERROR })
     public Response retrieveDefaultNetworkMap() throws Exception {
         checkAltoService();
-        
+
         NetworkMap map = altoService.getDefaultNetworkMap();
         if (map == null)
             return fail(Status.NOT_FOUND, null);
@@ -149,7 +149,7 @@ public class AltoNorthbound {
             return fail(Status.NOT_FOUND, vtag);
         return success(map, MediaType.ALTO_NETWORKMAP);
     }
-                                     
+
     @Path("/costmap/{id}")
     @GET
     @Produces({ MediaType.ALTO_COSTMAP, MediaType.ALTO_ERROR})
@@ -239,7 +239,7 @@ public class AltoNorthbound {
             return fail(Status.NOT_FOUND, id);
         return success(map, MediaType.ALTO_NETWORKMAP);
     }
- 
+
     @Path("/filtered/networkmap/{id}/{tag}")
     @POST
     @Consumes({ MediaType.ALTO_NETWORKMAP_FILTER})
@@ -261,7 +261,7 @@ public class AltoNorthbound {
         if (map == null)
             return fail(Status.NOT_FOUND, vtag);
         return success(map, MediaType.ALTO_NETWORKMAP);
-    }   
+    }
 
     @Path("/filtered/costmap/{id}")
     @POST

diff --git a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/exception/AltoBasicException.java b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/exception/AltoBasicException.java
index 4a99743994d802341f84dfb8c7c348932d354d62..05c42bd8a4bb0b3a7449f77a7d2193558c72582f 100644 (file)
--- a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/exception/AltoBasicException.java
+++ b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/exception/AltoBasicException.java
@@ -2,7 +2,6 @@ package org.opendaylight.alto.northbound.exception;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
 
 import org.opendaylight.alto.commons.types.rfc7285.MediaType;
 

diff --git a/alto-provider/pom.xml b/alto-provider/pom.xml
index d473a6e17816fe2c686f1da413a1bfe81d1b78cb..cc95f660e6ebabdc8778d35c62f47ff7c151a61d 100644 (file)
--- a/alto-provider/pom.xml
+++ b/alto-provider/pom.xml
@@ -1,15 +1,10 @@
 <?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/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.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -17,7 +12,6 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <sal-binding-api.version>1.2.0-SNAPSHOT</sal-binding-api.version>
     <configfile>default.networkmap</configfile>
   </properties>
 
@@ -36,19 +30,16 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-config</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-util</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <dependency>
@@ -58,37 +49,34 @@
 
     <!-- dependencies to use AbstractDataBrokerTest -->
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-broker-impl</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
-      <scope>test</scope>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
       <type>test-jar</type>
-      <version>1.2.0-SNAPSHOT</version>
+      <version>${mdsal.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-        <artifactId>junit</artifactId>
-        <groupId>junit</groupId>
-        <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-commons</artifactId>
-      <version>${project.version}</version>
+    <!-- used to mock up classes -->
+     <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+
+
+      <plugin> <!-- OSGi plugin -->
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
@@ -99,6 +87,7 @@
           </instructions>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
@@ -117,21 +106,26 @@
         </dependencies>
         <executions>
           <execution>
-            <id>config</id>
             <goals>
               <goal>generate-sources</goal>
             </goals>
             <configuration>
               <codeGenerators>
                 <generator>
-                  <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                  <codeGeneratorClass>
+                    org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+                  </codeGeneratorClass>
                   <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
                   <additionalConfiguration>
-                    <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
+                    <namespaceToPackage1>
+                      urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
+                    </namespaceToPackage1>
                   </additionalConfiguration>
                 </generator>
                 <generator>
-                  <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                  <codeGeneratorClass>
+                    org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                  </codeGeneratorClass>
                   <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                 </generator>
               </codeGenerators>
@@ -142,10 +136,4 @@
       </plugin>
     </plugins>
   </build>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
 </project>

diff --git a/alto-provider/src/main/java/org/opendaylight/alto/provider/AltoProvider.java b/alto-provider/src/main/java/org/opendaylight/alto/provider/AltoProvider.java
index bf303d0c991839089d070ee0efb7abdbf864efa6..afed2ec16070f146c43bf508ec85f11809469f8e 100644 (file)
--- a/alto-provider/src/main/java/org/opendaylight/alto/provider/AltoProvider.java
+++ b/alto-provider/src/main/java/org/opendaylight/alto/provider/AltoProvider.java
@@ -36,10 +36,10 @@ public class AltoProvider implements
 
     public static final InstanceIdentifier<Resources> ALTO_IID
                         = InstanceIdentifier.builder(Resources.class).build();
-  
+
     private DataBroker dataProvider;
     private final ExecutorService executor;
-  
+
     public AltoProvider() {
         this.executor = Executors.newFixedThreadPool(1);
     }

diff --git a/alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java b/alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java
index 30d3b20c165df66a1a51ee241d003d69c5860b10..f023a0bff0774ae886550a164e09233fcefaf5f4 100644 (file)
--- a/alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java
+++ b/alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
 
 public class AltoProviderModule extends AbstractAltoProviderModule {
     private static final Logger log = LoggerFactory.getLogger(AltoProviderModule.class);
-  
+
     public AltoProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
@@ -29,29 +29,29 @@ public class AltoProviderModule extends AbstractAltoProviderModule {
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-               final AltoProvider altoProvider = new AltoProvider();
+        final AltoProvider altoProvider = new AltoProvider();
+
+        DataBroker dataBrokerService = getDataBrokerDependency();
+        altoProvider.setDataProvider(dataBrokerService);
 
-               DataBroker dataBrokerService = getDataBrokerDependency();
-               altoProvider.setDataProvider(dataBrokerService);
-               
-               final BindingAwareBroker.RpcRegistration<AltoServiceService> rpcRegistration = getRpcRegistryDependency()
+        final BindingAwareBroker.RpcRegistration<AltoServiceService> rpcRegistration = getRpcRegistryDependency()
             .addRpcImplementation(AltoServiceService.class, altoProvider);
-               
-               final ListenerRegistration<DataChangeListener> altoDataChangeListenerRegistration =
-                   dataBrokerService.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION, AltoProvider.ALTO_IID, altoProvider, DataChangeScope.SUBTREE);
-               final AltoProviderRuntimeRegistration runtimeReg = getRootRuntimeBeanRegistratorWrapper().register(altoProvider);
-               
-               final class AutoCloseableAlto implements AutoCloseable {
-                       @Override
-                       public void close() throws Exception {
-                           rpcRegistration.close();
-                           altoDataChangeListenerRegistration.close();
-                           runtimeReg.close();
-                           altoProvider.close();
-                       }
-               }
-
-               return new AutoCloseableAlto();
+
+        final ListenerRegistration<DataChangeListener> altoDataChangeListenerRegistration =
+            dataBrokerService.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION, AltoProvider.ALTO_IID, altoProvider, DataChangeScope.SUBTREE);
+        final AltoProviderRuntimeRegistration runtimeReg = getRootRuntimeBeanRegistratorWrapper().register(altoProvider);
+
+        final class AutoCloseableAlto implements AutoCloseable {
+            @Override
+            public void close() throws Exception {
+                rpcRegistration.close();
+                altoDataChangeListenerRegistration.close();
+                runtimeReg.close();
+                altoProvider.close();
+            }
+        }
+
+        return new AutoCloseableAlto();
     }
 
 }

diff --git a/alto-services/api/pom.xml b/alto-services/api/pom.xml
index 5ef606916d8e5aac9844043d042af4845aa16f80..fabb7d36eda593cefa2987c74f6127237026a220 100644 (file)
--- a/alto-services/api/pom.xml
+++ b/alto-services/api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

diff --git a/alto-services/api/rfc7285/pom.xml b/alto-services/api/rfc7285/pom.xml
index 7c11201c94f73fef72fbe1177971139f52d5ecba..b64b2e4f97b29870ab595c8c48fc2ded80742ea9 100644 (file)
--- a/alto-services/api/rfc7285/pom.xml
+++ b/alto-services/api/rfc7285/pom.xml
@@ -1,14 +1,11 @@
 <?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/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.alto</groupId>
-    <artifactId>services.api</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <artifactId>alto-parent</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.opendaylight.alto</groupId>
@@ -17,39 +14,7 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.version}</version>
-
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-
-        <configuration>
-          <failsOnError>true</failsOnError>
-          <configLocation>controller/checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <sourceDirectory>${project.basedir}</sourceDirectory>
-          <excludes>**\/target\/,**\/bin\/,**\/third-party,**\/yang-gen-sal</excludes>
-        </configuration>
-
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${controller.checkstyle.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-        
-      <plugin>
+      <plugin> <!-- OSGi plugin -->
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
@@ -65,9 +30,7 @@
           </instructions>
         </configuration>
       </plugin>
- 
     </plugins>
-
   </build>
 
   <dependencies>
@@ -82,6 +45,15 @@
       <artifactId>alto-commons</artifactId>
       <version>${project.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
   </dependencies>
 </project>
-

diff --git a/alto-services/api/rfc7285/src/main/java/org/opendaylight/alto/services/api/rfc7285/CostMapService.java b/alto-services/api/rfc7285/src/main/java/org/opendaylight/alto/services/api/rfc7285/CostMapService.java
index fa3672cf18699bdae10172a226f9cd5a310b73b5..aa4d73947fd107e9045f78ad39433919a9288f58 100644 (file)
--- a/alto-services/api/rfc7285/src/main/java/org/opendaylight/alto/services/api/rfc7285/CostMapService.java
+++ b/alto-services/api/rfc7285/src/main/java/org/opendaylight/alto/services/api/rfc7285/CostMapService.java
@@ -25,5 +25,5 @@ public interface CostMapService {
     public Boolean validateCostMapFilter(String id, CostMap.Filter filter);
 
     public Boolean validateCostMapFilter(VersionTag vtag, CostMap.Filter filter);
- 
+
 }

diff --git a/alto-services/ext/fake/pom.xml b/alto-services/ext/fake/pom.xml
index 6d9dc096d3263de81e74eb2d240f71bb34037a39..e7875d5d0562aeaa7236e01d8f2fd1fecdf23c7c 100644 (file)
--- a/alto-services/ext/fake/pom.xml
+++ b/alto-services/ext/fake/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.alto</groupId>
     <artifactId>services.ext</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -16,7 +16,6 @@
 
   <build>
     <plugins>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -65,12 +64,10 @@
           </instructions>
         </configuration>
       </plugin>
- 
     </plugins>
   </build>
 
   <dependencies>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-model</artifactId>
@@ -88,7 +85,6 @@
       <artifactId>service-api-rfc7285</artifactId>
       <version>${project.version}</version>
     </dependency>
-
   </dependencies>
 </project>
 

diff --git a/alto-services/ext/fake/src/main/java/org/opendaylight/alto/services/ext/fake/FakeAltoService.java b/alto-services/ext/fake/src/main/java/org/opendaylight/alto/services/ext/fake/FakeAltoService.java
index bb791f016f36eff12a4cda63abcbf4ce15b59be9..f9a7031fe02b14ac4a1b6ebd928aea27afaf9d9a 100644 (file)
--- a/alto-services/ext/fake/src/main/java/org/opendaylight/alto/services/ext/fake/FakeAltoService.java
+++ b/alto-services/ext/fake/src/main/java/org/opendaylight/alto/services/ext/fake/FakeAltoService.java
@@ -13,7 +13,7 @@ public class FakeAltoService implements AltoService {
 
     private JSONMapper mapper = new JSONMapper();
 
-    private static final String NETWORKMAP_JSON = 
+    private static final String NETWORKMAP_JSON =
             "{"
         +       "\"meta\" : {"
         +           "\"vtag\": {"
@@ -43,7 +43,7 @@ public class FakeAltoService implements AltoService {
         +           "}"
         +       "}"
         +   "}";
-    
+
     private static final String DEFAULT_NETWORKMAP_ID = "default-networkmap";
     private static final String DEFAULT_NETWORKMAP_TAG = "3ee2cb7e8d63d9fab71b9b34cbf764436315542e";
     private NetworkMap networkMap = null;
@@ -68,7 +68,7 @@ public class FakeAltoService implements AltoService {
         +           "\"PID3\": { \"PID1\": 20, \"PID2\": 15 }"
         +       "}"
         +   "}";
-    
+
     private static final String DEFAULT_COSTMAP_ID = "default-costmap";
 
     private CostMap costMap = null;
@@ -82,7 +82,7 @@ public class FakeAltoService implements AltoService {
             costMap = null;
         }
     }
-    
+
     public CostMap getCostMap(String id) {
         if (!DEFAULT_COSTMAP_ID.equals(id))
             return null;

diff --git a/alto-services/ext/fs-map/pom.xml b/alto-services/ext/fs-map/pom.xml
index a2a371d34fbefb71450850f22a0a3c5b987a9c5a..8e1efa606f59ec8025b7dc3727891de631a91e33 100644 (file)
--- a/alto-services/ext/fs-map/pom.xml
+++ b/alto-services/ext/fs-map/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.alto</groupId>
     <artifactId>services.ext</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -20,31 +20,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-
-        <configuration>
-          <failsOnError>true</failsOnError>
-          <configLocation>controller/checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <sourceDirectory>${project.basedir}</sourceDirectory>
-          <excludes>**\/target\/,**\/bin\/,**\/third-party,**\/yang-gen-sal</excludes>
-        </configuration>
-
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${controller.checkstyle.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
 
       <plugin>
@@ -70,7 +45,6 @@
   </build>
 
   <dependencies>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-model</artifactId>
@@ -79,10 +53,9 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons</artifactId>
+      <artifactId>alto-commons</artifactId>
       <version>${project.version}</version>
     </dependency>
-
   </dependencies>
 </project>
 

diff --git a/alto-services/ext/pom.xml b/alto-services/ext/pom.xml
index 9471479f5e098c722aa355a23d7af52da62a54e5..63767eb00a2a68d423f760d29d31cc43c21431c8 100644 (file)
--- a/alto-services/ext/pom.xml
+++ b/alto-services/ext/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

diff --git a/alto-services/provider/pom.xml b/alto-services/provider/pom.xml
index 1f6adac610381b226b77be304b1f9ee0b32c9b28..f3883da5bb05977b8ab3458ee0f1c92d8add25fd 100644 (file)
--- a/alto-services/provider/pom.xml
+++ b/alto-services/provider/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 3a1b05b5012f4e16ce78ab4dd1286251526462d0..c15178093a92df072378f34236f47486cb1f66a8 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -6,27 +6,19 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <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.alto</groupId>
     <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <artifactId>alto-features</artifactId>
   <name>${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
 
   <properties>
     <features.file>features.xml</features.file>
-    <branding.version>${project.version}</branding.version>
-
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
   </properties>
 
   <dependencyManagement>
@@ -92,18 +84,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-config</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-config</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-northbound</artifactId>
@@ -115,17 +95,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>alto-manager</artifactId>
       <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient-osgi</artifactId>
-      <version>${httpclient.version}</version>
-      <type>bundle</type>
     </dependency>
+
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore-osgi</artifactId>
-      <version>${httpclient.version}</version>
-      <type>bundle</type>
     </dependency>
   </dependencies>
 
@@ -174,5 +152,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </plugin>
     </plugins>
   </build>
- 
+
 </project>

diff --git a/pom.xml b/pom.xml
index 2368f4e51424cb45ba31202c6bf7e988607c2cb0..4c3278477127da25296c94c25a97faf8cc246810 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,216 +1,147 @@
 <?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>
-
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>alto</name> <!-- Used by Sonar to set project name -->
-    <packaging>pom</packaging>
-
-    <properties>
-        <httpclient.version>4.4.1</httpclient.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-        <checkstyle.skip>true</checkstyle.skip>
-
-        <!-- Java Versions -->
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-
-        <!-- Build Plugin Versions -->
-        <maven.release.version>2.4.2</maven.release.version>
-        <maven.resources.version>2.6</maven.resources.version>
-        <maven.helper.version>1.8</maven.helper.version>
-        <maven.dependency.version>2.6</maven.dependency.version>
-        <maven.exec.version>1.3.2</maven.exec.version>
-
-        <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
-        <ietf.yang.types.version>2013.07.15.7-SNAPSHOT</ietf.yang.types.version>
-        <ietf.topology.version>2013.10.21.2-SNAPSHOT</ietf.topology.version>
-        <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
-        <config.version>0.3.0-SNAPSHOT</config.version>
-        <sal.version>0.7.1-SNAPSHOT</sal.version>
-        <war.version>3.0.1</war.version>
-        <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-        <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
-        <build.helper.version>1.8</build.helper.version>
-        <netconf.parent.version>0.3.0-SNAPSHOT</netconf.parent.version>
-        <config.parent.version>0.3.0-SNAPSHOT</config.parent.version>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <jersey.version>1.17</jersey.version>
-        <jersey.servlet.version>1.17</jersey.servlet.version>
-        <jersey.json.version>1.17</jersey.json.version>
-        <jackson.version>2.3.2</jackson.version>
-
-        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-        <yangtools.binding.version>0.7.0-SNAPSHOT</yangtools.binding.version>
-
-        <lispflowmapping.version>1.2.0-SNAPSHOT</lispflowmapping.version>
-        <ovsdb.southbound.version>1.1.0-SNAPSHOT</ovsdb.southbound.version>
-
-        <!-- Supporting Libraries -->
-        <slf4j.version>1.7.2</slf4j.version>
-        <feature.openflowplugin.version>0.1.0-SNAPSHOT</feature.openflowplugin.version>
-
-        <branding.version>1.1.0-SNAPSHOT</branding.version>
-        <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-        <feature.test.version>1.5.0-SNAPSHOT</feature.test.version>
-        <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
-        <controller.checkstyle.version>0.1.0-SNAPSHOT</controller.checkstyle.version>
-        <controller.commons.northbound.version>0.5.0-SNAPSHOT</controller.commons.northbound.version>
-        <corsfilter.version>7.0.42</corsfilter.version>
-
-        <!-- Test Libraries -->
-        <powermock.version>1.5.6</powermock.version>
-    </properties>
-
-    <repositories>
-      <repository>
-        <releases>
-          <enabled>true</enabled>
-          <updatePolicy>never</updatePolicy>
-        </releases>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-        <id>opendaylight-mirror</id>
-        <name>opendaylight-mirror</name>
-        <url>http://nexus.opendaylight.org/content/groups/public/</url>
-      </repository>
-      <repository>
-        <releases>
-          <enabled>false</enabled>
-        </releases>
-        <snapshots>
-          <enabled>true</enabled>
-        </snapshots>
-        <id>opendaylight-snapshot</id>
-        <name>opendaylight-snapshot</name>
-        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-      </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>opendaylight-release</id>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release</url>
-        </repository>
-        <snapshotRepository>
-            <id>opendaylight-snapshot</id>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <modules>
-        <module>alto-model</module>
-        <module>alto-config</module>
-        <module>alto-provider</module>
-        <module>features</module>
-        <module>alto-commons</module>
-        <module>alto-services/api</module>
-        <module>alto-services/ext</module>
-        <module>alto-services/provider</module>
-        <module>alto-manager</module>
-        <module>alto-northbound</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${compiler.version}</version>
-                    <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.ops4j.pax.exam</groupId>
-                    <artifactId>maven-paxexam-plugin</artifactId>
-                    <version>1.2.4</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <configuration>
-                        <filesets>
-                            <fileset>
-                                <directory>${jmxGeneratorPath}</directory>
-                                <includes>
-                                    <include>**</include>
-                                </includes>
-                            </fileset>
-                            <fileset>
-                                <directory>${salGeneratorPath}</directory>
-                                <includes>
-                                    <include>**</include>
-                                </includes>
-                            </fileset>
-                        </filesets>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>${build.helper.version}</version>
-                    <executions>
-                        <execution>
-                            <id>add-source</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>add-source</goal>
-                            </goals>
-                            <configuration>
-                                <sources>
-                                    <source>${jmxGeneratorPath}</source>
-                                    <source>${salGeneratorPath}</source>
-                                </sources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.opendaylight.yangtools</groupId>
-                    <artifactId>yang-maven-plugin</artifactId>
-                    <version>0.7.0-SNAPSHOT</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven.bundle.version}</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <instructions>
-                            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        </instructions>
-                        <manifestLocation>${project.build.directory}/META-INF</manifestLocation>
-                    </configuration>
-                </plugin>
-                <plugin>
-                   <groupId>org.jacoco</groupId>
-                   <artifactId>jacoco-maven-plugin</artifactId>
-                   <version>${jacoco.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
+
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
+  <groupId>org.opendaylight.alto</groupId>
+  <artifactId>alto-parent</artifactId>
+  <version>0.1.0-SNAPSHOT</version>
+  <name>alto</name> <!-- Used by Sonar to set project name -->
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>alto-model</module>
+    <module>alto-config</module> <!-- required by alto-manager -->
+    <module>alto-provider</module>
+    <module>features</module>
+    <module>alto-commons</module>
+    <module>alto-manager</module>
+    <module>alto-services/api</module>
+    <module>alto-services/ext</module>
+    <!-- <module>alto-karaf</module> -->
+    <module>alto-northbound</module>
+  </modules>
+
+  <properties>
+    <karaf.shell.version>2.2.11</karaf.shell.version>
+
+    <!-- required by alto command line -->
+    <httpclient.version>4.4.1</httpclient.version>
+
+    <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
+    <ietf.yang.types.version>2013.07.15.7-SNAPSHOT</ietf.yang.types.version>
+
+    <!-- used by yangtools, but the name is strange.
+         TODO: need more investigation -->
+    <config.version>0.3.0-SNAPSHOT</config.version>
+
+    <sal.version>0.7.1-SNAPSHOT</sal.version>
+    <war.version>3.0.1</war.version>
+    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+    <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
+    <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+
+    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+
+    <controller.checkstyle.version> <!-- checkstyle artifact of controller -->
+      0.1.0-SNAPSHOT
+    </controller.checkstyle.version>
+    <controller.commons.northbound.version> <!-- required by alto-northbound -->
+      0.5.0-SNAPSHOT
+    </controller.commons.northbound.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.yangtools.model</groupId>
+        <artifactId>ietf-inet-types</artifactId>
+        <version>${ietf.model.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools.model</groupId>
+        <artifactId>ietf-yang-types-20130715</artifactId>
+        <version>${ietf.yang.types.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient-osgi</artifactId>
+        <version>${httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore-osgi</artifactId>
+        <version>${httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>sal-binding-api</artifactId>
+        <version>${mdsal.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>sal-binding-config</artifactId>
+        <version>${mdsal.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>sal-common-util</artifactId>
+        <version>${mdsal.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin> <!-- used by most projects -->
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-maven-plugin</artifactId>
+          <version>${yangtools.version}</version>
+        </plugin>
+
+        <plugin> <!-- global checkstyle -->
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>${checkstyle.version}</version>
+
+          <executions>
+            <execution>
+              <phase>process-sources</phase>
+              <goals>
+                <goal>check</goal>
+              </goals>
+            </execution>
+          </executions>
+
+          <configuration>
+            <!-- TODO: remove before releasing -->
+            <failsOnError>true</failsOnError>
+            <configLocation>controller/checkstyle.xml</configLocation>
+            <consoleOutput>true</consoleOutput>
+            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+            <sourceDirectory>${project.basedir}</sourceDirectory>
+            <excludes>**\/target\/,**\/bin\/,**\/third-party\/,**\/yang\/gen\/,**\/yang-gen-sal\/</excludes>
+          </configuration>
+
+          <dependencies>
+            <dependency>
+              <groupId>org.opendaylight.controller</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>${controller.checkstyle.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>