Clean up unused subprojects and configurations

Make the following changes:

- Remove redundant artifacts / features / karaf / it modules.
- Reduce `alto-core/standard-service-models/model-*/api` to
  `alto-core/standard-service-models/model-*`.
- Rename alto-service-model-*-api to alto-service-model-*.
- Unify modules name as "ODL :: alto :: ${project.artifactId}".
- Remove unused profiles from pom.xml.

Change-Id: I7b22badb37568a5d3a1c93999fca0e6ee35199d1
Signed-off-by: jensenzhang <jingxuan.n.zhang@gmail.com>

diff --git a/.gitignore b/.gitignore
index 63637467b6fb75758635109ea08ffd49bae1d68b..42378d2c22076690c280540b631048c2b9e483f2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,8 @@
 *.ipr
 *.iws
 *.swp
-*.swp
+*.old
+*.bak
 *.xmi
 *~
 .DS_STORE

diff --git a/alto-basic/auto-maps/api/pom.xml b/alto-basic/auto-maps/api/pom.xml
index 3beae85b60cd345e918cb705d2f8a9620a4410cf..a3c69d8573301d7eb0626c2845a39aa3261a01b0 100644 (file)
--- a/alto-basic/auto-maps/api/pom.xml
+++ b/alto-basic/auto-maps/api/pom.xml
@@ -19,5 +19,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.basic</groupId>
   <artifactId>alto-auto-maps-api</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 </project>

diff --git a/alto-basic/auto-maps/artifacts/pom.xml b/alto-basic/auto-maps/artifacts/pom.xml
deleted file mode 100644 (file)
index 02e45f0..0000000
--- a/alto-basic/auto-maps/artifacts/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 SNLAB and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-auto-maps-artifacts</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-auto-maps-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-auto-maps-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-auto-maps-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-basic/auto-maps/features/pom.xml b/alto-basic/auto-maps/features/pom.xml
deleted file mode 100644 (file)
index 6d0634c..0000000
--- a/alto-basic/auto-maps/features/pom.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 SNLAB and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-auto-maps-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-auto-maps-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-auto-maps-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-auto-maps-cli</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-basic/auto-maps/features/src/main/features/features.xml b/alto-basic/auto-maps/features/src/main/features/features.xml
deleted file mode 100644 (file)
index f488c6d..0000000
--- a/alto-basic/auto-maps/features/src/main/features/features.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2016 SNLAB and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-auto-maps-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
-  <feature name='odl-alto-auto-maps-api' version='${project.version}' description='OpenDaylight :: alto-auto-maps :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-auto-maps-api/{{VERSION}}</bundle>
-  </feature>
-  <feature name='odl-alto-auto-maps' version='${project.version}' description='OpenDaylight :: alto-auto-maps'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-auto-maps-api</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-auto-maps-impl/{{VERSION}}</bundle>
-  </feature>
-  <feature name='odl-alto-auto-maps-rest' version='${project.version}' description='OpenDaylight :: alto-auto-maps :: REST'>
-    <feature version="${project.version}">odl-alto-auto-maps</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-  <feature name='odl-alto-auto-maps-ui' version='${project.version}' description='OpenDaylight :: alto-auto-maps :: UI'>
-    <feature version="${project.version}">odl-alto-auto-maps-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-  <feature name='odl-alto-auto-maps-cli' version='${project.version}' description='OpenDaylight :: alto-auto-maps :: CLI'>
-    <feature version="${project.version}">odl-alto-auto-maps</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-auto-maps-cli/{{VERSION}}</bundle>
-  </feature>
-
-</features>

diff --git a/alto-basic/auto-maps/impl/pom.xml b/alto-basic/auto-maps/impl/pom.xml
index 7349ae4b148a557b589d6d22a0e6e8f4694114e2..8ebc754be0474a435906c41e8e799188bfc7ce6c 100644 (file)
--- a/alto-basic/auto-maps/impl/pom.xml
+++ b/alto-basic/auto-maps/impl/pom.xml
@@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.basic</groupId>
   <artifactId>alto-auto-maps-impl</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <properties>
@@ -42,13 +43,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
+      <artifactId>alto-service-model-networkmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-costmap-api</artifactId>
+      <artifactId>alto-service-model-costmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-basic/auto-maps/it/pom.xml b/alto-basic/auto-maps/it/pom.xml
deleted file mode 100644 (file)
index 3cc974a..0000000
--- a/alto-basic/auto-maps/it/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 SNLAB and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-auto-maps-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.basic</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-auto-maps-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.3.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-auto-maps-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-basic/auto-maps/it/src/test/java/org/opendaylight/alto/basic/it/AltoAutoMapsIT.java b/alto-basic/auto-maps/it/src/test/java/org/opendaylight/alto/basic/it/AltoAutoMapsIT.java
deleted file mode 100644 (file)
index ea670cd..0000000
--- a/alto-basic/auto-maps/it/src/test/java/org/opendaylight/alto/basic/it/AltoAutoMapsIT.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright © 2016 SNLAB and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.basic.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoAutoMapsIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoAutoMapsIT.class);
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.basic")
-                .artifactId("alto-auto-maps-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-auto-maps-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoAutoMapsIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testAltoAutoMapsFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-basic/auto-maps/karaf/pom.xml b/alto-basic/auto-maps/karaf/pom.xml
deleted file mode 100644 (file)
index 67077dd..0000000
--- a/alto-basic/auto-maps/karaf/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2016 SNLAB and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-auto-maps-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
-  <properties>
-    <karaf.localFeature>odl-alto-auto-maps-ui</karaf.localFeature>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-auto-maps-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-auto-maps-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- DO NOT deploy the karaf artifact -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-basic/auto-maps/pom.xml b/alto-basic/auto-maps/pom.xml
index c24c69096824c898f8f564fe37683484e4b562db..37b9c856ea76216e7e769cdba3acf9bc689b3716 100644 (file)
--- a/alto-basic/auto-maps/pom.xml
+++ b/alto-basic/auto-maps/pom.xml
@@ -25,6 +25,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
 
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
+
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>
@@ -45,81 +50,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <!--<module>it</module>-->
-      </modules>
-    </profile>
-
-    <profile>
-      <!--
-          This profile is to ensure we only build javadocs reports
-          when we plan to deploy Maven site for our project.
-      -->
-      <id>maven-site</id>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <inherited>false</inherited>
-            <executions>
-              <execution>
-                <id>aggregate</id>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
-                <phase>package</phase>
-            </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
 </project>

diff --git a/alto-basic/manual-maps/api/pom.xml b/alto-basic/manual-maps/api/pom.xml
index 31b5df7938eda1f39180e98c4d9044877d1daa75..af8870cb4b28de4b95d675f30bf775eb02f669fa 100644 (file)
--- a/alto-basic/manual-maps/api/pom.xml
+++ b/alto-basic/manual-maps/api/pom.xml
@@ -36,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
         <dependency>
             <groupId>org.opendaylight.alto.core</groupId>
-            <artifactId>alto-service-model-base-api</artifactId>
+            <artifactId>alto-service-model-base</artifactId>
             <version>${project.version}</version>
         </dependency>
 

diff --git a/alto-basic/manual-maps/artifacts/pom.xml b/alto-basic/manual-maps/artifacts/pom.xml
deleted file mode 100644 (file)
index de80d80..0000000
--- a/alto-basic/manual-maps/artifacts/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-manual-maps-artifacts</artifactId>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-manual-maps-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-manual-maps-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-manual-maps-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-basic/manual-maps/features/pom.xml b/alto-basic/manual-maps/features/pom.xml
deleted file mode 100644 (file)
index a2ed43a..0000000
--- a/alto-basic/manual-maps/features/pom.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-manual-maps-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>0.11.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-northbound-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-networkmap-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-costmap-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-config-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-manual-maps-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-manual-maps-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-manual-maps-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-basic/manual-maps/features/src/main/features/features.xml b/alto-basic/manual-maps/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 1db8b58..0000000
--- a/alto-basic/manual-maps/features/src/main/features/features.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-manual-maps-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-resourcepool-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-northbound-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-costmap-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-manual-maps-api' version='${project.version}' description='OpenDaylight :: alto-manual-maps :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-resourcepool-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-config-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-manual-maps-api/${project.version}</bundle>
-  </feature>
-  <feature name='odl-alto-manual-maps' version='${project.version}' description='OpenDaylight :: alto-manual-maps'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-manual-maps-api</feature>
-    <feature version='${project.version}'>odl-alto-northbound</feature>
-    <feature version='${project.version}'>odl-alto-resourcepool</feature>
-    <feature version='${project.version}'>odl-alto-service-model-networkmap</feature>
-    <feature version='${project.version}'>odl-alto-service-model-costmap</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-manual-maps-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-manual-maps.xml">mvn:org.opendaylight.alto.basic/alto-manual-maps-impl/${project.version}/xml/config</configfile>
-  </feature>
-  <feature name='odl-alto-manual-maps-rest' version='${project.version}' description='OpenDaylight :: alto-manual-maps :: REST'>
-    <feature version="${project.version}">odl-alto-manual-maps</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-  <feature name='odl-alto-manual-maps-ui' version='${project.version}' description='OpenDaylight :: alto-manual-maps :: UI'>
-    <feature version="${project.version}">odl-alto-manual-maps-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-basic/manual-maps/impl/pom.xml b/alto-basic/manual-maps/impl/pom.xml
index 392dedf6da0f9808340986689b5d3684d34889ce..442bff5de537c271d5c10d8da90c13dc2b012c88 100644 (file)
--- a/alto-basic/manual-maps/impl/pom.xml
+++ b/alto-basic/manual-maps/impl/pom.xml
@@ -36,19 +36,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
         <dependency>
             <groupId>org.opendaylight.alto.core</groupId>
-            <artifactId>alto-service-model-ird-api</artifactId>
+            <artifactId>alto-service-model-ird</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.alto.core</groupId>
-            <artifactId>alto-service-model-networkmap-api</artifactId>
+            <artifactId>alto-service-model-networkmap</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.alto.core</groupId>
-            <artifactId>alto-service-model-costmap-api</artifactId>
+            <artifactId>alto-service-model-costmap</artifactId>
             <version>${project.version}</version>
         </dependency>
 

diff --git a/alto-basic/manual-maps/karaf/pom.xml b/alto-basic/manual-maps/karaf/pom.xml
deleted file mode 100644 (file)
index 44230f5..0000000
--- a/alto-basic/manual-maps/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-manual-maps-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-manual-maps-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-manual-maps-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-manual-maps-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-basic/manual-maps/pom.xml b/alto-basic/manual-maps/pom.xml
index 616fe2a85db456a67b01126199bc8cf3bbe0b6bf..2011956b23ae0a817bcea0664d6b5b6d6dbca7cd 100644 (file)
--- a/alto-basic/manual-maps/pom.xml
+++ b/alto-basic/manual-maps/pom.xml
@@ -7,75 +7,47 @@ 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">
 
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath/>
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>2.0.0</version>
+    <relativePath/>
+  </parent>
 
-    <groupId>org.opendaylight.alto.basic</groupId>
-    <artifactId>alto-manual-maps-aggregator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <name>ODL :: alto :: ${project.artifactId}</name>
-    <packaging>pom</packaging>
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>3.1.1</maven>
-    </prerequisites>
-    <profiles>
-        <profile>
-            <id>minimal</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-            </modules>
-        </profile>
+  <groupId>org.opendaylight.alto.basic</groupId>
+  <artifactId>alto-manual-maps-aggregator</artifactId>
+  <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
+  <packaging>pom</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
 
-        <profile>
-            <id>alto-dev</id>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-                <module>features</module>
-                <module>artifacts</module>
-            </modules>
-        </profile>
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
 
-        <profile>
-            <id>alto-test</id>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-                <module>features</module>
-                <module>artifacts</module>
-                <module>karaf</module>
-                <!--<module>it</module>-->
-            </modules>
-        </profile>
-    </profiles>
-    <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
 

diff --git a/alto-basic/simple-ecs/artifacts/pom.xml b/alto-basic/simple-ecs/artifacts/pom.xml
deleted file mode 100644 (file)
index 696668c..0000000
--- a/alto-basic/simple-ecs/artifacts/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <version>0.5.0-SNAPSHOT</version>
-  <artifactId>alto-simple-ecs-artifacts</artifactId>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-simple-ecs-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-simple-ecs-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-simple-ecs-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-basic/simple-ecs/features/pom.xml b/alto-basic/simple-ecs/features/pom.xml
deleted file mode 100644 (file)
index 114c629..0000000
--- a/alto-basic/simple-ecs/features/pom.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <version>0.5.0-SNAPSHOT</version>
-  <artifactId>alto-simple-ecs-features</artifactId>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
-    <openflow.plugin.version>0.5.0-SNAPSHOT</openflow.plugin.version>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-northbound-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-networkmap-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-endpointcost-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin</artifactId>
-      <classifier>features</classifier>
-      <version>${openflow.plugin.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-ird-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ecs-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ecs-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ecs-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-inventory</artifactId>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin.model</groupId>
-      <artifactId>model-flow-statistics</artifactId>
-      <version>${openflow.plugin.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch</groupId>
-      <artifactId>features-l2switch</artifactId>
-      <classifier>features</classifier>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-      <artifactId>addresstracker-model</artifactId>
-      <version>${l2switch.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-      <artifactId>hosttracker-model</artifactId>
-      <version>${l2switch.version}</version>
-      <type>jar</type>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-basic/simple-ecs/features/src/main/features/features.xml b/alto-basic/simple-ecs/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 0719353..0000000
--- a/alto-basic/simple-ecs/features/src/main/features/features.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-simple-ecs-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-resourcepool-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-northbound-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features</repository>
-
-  <feature name='odl-alto-simple-ecs-api' version='${project.version}' description='OpenDaylight :: alto-simple-ecs :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-resourcepool-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ecs-api/${project.version}</bundle>
-  </feature>
-  <feature name='odl-alto-simple-ecs' version='${project.version}' description='OpenDaylight :: alto-simple-ecs'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-simple-ecs-api</feature>
-    <feature version='${project.version}'>odl-alto-northbound</feature>
-    <feature version='${project.version}'>odl-alto-resourcepool</feature>
-    <feature version='${project.version}'>odl-alto-service-model-networkmap</feature>
-    <feature version='${project.version}'>odl-alto-service-model-endpointcost</feature>
-    <feature version='${l2switch.version}'>odl-l2switch-hosttracker</feature>
-    <feature version='${l2switch.version}'>odl-l2switch-addresstracker</feature>
-    <feature version='${openflow.plugin.version}'>odl-openflowplugin-flow-services</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-simple-ecs.xml">mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}/xml/config</configfile>
-  </feature>
-  <feature name='odl-alto-simple-ecs-rest' version='${project.version}' description='OpenDaylight :: alto-simple-ecs :: REST'>
-    <feature version="${project.version}">odl-alto-simple-ecs</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-  <feature name='odl-alto-simple-ecs-ui' version='${project.version}' description='OpenDaylight :: alto-simple-ecs :: UI'>
-    <feature version="${project.version}">odl-alto-simple-ecs-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-basic/simple-ecs/hostnodetracker/pom.xml b/alto-basic/simple-ecs/hostnodetracker/pom.xml
deleted file mode 100644 (file)
index f84ac3f..0000000
--- a/alto-basic/simple-ecs/hostnodetracker/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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">
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.opendaylight.alto.basic</groupId>
-    <artifactId>hostnodetracker</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <name>ODL :: alto :: ${project.artifactId}</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.l2switch.hosttracker</groupId>
-            <artifactId>hosttracker-model</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.l2switch.addresstracker</groupId>
-            <artifactId>addresstracker-model</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.alto.core</groupId>
-            <artifactId>alto-service-model-base-api</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.alto.core</groupId>
-            <artifactId>alto-service-model-endpointcost-api</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-</project>

diff --git a/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java b/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java
deleted file mode 100644 (file)
index c453c65..0000000
--- a/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.basic.hostnode.tracker.topology.api;
-
-public interface HostNodeTrackerService {
-    String getIpByMac(String macAddress);
-
-    String getMacByIp(String ipAddress);
-
-    Boolean isValidHost(String ipAddress);
-}

diff --git a/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java b/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java
deleted file mode 100644 (file)
index 7e574ce..0000000
--- a/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.basic.hostnode.tracker.topology.impl;
-
-import org.opendaylight.alto.basic.hostnode.tracker.topology.api.HostNodeTrackerService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.address.tracker.rev140617.address.node.connector.Addresses;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.host.tracker.rev140624.HostNode;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class HostNodeTrackerImpl implements HostNodeTrackerService,DataChangeListener{
-    private static final Logger log = LoggerFactory
-            .getLogger(HostNodeTrackerImpl.class);
-    private static final int CPUS = Runtime.getRuntime().availableProcessors();
-    private ExecutorService exec = Executors.newFixedThreadPool(CPUS);
-    private DataBroker dataBroker = null;
-    private Map<String, String> macToIp;
-    private Map<String, String> ipToMac;
-
-    private ListenerRegistration<DataChangeListener> hostListener = null;
-    public HostNodeTrackerImpl  (DataBroker dataBroker) {
-        this.log.info("AddressConvertServiceImpl initial.");
-        this.dataBroker = dataBroker;
-        macToIp = new HashMap<String,String>();
-        ipToMac = new HashMap<String,String>();
-        registerPortListener();
-    }
-
-    private void registerPortListener() {
-        InstanceIdentifier<HostNode> hostNodes = InstanceIdentifier
-                .builder(NetworkTopology.class)
-                .child(Topology.class)
-                .child(Node.class).augmentation(HostNode.class).build();
-        this.hostListener = this.dataBroker
-                .registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                        hostNodes, this, AsyncDataBroker.DataChangeScope.SUBTREE);
-    }
-    public String getIpByMac(String macAddress) {
-        return this.macToIp.get(macAddress);
-    }
-
-    public String getMacByIp(String ipAddress) {
-        return this.ipToMac.get(ipAddress);
-    }
-
-    public Boolean isValidHost(String ipAddress) {
-        return this.ipToMac.containsKey(ipAddress);
-    }
-
-    public void onDataChanged(final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
-        exec.submit(new Runnable() {
-            @Override
-            public void run() {
-                if (change == null) {
-                    log.info("In onDataChanged: No processing done as change even is null.");
-                    return;
-                }
-                Map<InstanceIdentifier<?>, DataObject> updatedData = change
-                        .getUpdatedData();
-                Map<InstanceIdentifier<?>, DataObject> createdData = change
-                        .getCreatedData();
-                Map<InstanceIdentifier<?>, DataObject> originalData = change
-                        .getOriginalData();
-                Set<InstanceIdentifier<?>> deletedData = change
-                        .getRemovedPaths();
-
-                for (InstanceIdentifier<?> iid : deletedData) {
-                    log.info("deletedData");
-                    if (iid.getTargetType().equals(Node.class)) {
-                        Node node = ((Node) originalData.get(iid));
-                        HostNode hostNode = node
-                                .getAugmentation(HostNode.class);
-                        if (hostNode != null) {
-                            List<Addresses> addrList = hostNode.getAddresses();
-                            for (Addresses eachAddress : addrList) {
-                                macToIp.remove(eachAddress.getMac().getValue());
-                                ipToMac.remove(eachAddress.getIp().getIpv4Address().getValue());
-                            }
-                        }
-                    }
-                }
-
-                for (Map.Entry<InstanceIdentifier<?>, DataObject> entrySet : updatedData
-                        .entrySet()) {
-                    InstanceIdentifier<?> iiD = entrySet.getKey();
-                    final DataObject dataObject = entrySet.getValue();
-                    if (dataObject instanceof Addresses) {
-                        Addresses addrs = (Addresses) dataObject;
-                        Addresses origAddr = (Addresses) originalData.get(iiD);
-                        log.info("updatedData addresses:" + addrs + "~~" + origAddr);
-                        macToIp.remove(origAddr.getMac().getValue());
-                        macToIp.put(addrs.getMac().getValue(), addrs.getIp().getIpv4Address().getValue());
-                        ipToMac.remove(origAddr.getIp().getIpv4Address().getValue());
-                        ipToMac.put(addrs.getIp().getIpv4Address().getValue(), addrs.getMac().getValue());
-                    }
-                }
-
-                for (Map.Entry<InstanceIdentifier<?>, DataObject> entrySet : createdData
-                        .entrySet()) {
-                    InstanceIdentifier<?> iiD = entrySet.getKey();
-                    final DataObject dataObject = entrySet.getValue();
-                    if (dataObject instanceof Addresses) {
-                        Addresses addrs = (Addresses) dataObject;
-                        log.info("createdData addresses:" + addrs);
-                        macToIp.put(addrs.getMac().getValue(), addrs.getIp().getIpv4Address().getValue());
-                        ipToMac.put(addrs.getIp().getIpv4Address().getValue(), addrs.getMac().getValue());
-                    }
-                }
-            }
-        });
-    }
-
-}

diff --git a/alto-basic/simple-ecs/impl/pom.xml b/alto-basic/simple-ecs/impl/pom.xml
index 5e15f03b2ae66e902b3dfe16968f08a527425b2a..026813ea78faf4f37635849f4199f7b4de73e39b 100644 (file)
--- a/alto-basic/simple-ecs/impl/pom.xml
+++ b/alto-basic/simple-ecs/impl/pom.xml
@@ -37,13 +37,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
+      <artifactId>alto-service-model-networkmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
+      <artifactId>alto-service-model-endpointcost</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-basic/simple-ecs/it/pom.xml b/alto-basic/simple-ecs/it/pom.xml
deleted file mode 100644 (file)
index cab248c..0000000
--- a/alto-basic/simple-ecs/it/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <version>0.5.0-SNAPSHOT</version>
-  <artifactId>alto-simple-ecs-it</artifactId>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.basic</karaf.distro.groupId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.artifactId>alto-simple-ecs-karaf</karaf.distro.artifactId>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ecs-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-basic/simple-ecs/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java b/alto-basic/simple-ecs/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java
deleted file mode 100644 (file)
index 4fd3355..0000000
--- a/alto-basic/simple-ecs/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.basic.endpointcostservice.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class EndpointcostserviceIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(EndpointcostserviceIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "endpointcostservice";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "endpointcostservice-default";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.basic")
-                .artifactId("endpointcostservice-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-endpointcostservice-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(EndpointcostserviceIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testendpointcostserviceFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-basic/simple-ecs/karaf/pom.xml b/alto-basic/simple-ecs/karaf/pom.xml
deleted file mode 100644 (file)
index b91ba50..0000000
--- a/alto-basic/simple-ecs/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <version>0.5.0-SNAPSHOT</version>
-  <artifactId>alto-simple-ecs-karaf</artifactId>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-simple-ecs-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-simple-ecs-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ecs-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-basic/simple-ecs/pom.xml b/alto-basic/simple-ecs/pom.xml
index 7f217b45d669a83e88d7018319193bc7e1e770fc..c6ecb6bc92dfc8bc9b5c9135d86b041d70c5f9a0 100644 (file)
--- a/alto-basic/simple-ecs/pom.xml
+++ b/alto-basic/simple-ecs/pom.xml
@@ -23,40 +23,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
 
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>

diff --git a/alto-basic/simple-ird/artifacts/pom.xml b/alto-basic/simple-ird/artifacts/pom.xml
deleted file mode 100644 (file)
index d3e8823..0000000
--- a/alto-basic/simple-ird/artifacts/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2017 SNLab and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-simple-ird-artifacts</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-simple-ird-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-simple-ird-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-simple-ird-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-basic/simple-ird/features/pom.xml b/alto-basic/simple-ird/features/pom.xml
deleted file mode 100644 (file)
index 63d60e4..0000000
--- a/alto-basic/simple-ird/features/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2017 SNLab and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-simple-ird-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: alto :: ${project.artifactId}</name>
-
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ird-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ird-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-basic/simple-ird/features/src/main/features/features.xml b/alto-basic/simple-ird/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 7608460..0000000
--- a/alto-basic/simple-ird/features/src/main/features/features.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2017 SNLab and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-simple-ird-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
-  <feature name='odl-alto-simple-ird-api' version='${project.version}' description='OpenDaylight :: alto-simple-ird :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ird-api/{{VERSION}}</bundle>
-  </feature>
-  <feature name='odl-alto-simple-ird' version='${project.version}' description='OpenDaylight :: alto-simple-ird'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-simple-ird-api</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ird-impl/{{VERSION}}</bundle>
-  </feature>
-  <feature name='odl-alto-simple-ird-rest' version='${project.version}' description='OpenDaylight :: alto-simple-ird :: REST'>
-    <feature version="${project.version}">odl-alto-simple-ird</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-  <feature name='odl-alto-simple-ird-ui' version='${project.version}' description='OpenDaylight :: alto-simple-ird :: UI'>
-    <feature version="${project.version}">odl-alto-simple-ird-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-<!--  <feature name='odl-alto-simple-ird-cli' version='${project.version}' description='OpenDaylight :: alto-simple-ird :: CLI'>
-    <feature version="${project.version}">odl-alto-simple-ird</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ird-cli/{{VERSION}}</bundle>
-  </feature>-->
-
-</features>

diff --git a/alto-basic/simple-ird/impl/pom.xml b/alto-basic/simple-ird/impl/pom.xml
index a6196e643c00398e7ecceb335602f4e420817fee..b5f6512e3139366d4653dd11b7bcff0912c9e295 100644 (file)
--- a/alto-basic/simple-ird/impl/pom.xml
+++ b/alto-basic/simple-ird/impl/pom.xml
@@ -42,25 +42,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-ird-api</artifactId>
+      <artifactId>alto-service-model-ird</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
+      <artifactId>alto-service-model-networkmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-costmap-api</artifactId>
+      <artifactId>alto-service-model-costmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
+      <artifactId>alto-service-model-endpointcost</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-basic/simple-ird/it/pom.xml b/alto-basic/simple-ird/it/pom.xml
deleted file mode 100644 (file)
index aee82e3..0000000
--- a/alto-basic/simple-ird/it/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2017 SNLab and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-simple-ird-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.basic</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-simple-ird-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.2.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ird-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-basic/simple-ird/it/src/test/java/org/opendaylight/alto/basic/it/AltoSimpleIrdIT.java b/alto-basic/simple-ird/it/src/test/java/org/opendaylight/alto/basic/it/AltoSimpleIrdIT.java
deleted file mode 100644 (file)
index 6879f68..0000000
--- a/alto-basic/simple-ird/it/src/test/java/org/opendaylight/alto/basic/it/AltoSimpleIrdIT.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright © 2017 SNLab and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.basic.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoSimpleIrdIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoSimpleIrdIT.class);
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.basic")
-                .artifactId("alto-simple-ird-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-simple-ird-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoSimpleIrdIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testSimpleIrdFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-basic/simple-ird/karaf/pom.xml b/alto-basic/simple-ird/karaf/pom.xml
deleted file mode 100644 (file)
index 5b54a59..0000000
--- a/alto-basic/simple-ird/karaf/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2017 SNLab and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-  </parent>
-
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-simple-ird-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: alto :: ${project.artifactId}</name>
-
-  <properties>
-    <karaf.localFeature>odl-alto-simple-ird-ui</karaf.localFeature>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-simple-ird-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-simple-ird-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- DO NOT deploy the karaf artifact -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-basic/simple-ird/pom.xml b/alto-basic/simple-ird/pom.xml
index 6a7429eecebdfc258bf1b8bc7828e27098d02cf8..02fc19b5585fa26de99e3dba26c67838e038f5f1 100644 (file)
--- a/alto-basic/simple-ird/pom.xml
+++ b/alto-basic/simple-ird/pom.xml
@@ -20,6 +20,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>ODL :: alto :: ${project.artifactId}</name> <!-- DO NOT CHANGE - Used by Sonar to set project name -->
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
+
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
+
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>
@@ -40,91 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-    <profile>
-      <!--
-          This profile is to ensure we only build javadocs reports
-          when we plan to deploy Maven site for our project.
-      -->
-      <id>maven-site</id>
-      <activation>
-        <file>
-          <exists>${user.dir}/deploy-site.xml</exists>
-        </file>
-      </activation>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <inherited>false</inherited>
-            <executions>
-              <execution>
-                <id>aggregate</id>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <configuration>
-              <failsOnError>true</failsOnError>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
 </project>

diff --git a/alto-core/northbound/artifacts/pom.xml b/alto-core/northbound/artifacts/pom.xml
deleted file mode 100644 (file)
index 6bfaeb5..0000000
--- a/alto-core/northbound/artifacts/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-northbound-artifacts</artifactId>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-northbound-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-northbound-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-northbound-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-core/northbound/features/pom.xml b/alto-core/northbound/features/pom.xml
deleted file mode 100644 (file)
index 3663682..0000000
--- a/alto-core/northbound/features/pom.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-northbound-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-example</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-example</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-    <groupId>${project.groupId}</groupId>
-    <artifactId>alto-service-model-base-features</artifactId>
-    <classifier>features</classifier>
-    <version>${project.version}</version>
-    <type>xml</type>
-    <scope>runtime</scope>
-  </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-networkmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-networkmap-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-networkmap-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-costmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-costmap-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-costmap-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-endpointcost-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-endpointcost-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-route-endpointcost-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/northbound/features/src/main/features/features.xml b/alto-core/northbound/features/src/main/features/features.xml
deleted file mode 100644 (file)
index e13bf8e..0000000
--- a/alto-core/northbound/features/src/main/features/features.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-northbound-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.alto.core/alto-service-model-costmap-features/${project.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-northbound-api' version='${project.version}' description='OpenDaylight :: alto-northbound :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-api/${project.version}</bundle>
-  </feature>
-  <feature name='odl-alto-northbound' version='${project.version}' description='OpenDaylight :: alto-northbound'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-northbound-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-northbound.xml">mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}/xml/config</configfile>
-  </feature>
-  <feature name='odl-alto-northbound-route-test' version='${project.version}' description='OpenDaylight :: ALTO :: Route Exmaple'>
-      <feature version='${project.version}'>odl-alto-northbound</feature>
-      <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-example/${project.version}</bundle>
-      <configfile finalname="${configfile.directory}/alto-northbound-route-example.xml">
-        mvn:org.opendaylight.alto.core/alto-northbound-route-example/${project.version}/xml/config
-      </configfile>
-
-      <feature version='${project.version}'>odl-alto-service-model-networkmap</feature>
-      <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-networkmap-api/${project.version}</bundle>
-      <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-networkmap-impl/${project.version}</bundle>
-      <configfile finalname="${configfile.directory}/alto-northbound-route-networkmap.xml">
-        mvn:org.opendaylight.alto.core/alto-northbound-route-networkmap-impl/${project.version}/xml/config
-      </configfile>
-
-      <feature version='${project.version}'>odl-alto-service-model-costmap</feature>
-      <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-costmap-api/${project.version}</bundle>
-      <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-costmap-impl/${project.version}</bundle>
-      <configfile finalname="${configfile.directory}/alto-northbound-route-costmap.xml">
-          mvn:org.opendaylight.alto.core/alto-northbound-route-costmap-impl/${project.version}/xml/config
-      </configfile>
-
-      <feature version='${project.version}'>odl-alto-service-model-endpointcost</feature>
-      <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-endpointcost-api/${project.version}</bundle>
-      <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-endpointcost-impl/${project.version}</bundle>
-      <configfile finalname="${configfile.directory}/alto-northbound-route-endpointcost.xml">
-          mvn:org.opendaylight.alto.core/alto-northbound-route-endpointcost-impl/${project.version}/xml/config
-      </configfile>
-
-  </feature>
-  <feature name='odl-alto-northbound-rest' version='${project.version}' description='OpenDaylight :: alto-northbound :: REST'>
-    <feature version="${project.version}">odl-alto-northbound</feature>
-    <feature version="${project.version}">odl-alto-northbound-route-test</feature>
-  </feature>
-  <feature name='odl-alto-northbound-ui' version='${project.version}' description='OpenDaylight :: alto-northbound :: UI'>
-    <feature version="${project.version}">odl-alto-northbound-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-core/northbound/it/pom.xml b/alto-core/northbound/it/pom.xml
deleted file mode 100644 (file)
index a83f5e9..0000000
--- a/alto-core/northbound/it/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-northbound-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.core</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-northbound-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/northbound/it/src/test/java/org/opendaylight/alto/core/it/AltoNorthboundIT.java b/alto-core/northbound/it/src/test/java/org/opendaylight/alto/core/it/AltoNorthboundIT.java
deleted file mode 100644 (file)
index 3fc2388..0000000
--- a/alto-core/northbound/it/src/test/java/org/opendaylight/alto/core/it/AltoNorthboundIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoNorthboundIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoNorthboundIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "alto-northbound";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "alto-northbound-default";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.core")
-                .artifactId("alto-northbound-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-northbound-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoNorthboundIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testnorthboundFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-core/northbound/karaf/pom.xml b/alto-core/northbound/karaf/pom.xml
deleted file mode 100644 (file)
index f4ef5fe..0000000
--- a/alto-core/northbound/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-northbound-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-northbound-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-northbound-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-core/northbound/pom.xml b/alto-core/northbound/pom.xml
index 6aa192fff3de24e1a2127ba5a98187dd2faa54f1..bd5351a5d7a21f734ea605807a415b581167de20 100644 (file)
--- a/alto-core/northbound/pom.xml
+++ b/alto-core/northbound/pom.xml
@@ -24,40 +24,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>karaf</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>

diff --git a/alto-core/resourcepool/api/pom.xml b/alto-core/resourcepool/api/pom.xml
index 3620f0441bb486fcdb598ed030be5cb9bcf318b0..8a0a322b684e52e5bd9ac7313d42721706db1f74 100644 (file)
--- a/alto-core/resourcepool/api/pom.xml
+++ b/alto-core/resourcepool/api/pom.xml
@@ -18,6 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-resourcepool-api</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <properties>

diff --git a/alto-core/resourcepool/impl/pom.xml b/alto-core/resourcepool/impl/pom.xml
index 1e6a4e102dd88e6d66707f527830f67ad3f82dc3..8020096f0f4fe58c2f506cbb566e97c7b4c12dbb 100644 (file)
--- a/alto-core/resourcepool/impl/pom.xml
+++ b/alto-core/resourcepool/impl/pom.xml
@@ -19,6 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-resourcepool-impl</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/alto-core/resourcepool/pom.xml b/alto-core/resourcepool/pom.xml
index 14f639c4174678a55ee61a1c2441c6e9935e3d80..83e5aa7120dc1437dd5eb9705405f35d77986be8 100644 (file)
--- a/alto-core/resourcepool/pom.xml
+++ b/alto-core/resourcepool/pom.xml
@@ -21,18 +21,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-  </profiles>
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
 
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>

diff --git a/alto-core/standard-northbound-routes/costmap/api/pom.xml b/alto-core/standard-northbound-routes/costmap/api/pom.xml
index edaf10c2894c385db808ce3d6ceb29814a5741f5..ec6cf79b1f4c30a9426947ce47427a643aad1335 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/api/pom.xml
+++ b/alto-core/standard-northbound-routes/costmap/api/pom.xml
@@ -18,12 +18,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-northbound-route-costmap-api</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-api</artifactId>
+      <artifactId>alto-service-model-costmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-core/standard-northbound-routes/costmap/impl/pom.xml b/alto-core/standard-northbound-routes/costmap/impl/pom.xml
index 0022605aa90b1319c51667e1eeefe36cdf535faa..1546879c0fe55a184b6f53db50f7c42fdefb338f 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/pom.xml
+++ b/alto-core/standard-northbound-routes/costmap/impl/pom.xml
@@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-northbound-route-costmap-impl</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -35,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-api</artifactId>
+      <artifactId>alto-service-model-costmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-core/standard-northbound-routes/costmap/pom.xml b/alto-core/standard-northbound-routes/costmap/pom.xml
index 6eb84de0699a8ee4c12b0be0fe02133974f4a758..581da047a01876c9bdec1b1b6b23a6d358850739 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/pom.xml
+++ b/alto-core/standard-northbound-routes/costmap/pom.xml
@@ -23,34 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-  </profiles>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>

diff --git a/alto-core/standard-northbound-routes/endpointcost/api/pom.xml b/alto-core/standard-northbound-routes/endpointcost/api/pom.xml
index b9dd8e1918df03ec33eaca4fe9d3d2533eabded0..326a2341e88cd7af31227588636a0ee534782ec4 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/api/pom.xml
+++ b/alto-core/standard-northbound-routes/endpointcost/api/pom.xml
@@ -18,12 +18,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-northbound-route-endpointcost-api</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
+      <artifactId>alto-service-model-endpointcost</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml b/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml
index 20d08c9183df6e3828da0287e65c2cecdbf369d1..f186a06eee2516b9d8fc83f870ab6641de954d92 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml
@@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-northbound-route-endpointcost-impl</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -35,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
+      <artifactId>alto-service-model-endpointcost</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-core/standard-northbound-routes/endpointcost/pom.xml b/alto-core/standard-northbound-routes/endpointcost/pom.xml
index b4559a27f2e3034964140cc08e49a9916094bb1c..325847ca401c0e50cadf68f4955c00a1b02c374f 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/pom.xml
+++ b/alto-core/standard-northbound-routes/endpointcost/pom.xml
@@ -23,34 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-  </profiles>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>

diff --git a/alto-core/standard-northbound-routes/endpointproperty/api/pom.xml b/alto-core/standard-northbound-routes/endpointproperty/api/pom.xml
index 197e96241840565b9fd92c10303ec4b1577b45a7..a55a8114f93cd1f7c1dec0dda8c5958c289ef83a 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/api/pom.xml
+++ b/alto-core/standard-northbound-routes/endpointproperty/api/pom.xml
@@ -19,12 +19,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-northbound-route-endpointproperty-api</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointproperty-api</artifactId>
+      <artifactId>alto-service-model-endpointproperty</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml b/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml
index 5e4ace1e642871c8c4e109c74bb92f215a56f258..9ea8bb7f223f47f5a277593f282cb3dc4670668b 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml
@@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-northbound-route-endpointproperty-impl</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -41,7 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointproperty-api</artifactId>
+      <artifactId>alto-service-model-endpointproperty</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-core/standard-northbound-routes/endpointproperty/pom.xml b/alto-core/standard-northbound-routes/endpointproperty/pom.xml
index 13a3657a6a4c9e75c42337f29bb2af0343fa689b..275c6ce2207af98488981fafffe3084b23de78bd 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/pom.xml
+++ b/alto-core/standard-northbound-routes/endpointproperty/pom.xml
@@ -23,34 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         <maven>3.1.1</maven>
     </prerequisites>
 
-    <profiles>
-        <profile>
-            <id>minimal</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-            </modules>
-        </profile>
+    <modules>
+      <module>api</module>
+      <module>impl</module>
+    </modules>
 
-        <profile>
-            <id>alto-dev</id>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-            </modules>
-        </profile>
-
-        <profile>
-            <id>alto-test</id>
-            <modules>
-                <module>api</module>
-                <module>impl</module>
-            </modules>
-        </profile>
-    </profiles>
     <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
     <build>
         <plugins>

diff --git a/alto-core/standard-northbound-routes/example/pom.xml b/alto-core/standard-northbound-routes/example/pom.xml
deleted file mode 100644 (file)
index 51037e4..0000000
--- a/alto-core/standard-northbound-routes/example/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-northbound-route-example</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </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>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-json-org</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-base</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle.plugin.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Import-Package>
-              *,
-              com.sun.jersey.spi.container.servlet,
-              org.eclipse.jetty.servlets;version="[8.1,10)"
-            </Import-Package>
-            <Web-ContextPath>/alto</Web-ContextPath>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

diff --git a/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml b/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml
deleted file mode 100644 (file)
index b4e6369..0000000
--- a/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:alto:northbound:route:example:impl?module=alto-northbound-route-example-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:alto:northbound:route:example:impl">prefix:alto-northbound-route-example-impl</type>
-          <name>alto-northbound-route-example</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-          <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
-            <name>alto-northbound-router</name>
-          </alto-northbound-router>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/alto-core/standard-northbound-routes/example/src/main/config/maven-metadata-local.xml b/alto-core/standard-northbound-routes/example/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index a48a9a5..0000000
--- a/alto-core/standard-northbound-routes/example/src/main/config/maven-metadata-local.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-northbound-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151105030453</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151105030453</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>

diff --git a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/alto/core/northbound/route/example/impl/AltoNorthboundRouteExample.java b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/alto/core/northbound/route/example/impl/AltoNorthboundRouteExample.java
deleted file mode 100644 (file)
index a1900db..0000000
--- a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/alto/core/northbound/route/example/impl/AltoNorthboundRouteExample.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.alto.core.northbound.route.example.impl;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-
-import org.opendaylight.alto.core.northbound.api.AltoNorthboundRoute;
-
-@Path("/")
-public class AltoNorthboundRouteExample implements AltoNorthboundRoute {
-
-    @Path("{echo}")
-    @GET
-    @Produces("application/alto-test+json")
-    public String route(@Context HttpServletRequest req, @PathParam("echo") String echo) {
-        if (req == null) {
-            System.out.println("We are screwed");
-        }
-        return "Hello world! " + echo
-                + "\nFrom: " + req.getContextPath() + "/" + req.getPathTranslated()
-                + "\nTo: " + req.getRemoteAddr();
-    }
-
-}

diff --git a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java
deleted file mode 100644 (file)
index b60d48a..0000000
--- a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021;
-
-import org.opendaylight.alto.core.northbound.route.example.impl.AltoNorthboundRouteExample;
-
-public class AltoNorthboundRouteExampleModule extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AbstractAltoNorthboundRouteExampleModule {
-    public AltoNorthboundRouteExampleModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoNorthboundRouteExampleModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AltoNorthboundRouteExampleModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        getAltoNorthboundRouterDependency().addRoute("example", new AltoNorthboundRouteExample());
-
-        return new AutoCloseable() {
-            @Override
-            public void close() {
-                getAltoNorthboundRouterDependency().removeRoute("example");
-            }
-        };
-    }
-
-}

diff --git a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java
deleted file mode 100644 (file)
index 650d23e..0000000
--- a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-northbound-route-example-impl yang module local name: alto-northbound-route-example-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu Nov 05 12:06:09 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021;
-public class AltoNorthboundRouteExampleModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AbstractAltoNorthboundRouteExampleModuleFactory {
-
-}

diff --git a/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang b/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang
deleted file mode 100644 (file)
index 22e6a57..0000000
--- a/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang
+++ /dev/null
@@ -1,45 +0,0 @@
-module alto-northbound-route-example-impl {
-    yang-version 1;
-    namespace "urn:alto:northbound:route:example:impl";
-    prefix "alto-northbound-router-example-impl";
-
-    import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; }
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for northbound project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-northbound-route-example-impl {
-        base config:module-type;
-        config:java-name-prefix AltoNorthboundRouteExample;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-northbound-route-example {
-            when "/config:modules/config:module/config:type = 'alto-northbound-route-example-impl'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-
-            container alto-northbound-router {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity alto-northbound:alto-northbound-router;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java b/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java
deleted file mode 100644 (file)
index 50ac5c3..0000000
--- a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021;
-
-import org.junit.Test;
-
-public class AltoNorthboundRouteExampleModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoNorthboundRouteExampleModuleFactory();
-    }
-}

diff --git a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java b/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java
deleted file mode 100644 (file)
index 355de10..0000000
--- a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.JmxAttribute;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter;
-
-import javax.management.ObjectName;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AltoNorthboundRouteExampleModuleTest {
-    @Test
-    public void testCustomValidation() {
-        AltoNorthboundRouteExampleModule module = new AltoNorthboundRouteExampleModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class));
-
-        // ensure no exceptions on validation
-        // currently this method is empty
-        module.customValidation();
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        // configure mocks
-        DependencyResolver dependencyResolver = mock(DependencyResolver.class);
-        BindingAwareBroker broker = mock(BindingAwareBroker.class);
-        AltoNorthboundRouter router = mock(AltoNorthboundRouter.class);
-        when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker);
-        when(dependencyResolver.resolveInstance(eq(AltoNorthboundRouter.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(router);
-
-        // create instance of module with injected mocks
-        AltoNorthboundRouteExampleModule module = new AltoNorthboundRouteExampleModule(mock(ModuleIdentifier.class), dependencyResolver);
-
-        // getInstance calls resolveInstance to get the broker dependency and then calls createInstance
-        AutoCloseable closeable = module.getInstance();
-
-        // ensure no exceptions on close
-        closeable.close();
-
-        // verify that the route is released after closed
-        verify(router).removeRoute("example");
-    }
-}

diff --git a/alto-core/standard-northbound-routes/networkmap/api/pom.xml b/alto-core/standard-northbound-routes/networkmap/api/pom.xml
index 89e1b238a5f168b3a2b30f30ad0af2d04c174860..0cb3b96a70c0039661f73f4f1550f99747588522 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/api/pom.xml
+++ b/alto-core/standard-northbound-routes/networkmap/api/pom.xml
@@ -18,12 +18,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-northbound-route-networkmap-api</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
+      <artifactId>alto-service-model-networkmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/pom.xml b/alto-core/standard-northbound-routes/networkmap/impl/pom.xml
index 7d6a00af71bc5cfb27a15a3808fc09f9132644d9..4d14fa955cb9002b3ad1d84e0a94567e444faf5e 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/pom.xml
+++ b/alto-core/standard-northbound-routes/networkmap/impl/pom.xml
@@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <groupId>org.opendaylight.alto.core</groupId>
   <artifactId>alto-northbound-route-networkmap-impl</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
@@ -35,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
+      <artifactId>alto-service-model-networkmap</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/alto-core/standard-northbound-routes/networkmap/pom.xml b/alto-core/standard-northbound-routes/networkmap/pom.xml
index 799cc1a8c28a04bc68dfa13fa0631819d5bb831d..0acbde40322b3c3d840a0dcaae23e0e2ae32eff2 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/pom.xml
+++ b/alto-core/standard-northbound-routes/networkmap/pom.xml
@@ -23,34 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
+  <modules>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-  </profiles>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>

diff --git a/alto-core/standard-northbound-routes/pom.xml b/alto-core/standard-northbound-routes/pom.xml
index 965d6b3e685e427ff83366c40cea7ca59407ac6d..2bc755c0e0cec03a4d8224006cd6cf34e4c364da 100644 (file)
--- a/alto-core/standard-northbound-routes/pom.xml
+++ b/alto-core/standard-northbound-routes/pom.xml
@@ -23,41 +23,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>networkmap</module>
-        <module>costmap</module>
-        <module>endpointcost</module>
-        <module>endpointproperty</module>
-      </modules>
-    </profile>
+  <modules>
+    <module>networkmap</module>
+    <module>costmap</module>
+    <module>endpointcost</module>
+    <module>endpointproperty</module>
+  </modules>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>example</module>
-        <module>networkmap</module>
-        <module>costmap</module>
-        <module>endpointcost</module>
-        <module>endpointproperty</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>example</module>
-        <module>networkmap</module>
-        <module>costmap</module>
-        <module>endpointcost</module>
-      </modules>
-    </profile>
-  </profiles>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
     <plugins>

diff --git a/alto-core/standard-service-models/model-base/api/pom.xml b/alto-core/standard-service-models/model-base/api/pom.xml
deleted file mode 100644 (file)
index 34ede38..0000000
--- a/alto-core/standard-service-models/model-base/api/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.11.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-base-api</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-base/artifacts/pom.xml b/alto-core/standard-service-models/model-base/artifacts/pom.xml
deleted file mode 100644 (file)
index 06de7d7..0000000
--- a/alto-core/standard-service-models/model-base/artifacts/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../../../</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-base-artifacts</artifactId>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-mode-basel-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-mode-basel-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-mode-basel-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-core/standard-service-models/model-base/features/pom.xml b/alto-core/standard-service-models/model-base/features/pom.xml
deleted file mode 100644 (file)
index 38210cc..0000000
--- a/alto-core/standard-service-models/model-base/features/pom.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-base-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-base/features/src/main/features/features.xml b/alto-core/standard-service-models/model-base/features/src/main/features/features.xml
deleted file mode 100644 (file)
index d22ff85..0000000
--- a/alto-core/standard-service-models/model-base/features/src/main/features/features.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-alto-service-model-base-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-resourcepool-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-basic-types-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-service-model-base-api' version='${project.version}' description='OpenDaylight :: alto-service-model-base :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-basic-types</feature>
-    <feature version='${project.version}'>odl-alto-resourcepool-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version}</bundle>
-  </feature>
-  <feature name='odl-alto-service-model-base' version='${project.version}' description='OpenDaylight :: alto-service-model-base'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-service-model-base-api</feature>
-    <feature version='${project.version}'>odl-alto-resourcepool</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-base-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-service-model-base.xml">mvn:org.opendaylight.alto.core/alto-service-model-base-impl/${project.version}/xml/config</configfile>
-  </feature>
-  <feature name='odl-alto-service-model-base-rest' version='${project.version}' description='OpenDaylight :: alto-service-model-base :: REST'>
-    <feature version="${project.version}">odl-alto-service-model-base</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-  <feature name='odl-alto-service-model-base-ui' version='${project.version}' description='OpenDaylight :: alto-service-model-base :: UI'>
-    <feature version="${project.version}">odl-alto-service-model-base-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-core/standard-service-models/model-base/impl/pom.xml b/alto-core/standard-service-models/model-base/impl/pom.xml
deleted file mode 100644 (file)
index 4910d65..0000000
--- a/alto-core/standard-service-models/model-base/impl/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-base-impl</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-base/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-base/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 2475e5c..0000000
--- a/alto-core/standard-service-models/model-base/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:service:model:test?module=alto-model-base-test-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:service:model:test">prefix:alto-model-base-test</type>
-          <name>alto-model-base-test-impl</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/alto-core/standard-service-models/model-base/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-base/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index 55725fb..0000000
--- a/alto-core/standard-service-models/model-base/impl/src/main/config/maven-metadata-local.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-base-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151022111158</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151022111158</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>

diff --git a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java b/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java
deleted file mode 100644 (file)
index 87bdbe8..0000000
--- a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.impl;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-
-import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils;
-import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListener;
-
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
-
-import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.AltoModelBaseService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.ResourceTypeError;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.QueryInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.QueryOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.QueryOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.alto.response.error.response.ErrorResponseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.alto.response.error.response.error.response.ErrorBuilder;
-
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class AltoModelBaseProvider implements BindingAwareProvider, AutoCloseable, AltoModelBaseService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AltoModelBaseProvider.class);
-
-    private DataBroker m_dataBroker = null;
-    private RoutedRpcRegistration<AltoModelBaseService> m_serviceReg = null;
-    private ListenerRegistration<DataChangeListener> m_listener = null;
-
-    private static final String TEST_BASE_NAME = "test-model-base";
-    private static final ResourceId TEST_BASE_RID = new ResourceId(TEST_BASE_NAME);
-    private InstanceIdentifier<Resource> m_testIID = null;
-
-    protected void createContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-        ResourcepoolUtils.createResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_BASE_NAME, ResourceTypeError.class, wx);
-
-        ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_BASE_NAME, wx);
-
-        wx.submit().get();
-    }
-
-    protected void removeContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-
-        ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_BASE_NAME, wx);
-
-        wx.submit().get();
-    }
-
-    protected void setupListener() {
-        ContextTagListener listener = new ContextTagListener(m_testIID, m_serviceReg);
-        m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                                        m_testIID,listener, DataChangeScope.SUBTREE);
-
-        assert m_listener != null;
-    }
-
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("AltoModelBaseProvider Session Initiated");
-
-        m_dataBroker = session.getSALService(DataBroker.class);
-        m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT, TEST_BASE_NAME);
-        m_serviceReg = session.addRoutedRpcImplementation(AltoModelBaseService.class, this);
-
-        try {
-            setupListener();
-            createContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("AltoModelBaseProvider Closed");
-
-        if (m_serviceReg != null) {
-            m_serviceReg.close();
-        }
-
-        try {
-            removeContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-    @Override
-    public Future<RpcResult<QueryOutput>> query(QueryInput input) {
-        ErrorBuilder errorBuilder = new ErrorBuilder();
-        errorBuilder.setErrorCode("E_TEST");
-
-        ErrorResponseBuilder erBuilder = new ErrorResponseBuilder();
-        erBuilder.setError(errorBuilder.build());
-
-        QueryOutputBuilder builder = new QueryOutputBuilder();
-        builder.setType(ResourceTypeError.class);
-        builder.setResponse(erBuilder.build());
-        return RpcResultBuilder.<QueryOutput>success(builder.build()).buildFuture();
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModule.java b/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModule.java
deleted file mode 100644 (file)
index b0a276f..0000000
--- a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021;
-
-import org.opendaylight.alto.core.impl.AltoModelBaseProvider;
-
-public class AltoModelBaseModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021.AbstractAltoModelBaseModule {
-    public AltoModelBaseModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoModelBaseModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021.AltoModelBaseModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        AltoModelBaseProvider provider = new AltoModelBaseProvider();
-
-        getBrokerDependency().registerProvider(provider);
-        return provider;
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactory.java b/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactory.java
deleted file mode 100644 (file)
index 0883957..0000000
--- a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: model-base-test-impl yang module local name: service-model-base-test
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu Oct 22 11:14:40 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021;
-public class AltoModelBaseModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021.AbstractAltoModelBaseModuleFactory {
-
-}

diff --git a/alto-core/standard-service-models/model-base/impl/src/main/yang/service-model-base-test-impl.yang b/alto-core/standard-service-models/model-base/impl/src/main/yang/service-model-base-test-impl.yang
deleted file mode 100644 (file)
index f2b7395..0000000
--- a/alto-core/standard-service-models/model-base/impl/src/main/yang/service-model-base-test-impl.yang
+++ /dev/null
@@ -1,35 +0,0 @@
-module alto-model-base-test-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:service:model:test";
-    prefix "alto-model-base-test-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for service-model-base project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-model-base-test {
-        base config:module-type;
-        config:java-name-prefix AltoModelBase;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-model-base-test-impl {
-            when "/config:modules/config:module/config:type = 'alto-model-base-test'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactoryTest.java b/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactoryTest.java
deleted file mode 100644 (file)
index 581a838..0000000
--- a/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021;
-
-import org.junit.Test;
-
-public class AltoModelBaseModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoModelBaseModuleFactory();
-    }
-}

diff --git a/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleTest.java b/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleTest.java
deleted file mode 100644 (file)
index 2b0107f..0000000
--- a/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.JmxAttribute;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.alto.core.impl.AltoModelBaseProvider;
-
-import javax.management.ObjectName;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AltoModelBaseModuleTest {
-    @Test
-    public void testCustomValidation() {
-        AltoModelBaseModule module = new AltoModelBaseModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class));
-
-        // ensure no exceptions on validation
-        // currently this method is empty
-        module.customValidation();
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        // configure mocks
-        DependencyResolver dependencyResolver = mock(DependencyResolver.class);
-        BindingAwareBroker broker = mock(BindingAwareBroker.class);
-        when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker);
-
-        // create instance of module with injected mocks
-        AltoModelBaseModule module = new AltoModelBaseModule(mock(ModuleIdentifier.class), dependencyResolver);
-
-        // getInstance calls resolveInstance to get the broker dependency and then calls createInstance
-        AutoCloseable closeable = module.getInstance();
-
-        // verify that the module registered the returned provider with the broker
-        verify(broker).registerProvider((AltoModelBaseProvider)closeable);
-
-        // ensure no exceptions on close
-        closeable.close();
-    }
-}

diff --git a/alto-core/standard-service-models/model-base/it/pom.xml b/alto-core/standard-service-models/model-base/it/pom.xml
deleted file mode 100644 (file)
index cdcf4ea..0000000
--- a/alto-core/standard-service-models/model-base/it/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-base-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.core</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-service-model-base-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-base/it/src/test/java/org/opendaylight/alto/core/it/AltoModelBaseIT.java b/alto-core/standard-service-models/model-base/it/src/test/java/org/opendaylight/alto/core/it/AltoModelBaseIT.java
deleted file mode 100644 (file)
index 7de3a13..0000000
--- a/alto-core/standard-service-models/model-base/it/src/test/java/org/opendaylight/alto/core/it/AltoModelBaseIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoModelBaseIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoModelBaseIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "alto-model-base-test";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "alto-model-base-test-impl";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.core")
-                .artifactId("alto-service-model-base-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-service-model-base-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoModelBaseIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testAltoServiceModelBaseFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-core/standard-service-models/model-base/karaf/pom.xml b/alto-core/standard-service-models/model-base/karaf/pom.xml
deleted file mode 100644 (file)
index 8ae07d3..0000000
--- a/alto-core/standard-service-models/model-base/karaf/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-base-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-service-model-base-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-base-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-core/standard-service-models/model-base/pom.xml b/alto-core/standard-service-models/model-base/pom.xml
index 18ba07c17a7d40ba94d11192c8847194646025a3..2fdcd48228fc2c4658415207eebcb456138bcea8 100644 (file)
--- a/alto-core/standard-service-models/model-base/pom.xml
+++ b/alto-core/standard-service-models/model-base/pom.xml
@@ -1,79 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright © 2015 Yale University and others. All rights reserved.
+
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>2.0.0</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-base-aggregator</artifactId>
+  <artifactId>alto-service-model-base</artifactId>
   <version>0.5.0-SNAPSHOT</version>
   <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-      </modules>
-    </profile>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-basic-types</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>yang-ext</artifactId>
+    </dependency>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  </dependencies>
 </project>

diff --git a/alto-core/standard-service-models/model-base/api/src/main/yang/service-model-base.yang b/alto-core/standard-service-models/model-base/src/main/yang/service-model-base.yang
similarity index 100%
rename from alto-core/standard-service-models/model-base/api/src/main/yang/service-model-base.yang
rename to alto-core/standard-service-models/model-base/src/main/yang/service-model-base.yang

diff --git a/alto-core/standard-service-models/model-config/api/pom.xml b/alto-core/standard-service-models/model-config/api/pom.xml
deleted file mode 100644 (file)
index a6b0312..0000000
--- a/alto-core/standard-service-models/model-config/api/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.11.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-config-api</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-config/artifacts/pom.xml b/alto-core/standard-service-models/model-config/artifacts/pom.xml
deleted file mode 100644 (file)
index 40a0b25..0000000
--- a/alto-core/standard-service-models/model-config/artifacts/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../../../</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-config-artifacts</artifactId>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-config-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-config-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-config-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-core/standard-service-models/model-config/features/pom.xml b/alto-core/standard-service-models/model-config/features/pom.xml
deleted file mode 100644 (file)
index 3d3351e..0000000
--- a/alto-core/standard-service-models/model-config/features/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-config-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>0.11.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-config-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-config-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-config-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-config/features/src/main/features/features.xml b/alto-core/standard-service-models/model-config/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 9f5242e..0000000
--- a/alto-core/standard-service-models/model-config/features/src/main/features/features.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-service-model-config-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-service-model-config-api' version='${project.version}' description='OpenDaylight :: alto-service-model-config :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-service-model-base</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-config-api/${project.version}</bundle>
-  </feature>
-
-  <feature name='odl-alto-service-model-config' version='${project.version}' description='OpenDaylight :: alto-service-model-config'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-service-model-config-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-config-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-service-model-config.xml">mvn:org.opendaylight.alto.core/alto-service-model-config-impl/${project.version}/xml/config</configfile>
-  </feature>
-
-  <feature name='odl-alto-service-model-config-rest' version='${project.version}' description='OpenDaylight :: alto-service-model-config :: REST'>
-    <feature version="${project.version}">odl-alto-service-model-config</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-
-  <feature name='odl-alto-service-model-config-ui' version='${project.version}' description='OpenDaylight :: alto-service-model-config :: UI'>
-    <feature version="${project.version}">odl-alto-service-model-config-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-core/standard-service-models/model-config/impl/pom.xml b/alto-core/standard-service-models/model-config/impl/pom.xml
deleted file mode 100644 (file)
index cbb3e95..0000000
--- a/alto-core/standard-service-models/model-config/impl/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-config-impl</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-config-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-config/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-config/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 1b2e55a..0000000
--- a/alto-core/standard-service-models/model-config/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:service:model:test:config?module=alto-config-test-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:service:model:test:config">prefix:alto-model-config-test</type>
-          <name>alto-config-test</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/alto-core/standard-service-models/model-config/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-config/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index aa67347..0000000
--- a/alto-core/standard-service-models/model-config/impl/src/main/config/maven-metadata-local.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-config-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151028073152</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151028073152</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>

diff --git a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/alto/core/impl/config/test/AltoConfigProvider.java b/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/alto/core/impl/config/test/AltoConfigProvider.java
deleted file mode 100644 (file)
index 49a1964..0000000
--- a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/alto/core/impl/config/test/AltoConfigProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.impl.config.test;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AltoConfigProvider implements BindingAwareProvider, AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AltoConfigProvider.class);
-
-    private DataBroker m_dataBrokerService = null;
-
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("AltoModelConfigProvider Session Initiated");
-        m_dataBrokerService = session.getSALService(DataBroker.class);
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("AltoModelBaseProvider Closed");
-    }
-}

diff --git a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModule.java b/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModule.java
deleted file mode 100644 (file)
index bd3478a..0000000
--- a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021;
-
-import org.opendaylight.alto.core.impl.config.test.AltoConfigProvider;
-
-public class AltoConfigModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021.AbstractAltoConfigModule {
-    public AltoConfigModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoConfigModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021.AltoConfigModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        AltoConfigProvider provider = new AltoConfigProvider();
-
-        getBrokerDependency().registerProvider(provider);
-        return provider;
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactory.java b/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactory.java
deleted file mode 100644 (file)
index 2ff8ef9..0000000
--- a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-config-test-impl yang module local name: alto-model-config-test
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Oct 28 11:47:28 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021;
-public class AltoConfigModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021.AbstractAltoConfigModuleFactory {
-
-}

diff --git a/alto-core/standard-service-models/model-config/impl/src/main/yang/config-impl.yang b/alto-core/standard-service-models/model-config/impl/src/main/yang/config-impl.yang
deleted file mode 100644 (file)
index b890f71..0000000
--- a/alto-core/standard-service-models/model-config/impl/src/main/yang/config-impl.yang
+++ /dev/null
@@ -1,35 +0,0 @@
-module alto-config-test-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:service:model:test:config";
-    prefix "alto-model-config-test-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for config project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-model-config-test {
-        base config:module-type;
-        config:java-name-prefix AltoConfig;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-model-config-test-impl {
-            when "/config:modules/config:module/config:type = 'alto-model-config-test'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactoryTest.java b/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactoryTest.java
deleted file mode 100644 (file)
index 1ddc3bd..0000000
--- a/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021;
-
-import org.junit.Test;
-
-public class AltoConfigModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoConfigModuleFactory();
-    }
-}

diff --git a/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleTest.java b/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleTest.java
deleted file mode 100644 (file)
index ef7ef08..0000000
--- a/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.JmxAttribute;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.alto.core.impl.config.test.AltoConfigProvider;
-
-import javax.management.ObjectName;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AltoConfigModuleTest {
-    @Test
-    public void testCustomValidation() {
-        AltoConfigModule module = new AltoConfigModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class));
-
-        // ensure no exceptions on validation
-        // currently this method is empty
-        module.customValidation();
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        // configure mocks
-        DependencyResolver dependencyResolver = mock(DependencyResolver.class);
-        BindingAwareBroker broker = mock(BindingAwareBroker.class);
-        when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker);
-
-        // create instance of module with injected mocks
-        AltoConfigModule module = new AltoConfigModule(mock(ModuleIdentifier.class), dependencyResolver);
-
-        // getInstance calls resolveInstance to get the broker dependency and then calls createInstance
-        AutoCloseable closeable = module.getInstance();
-
-        // verify that the module registered the returned provider with the broker
-        verify(broker).registerProvider((AltoConfigProvider)closeable);
-
-        // ensure no exceptions on close
-        closeable.close();
-    }
-}

diff --git a/alto-core/standard-service-models/model-config/it/pom.xml b/alto-core/standard-service-models/model-config/it/pom.xml
deleted file mode 100644 (file)
index abc2e53..0000000
--- a/alto-core/standard-service-models/model-config/it/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-config-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.core</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-service-model-config-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-config-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-config/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java b/alto-core/standard-service-models/model-config/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java
deleted file mode 100644 (file)
index c240b3c..0000000
--- a/alto-core/standard-service-models/model-config/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoIrdIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoIrdIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "alto-model-ird-test";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "alto-ird-test";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.core")
-                .artifactId("alto-service-model-ird-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-service-model-ird-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoIrdIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testirdFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-core/standard-service-models/model-config/karaf/pom.xml b/alto-core/standard-service-models/model-config/karaf/pom.xml
deleted file mode 100644 (file)
index 7c57a92..0000000
--- a/alto-core/standard-service-models/model-config/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-config-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-service-model-config-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-config-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-config-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-core/standard-service-models/model-config/pom.xml b/alto-core/standard-service-models/model-config/pom.xml
index 7f1ec1e8f7b875eb0a434e478a80a9f872f075db..16569161fa34fb052165810d378e8ea79e3ba8d8 100644 (file)
--- a/alto-core/standard-service-models/model-config/pom.xml
+++ b/alto-core/standard-service-models/model-config/pom.xml
@@ -1,79 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright © 2015 Yale University and others. All rights reserved.
+
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>2.0.0</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-config-aggregator</artifactId>
+  <artifactId>alto-service-model-config-api</artifactId>
   <version>0.5.0-SNAPSHOT</version>
   <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-      </modules>
-    </profile>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-basic-types</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>yang-ext</artifactId>
+    </dependency>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/alto-core/standard-service-models/model-config/api/src/main/yang/alto-model-config.yang b/alto-core/standard-service-models/model-config/src/main/yang/alto-model-config.yang
similarity index 100%
rename from alto-core/standard-service-models/model-config/api/src/main/yang/alto-model-config.yang
rename to alto-core/standard-service-models/model-config/src/main/yang/alto-model-config.yang

diff --git a/alto-core/standard-service-models/model-costmap/api/pom.xml b/alto-core/standard-service-models/model-costmap/api/pom.xml
deleted file mode 100644 (file)
index 9411265..0000000
--- a/alto-core/standard-service-models/model-costmap/api/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.11.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-costmap-api</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-costmap/artifacts/pom.xml b/alto-core/standard-service-models/model-costmap/artifacts/pom.xml
deleted file mode 100644 (file)
index 79461f9..0000000
--- a/alto-core/standard-service-models/model-costmap/artifacts/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-costmap-artifacts</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-costmap-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-costmap-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-costmap-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-core/standard-service-models/model-costmap/features/pom.xml b/alto-core/standard-service-models/model-costmap/features/pom.xml
deleted file mode 100644 (file)
index 37c8d64..0000000
--- a/alto-core/standard-service-models/model-costmap/features/pom.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public  License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-costmap-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-costmap/features/src/main/features/features.xml b/alto-core/standard-service-models/model-costmap/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 73b91bb..0000000
--- a/alto-core/standard-service-models/model-costmap/features/src/main/features/features.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-service-model-costmap-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-service-model-costmap-api' version='${project.version}' description='OpenDaylight :: alto-service-model-costmap :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-service-model-base</feature>
-    <feature version='${project.version}'>odl-alto-service-model-networkmap-api</feature>
-    <feature version='${project.version}'>odl-alto-service-model-endpointcost-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-costmap-api/${project.version}</bundle>
-  </feature>
-
-  <feature name='odl-alto-service-model-costmap' version='${project.version}' description='OpenDaylight :: alto-service-model-costmap'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-service-model-costmap-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-costmap-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-service-model-costmap.xml">mvn:org.opendaylight.alto.core/alto-service-model-costmap-impl/${project.version}/xml/config</configfile>
-  </feature>
-
-  <feature name='odl-alto-service-model-costmap-rest' version='${project.version}' description='OpenDaylight :: alto-service-model-costmap :: REST'>
-    <feature version="${project.version}">odl-alto-service-model-costmap</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-
-  <feature name='odl-alto-service-model-costmap-ui' version='${project.version}' description='OpenDaylight :: alto-service-model-costmap :: UI'>
-    <feature version="${project.version}">odl-alto-service-model-costmap-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-core/standard-service-models/model-costmap/impl/pom.xml b/alto-core/standard-service-models/model-costmap/impl/pom.xml
deleted file mode 100644 (file)
index 5840a8b..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-costmap-impl</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-costmap/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index edbc005..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:service:model:test:costmap?module=alto-costmap-test-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:service:model:test:costmap">prefix:alto-model-costmap-test</type>
-          <name>alto-costmap-test</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-costmap/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index 66c25f7..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/src/main/config/maven-metadata-local.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-costmap-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151028073152</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151028073152</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java b/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java
deleted file mode 100644 (file)
index 1d96023..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.impl.costmap.test;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils;
-import org.opendaylight.alto.core.service.model.costmap.CostmapUtils;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-
-import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.CapabilitiesBuilder;
-
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.AltoModelCostmapService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeCostmap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeFilteredCostmap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.alto.request.costmap.request.CostmapRequest;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.alto.response.costmap.response.CostmapResponseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.cost.type.data.CostType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.request.data.CostmapParams;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.CostmapResponseDataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.CostmapSource;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.CostmapSourceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.costmap.source.CostmapDestination;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.costmap.source.CostmapDestinationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.costmap.source.costmap.destination.Cost;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rfc7285.rev151021.costmap.filter.data.CostmapFilter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rfc7285.rev151021.query.input.request.costmap.request.costmap.params.filter.CostmapFilterData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rfc7285.rev151021.query.output.response.costmap.response.costmap.response.data.costmap.source.costmap.destination.cost.NumericalBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rfc7285.rev151021.query.output.response.costmap.response.costmap.response.data.costmap.source.costmap.destination.cost.OrdinalBuilder;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostTypeBuilder;
-
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AltoCostmapProvider implements BindingAwareProvider, AutoCloseable, AltoModelCostmapService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AltoCostmapProvider.class);
-
-
-    private DataBroker m_dataBroker = null;
-    private BindingAwareBroker.RoutedRpcRegistration<AltoModelCostmapService> m_serviceReg = null;
-    private ListenerRegistration<DataChangeListener> m_listener=null;
-
-    private static final String TEST_COSTMAP_NAME="test-model-costmap";
-    private static final String TEST_FILTERED_COSTMAP_NAME="test-model-filtered-costmap";
-    private static final ResourceId TEST_COSTMAP_RID = new ResourceId(TEST_COSTMAP_NAME);
-    private static final CostMetric COST_METRIC_ROUTINGCOST = new CostMetric("routingcost");
-    private static final String COST_MODE_ORDINAL = "ordinal";
-    private InstanceIdentifier<Resource> m_testIID = null;
-
-    protected void createContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-
-        CapabilitiesCostTypeBuilder cctBuilder = new CapabilitiesCostTypeBuilder();
-        cctBuilder.setCostType(Arrays.asList(
-                CostmapUtils.createCostTypeCapability(COST_METRIC_ROUTINGCOST,
-                        COST_MODE_ORDINAL)
-        ));
-        CapabilitiesBuilder builder = new CapabilitiesBuilder();
-        builder.addAugmentation(CapabilitiesCostType.class, cctBuilder.build());
-
-        ResourcepoolUtils.createResourceWithCapabilities(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_COSTMAP_NAME,
-                ResourceTypeCostmap.class,
-                builder.build(), wx);
-
-        ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_COSTMAP_NAME, wx);
-
-        ResourcepoolUtils.createResourceWithCapabilities(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_FILTERED_COSTMAP_NAME,
-                ResourceTypeFilteredCostmap.class,
-                builder.build(), wx);
-
-        ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_FILTERED_COSTMAP_NAME, wx);
-
-        wx.submit().get();
-    }
-
-
-    protected void removeContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-
-        ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_COSTMAP_NAME, wx);
-
-        wx.submit().get();
-    }
-
-    protected void setupListener() {
-        ResourcepoolUtils.ContextTagListener listener = new ResourcepoolUtils.ContextTagListener(m_testIID, m_serviceReg);
-        m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                m_testIID,listener, AsyncDataBroker.DataChangeScope.SUBTREE);
-
-        assert m_listener != null;
-    }
-
-    @Override
-    public void onSessionInitiated(BindingAwareBroker.ProviderContext session) {
-        LOG.info("AltoModelCostmapProvider Session Initiated");
-
-        m_dataBroker = session.getSALService(DataBroker.class);
-        m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_COSTMAP_NAME);
-        m_serviceReg = session.addRoutedRpcImplementation(AltoModelCostmapService.class, this);
-
-
-        try{
-            setupListener();
-            createContextTag();
-        } catch (Exception e){
-        }
-
-    }
-
-    protected Cost createNumericalCost(double cost) {
-        NumericalBuilder builder;
-        builder = new NumericalBuilder();
-        builder.setCost(new BigDecimal(cost));
-        return builder.build();
-    }
-
-    protected Cost createOrdinalCost(int order) {
-        OrdinalBuilder builder=new OrdinalBuilder();
-        builder.setCost(order);
-        return builder.build();
-    }
-
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("AltoModelCostProvider Closed");
-
-        if (m_serviceReg != null) {
-            m_serviceReg.close();
-        }
-
-        try {
-            removeContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-
-
-
-    @Override
-    public Future<RpcResult<QueryOutput>> query(QueryInput input) {
-        if (!input.getType().equals(ResourceTypeCostmap.class)
-                && !input.getType().equals(ResourceTypeFilteredCostmap.class)) {
-            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-        }
-
-        CostmapRequest request = (CostmapRequest)input.getRequest();
-        CostmapParams params = request.getCostmapParams();
-
-        CostType costType = params.getCostType();
-//        if(!(params.getFilter() instanceof CostmapFilter)){
-//            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-//        }
-//        if(!costType.getCostMode().equals("ordinal")){
-//            LOG.warn(costType.getCostMode().toString());
-//            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-//        }
-//        if(!costType.getCostMetric().equals(COST_METRIC_ROUTINGCOST)){
-//            LOG.warn(costType.getCostMetric().toString());
-//            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-//        }
-        LOG.info("query test3");
-
-        CostmapFilter costmapFilter=((CostmapFilterData)params.getFilter()).getCostmapFilter();
-        List<PidName> pid_src=costmapFilter.getPidSource();
-        List<PidName> pid_dst=costmapFilter.getPidDestination();
-        int order = 0;
-        LinkedList<CostmapSource> costmapSources = new LinkedList<CostmapSource>();
-        for(PidName src:pid_src){
-            LinkedList<CostmapDestination> costmapDestinations= new LinkedList<CostmapDestination>();
-
-            for (PidName dst : pid_dst){
-                CostmapDestinationBuilder costmapDestinationBuilder= new CostmapDestinationBuilder();
-                costmapDestinationBuilder.setPidDestination(dst);
-                costmapDestinationBuilder.setCost(createOrdinalCost(++order));
-                costmapDestinations.add(costmapDestinationBuilder.build());
-            }
-            CostmapSourceBuilder costmapSourceBuilder= new CostmapSourceBuilder();
-            costmapSourceBuilder.setPidSource(src);
-            costmapSourceBuilder.setCostmapDestination(costmapDestinations);
-            costmapSources.add(costmapSourceBuilder.build());
-        }
-
-
-
-
-
-        CostmapResponseDataBuilder costmapResponseDataBuilder= new CostmapResponseDataBuilder();
-        costmapResponseDataBuilder.setCostType(costType);
-        costmapResponseDataBuilder.setCostmapSource(costmapSources);
-
-        CostmapResponseBuilder costmapResponseBuilder= new CostmapResponseBuilder();
-        costmapResponseBuilder.setCostmapResponseData(costmapResponseDataBuilder.build());
-
-
-        QueryOutputBuilder builder = new QueryOutputBuilder();
-
-        builder.setType(ResourceTypeCostmap.class).setResponse(costmapResponseBuilder.build());
-
-
-        return RpcResultBuilder.<QueryOutput>success(builder.build()).buildFuture();
-    }
-}

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModule.java b/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModule.java
deleted file mode 100644 (file)
index bbc4a3c..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021;
-
-import org.opendaylight.alto.core.impl.costmap.test.AltoCostmapProvider;
-
-public class AltoCostmapModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021.AbstractAltoCostmapModule {
-    public AltoCostmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoCostmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021.AltoCostmapModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        AltoCostmapProvider provider = new AltoCostmapProvider();
-        getBrokerDependency().registerProvider(provider);
-        return provider;
-
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactory.java b/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactory.java
deleted file mode 100644 (file)
index 94d39b8..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-costmap-test-impl yang module local name: alto-model-costmap-test
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon Nov 23 10:49:33 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021;
-public class AltoCostmapModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021.AbstractAltoCostmapModuleFactory {
-
-}

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/yang/costmap-impl.yang b/alto-core/standard-service-models/model-costmap/impl/src/main/yang/costmap-impl.yang
deleted file mode 100644 (file)
index 21f8716..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/src/main/yang/costmap-impl.yang
+++ /dev/null
@@ -1,35 +0,0 @@
-module alto-costmap-test-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:service:model:test:costmap";
-    prefix "alto-model-costmap-test-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for costmap project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-model-costmap-test {
-        base config:module-type;
-        config:java-name-prefix AltoCostmap;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-model-costmap-test-impl {
-            when "/config:modules/config:module/config:type = 'alto-model-costmap-test'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactoryTest.java b/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactoryTest.java
deleted file mode 100644 (file)
index ca8d6e3..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021;
-
-import org.junit.Test;
-
-public class AltoCostmapModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoCostmapModuleFactory();
-    }
-}

diff --git a/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleTest.java b/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleTest.java
deleted file mode 100644 (file)
index ed42656..0000000
--- a/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.JmxAttribute;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.alto.core.impl.costmap.test.AltoCostmapProvider;
-
-import javax.management.ObjectName;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AltoCostmapModuleTest {
-    @Test
-    public void testCustomValidation() {
-        AltoCostmapModule module = new AltoCostmapModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class));
-
-        // ensure no exceptions on validation
-        // currently this method is empty
-        module.customValidation();
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        // configure mocks
-        DependencyResolver dependencyResolver = mock(DependencyResolver.class);
-        BindingAwareBroker broker = mock(BindingAwareBroker.class);
-            when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker);
-
-        // create instance of module with injected mocks
-        AltoCostmapModule module = new AltoCostmapModule(mock(ModuleIdentifier.class), dependencyResolver);
-
-        // getInstance calls resolveInstance to get the broker dependency and then calls createInstance
-        AutoCloseable closeable = module.getInstance();
-
-        // verify that the module registered the returned provider with the broker
-        verify(broker).registerProvider((AltoCostmapProvider)closeable);
-
-        // ensure no exceptions on close
-        closeable.close();
-    }
-}

diff --git a/alto-core/standard-service-models/model-costmap/it/pom.xml b/alto-core/standard-service-models/model-costmap/it/pom.xml
deleted file mode 100644 (file)
index ce83a20..0000000
--- a/alto-core/standard-service-models/model-costmap/it/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-costmap-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.core</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-service-model-costmap-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-costmap/it/src/test/java/org/opendaylight/alto/core/it/AltoCostmapIT.java b/alto-core/standard-service-models/model-costmap/it/src/test/java/org/opendaylight/alto/core/it/AltoCostmapIT.java
deleted file mode 100644 (file)
index 18f4230..0000000
--- a/alto-core/standard-service-models/model-costmap/it/src/test/java/org/opendaylight/alto/core/it/AltoCostmapIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoCostmapIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoCostmapIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "alto-model-costmap-test";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "alto-costmap-test";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.core")
-                .artifactId("alto-service-model-costmap-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-service-model-costmap-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoCostmapIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testcostmapFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-core/standard-service-models/model-costmap/karaf/pom.xml b/alto-core/standard-service-models/model-costmap/karaf/pom.xml
deleted file mode 100644 (file)
index dc208c7..0000000
--- a/alto-core/standard-service-models/model-costmap/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-costmap-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-service-model-costmap-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-costmap-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-costmap-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-core/standard-service-models/model-costmap/pom.xml b/alto-core/standard-service-models/model-costmap/pom.xml
index 26d8cb7913f339a0525b314890fd4b37efd9e0b7..ffec947626610b2c5dd8b3017c79674c0260337e 100644 (file)
--- a/alto-core/standard-service-models/model-costmap/pom.xml
+++ b/alto-core/standard-service-models/model-costmap/pom.xml
@@ -1,81 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright © 2015 Yale University and others. All rights reserved.
+
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>2.0.0</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-costmap-aggregator</artifactId>
+  <artifactId>alto-service-model-costmap</artifactId>
   <version>0.5.0-SNAPSHOT</version>
   <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-basic-types</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-      </activation>
-      <modules>
-        <module>api</module>
-      </modules>
-    </profile>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-endpointcost</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>yang-ext</artifactId>
+    </dependency>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/alto-core/standard-service-models/model-costmap/api/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java b/alto-core/standard-service-models/model-costmap/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java
similarity index 100%
rename from alto-core/standard-service-models/model-costmap/api/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java
rename to alto-core/standard-service-models/model-costmap/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java

diff --git a/alto-core/standard-service-models/model-costmap/api/src/main/yang/alto-model-costmap-rfc7285.yang b/alto-core/standard-service-models/model-costmap/src/main/yang/alto-model-costmap-rfc7285.yang
similarity index 100%
rename from alto-core/standard-service-models/model-costmap/api/src/main/yang/alto-model-costmap-rfc7285.yang
rename to alto-core/standard-service-models/model-costmap/src/main/yang/alto-model-costmap-rfc7285.yang

diff --git a/alto-core/standard-service-models/model-costmap/api/src/main/yang/alto-model-costmap.yang b/alto-core/standard-service-models/model-costmap/src/main/yang/alto-model-costmap.yang
similarity index 100%
rename from alto-core/standard-service-models/model-costmap/api/src/main/yang/alto-model-costmap.yang
rename to alto-core/standard-service-models/model-costmap/src/main/yang/alto-model-costmap.yang

diff --git a/alto-core/standard-service-models/model-endpointcost/api/pom.xml b/alto-core/standard-service-models/model-endpointcost/api/pom.xml
deleted file mode 100644 (file)
index 81816ca..0000000
--- a/alto-core/standard-service-models/model-endpointcost/api/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.11.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointcost-api</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-endpointcost/artifacts/pom.xml b/alto-core/standard-service-models/model-endpointcost/artifacts/pom.xml
deleted file mode 100644 (file)
index 3dc49ac..0000000
--- a/alto-core/standard-service-models/model-endpointcost/artifacts/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../../../</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointcost-artifacts</artifactId>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-endpointcost-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-endpointcost-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-endpointcost-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-core/standard-service-models/model-endpointcost/features/pom.xml b/alto-core/standard-service-models/model-endpointcost/features/pom.xml
deleted file mode 100644 (file)
index b136280..0000000
--- a/alto-core/standard-service-models/model-endpointcost/features/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointcost-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-endpointcost/features/src/main/features/features.xml b/alto-core/standard-service-models/model-endpointcost/features/src/main/features/features.xml
deleted file mode 100644 (file)
index e5968cf..0000000
--- a/alto-core/standard-service-models/model-endpointcost/features/src/main/features/features.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-service-model-endpointcost-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-service-model-endpointcost-api' version='${project.version}' description='OpenDaylight :: alto-service-model-endpointcost :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-service-model-base</feature>
-    <feature version='${project.version}'>odl-alto-service-model-networkmap-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-api/${project.version}</bundle>
-  </feature>
-
-  <feature name='odl-alto-service-model-endpointcost' version='${project.version}' description='OpenDaylight :: alto-service-model-endpointcost'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-service-model-endpointcost-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-service-model-endpointcost.xml">mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-impl/${project.version}/xml/config</configfile>
-  </feature>
-
-  <feature name='odl-alto-service-model-endpointcost-rest' version='${project.version}' description='OpenDaylight :: alto-service-model-endpointcost :: REST'>
-    <feature version="${project.version}">odl-alto-service-model-endpointcost</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-
-  <feature name='odl-alto-service-model-endpointcost-ui' version='${project.version}' description='OpenDaylight :: alto-service-model-endpointcost :: UI'>
-    <feature version="${project.version}">odl-alto-service-model-endpointcost-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/pom.xml b/alto-core/standard-service-models/model-endpointcost/impl/pom.xml
deleted file mode 100644 (file)
index 9dabb49..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointcost-impl</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index cad56de..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:service:model:test:endpointcost?module=alto-endpointcost-test-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:service:model:test:endpointcost">prefix:alto-model-endpointcost-test</type>
-          <name>alto-endpointcost-test</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index de7797c..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/maven-metadata-local.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointcost-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151028073152</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151028073152</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java b/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java
deleted file mode 100644 (file)
index d268a3b..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.impl.endpointcost.test;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-
-import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils;
-import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListener;
-import org.opendaylight.alto.core.service.model.endpointcost.EndpointcostUtils;
-
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostTypeData;
-
-import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.CapabilitiesBuilder;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.AltoModelEndpointcostService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostTypeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.ResourceTypeEndpointcost;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.alto.request.endpointcost.request.EndpointcostRequest;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.alto.response.endpointcost.response.EndpointcostResponseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.endpointcost.request.data.EndpointcostParams;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv4AddressData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv6AddressData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.TypedAddressData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpoint.filter.data.EndpointFilter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.EndpointCostMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.EndpointCost;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.EndpointCostBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.endpoint.cost.Cost;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.endpoint.cost.DestinationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.endpoint.cost.SourceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.input.request.endpointcost.request.endpointcost.params.filter.EndpointFilterData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.EndpointCostmapDataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.cost.NumericalBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.cost.OrdinalBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.typed.address.data.Address;
-
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AltoEndpointCostProvider implements BindingAwareProvider, AutoCloseable, AltoModelEndpointcostService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AltoEndpointCostProvider.class);
-
-    private DataBroker m_dataBroker = null;
-    private RoutedRpcRegistration<AltoModelEndpointcostService> m_serviceReg = null;
-    private ListenerRegistration<DataChangeListener> m_listener = null;
-
-    private static final String TEST_ENDPOINTCOST_NAME = "test-model-endpointcost";
-    private static final ResourceId TEST_ENDPOINTCOST_RID = new ResourceId(TEST_ENDPOINTCOST_NAME);
-    private static final CostMetric COST_METRIC_ROUTINGCOST = new CostMetric("routingcost");
-    private static final String COST_MODE_ORDINAL = "ordinal";
-    private InstanceIdentifier<Resource> m_testIID = null;
-
-    protected void createContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-
-        CapabilitiesCostTypeBuilder cctBuilder = new CapabilitiesCostTypeBuilder();
-        cctBuilder.setCostType(Arrays.asList(
-                EndpointcostUtils.createCostTypeCapability(COST_METRIC_ROUTINGCOST,
-                                                            COST_MODE_ORDINAL)
-        ));
-        CapabilitiesBuilder builder = new CapabilitiesBuilder();
-        builder.addAugmentation(CapabilitiesCostType.class, cctBuilder.build());
-
-        ResourcepoolUtils.createResourceWithCapabilities(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_ENDPOINTCOST_NAME,
-                                            ResourceTypeEndpointcost.class,
-                                            builder.build(), wx);
-
-        ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_ENDPOINTCOST_NAME, wx);
-
-        wx.submit().get();
-    }
-
-    protected void removeContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-
-        ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_ENDPOINTCOST_NAME, wx);
-
-        wx.submit().get();
-    }
-
-    protected void setupListener() {
-        ContextTagListener listener = new ContextTagListener(m_testIID, m_serviceReg);
-        m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                                        m_testIID,listener, DataChangeScope.SUBTREE);
-
-        assert m_listener != null;
-    }
-
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("AltoModelEndpointCostProvider Session Initiated");
-
-        m_dataBroker = session.getSALService(DataBroker.class);
-        m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                                        TEST_ENDPOINTCOST_NAME);
-        m_serviceReg = session.addRoutedRpcImplementation(AltoModelEndpointcostService.class, this);
-
-        try {
-            setupListener();
-            createContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("AltoModelBaseProvider Closed");
-
-        if (m_serviceReg != null) {
-            m_serviceReg.close();
-        }
-
-        try {
-            removeContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-    protected Cost createNumericalCost(double cost) {
-        NumericalBuilder builder;
-        builder = new NumericalBuilder();
-
-        builder.setCost(new BigDecimal(cost));
-        return builder.build();
-    }
-
-    protected Cost createOrdinalCost(int order) {
-        OrdinalBuilder builder;
-        builder = new OrdinalBuilder();
-
-        builder.setCost(order);
-        return builder.build();
-    }
-
-    protected Address createSourceAddress(Address from) {
-        if (from instanceof Ipv4AddressData) {
-            org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.source.address.Ipv4Builder builder;
-            builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.source.address.Ipv4Builder();
-
-            builder.fieldsFrom((Ipv4AddressData)from);
-            return builder.build();
-        } else if (from instanceof Ipv6AddressData) {
-            org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.source.address.Ipv6Builder builder;
-            builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.source.address.Ipv6Builder();
-
-            builder.fieldsFrom((Ipv6AddressData)from);
-            return builder.build();
-}
-        return null;
-    }
-
-    protected Address createDestinationAddress(Address from) {
-        if (from instanceof Ipv4AddressData) {
-            org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.destination.address.Ipv4Builder builder;
-            builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.destination.address.Ipv4Builder();
-
-            builder.fieldsFrom((Ipv4AddressData)from);
-            return builder.build();
-        } else if (from instanceof Ipv6AddressData) {
-            org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.destination.address.Ipv6Builder builder;
-            builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.destination.address.Ipv6Builder();
-
-            builder.fieldsFrom((Ipv6AddressData)from);
-            return builder.build();
-}
-        return null;
-    }
-
-    @Override
-    public Future<RpcResult<QueryOutput>> query(QueryInput input) {
-        if (!input.getType().equals(ResourceTypeEndpointcost.class)) {
-            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-        }
-        EndpointcostRequest request = (EndpointcostRequest)input.getRequest();
-        EndpointcostParams params = request.getEndpointcostParams();
-
-        CostTypeData costType = params.getCostType();
-        if (!costType.getCostMode().equals(COST_MODE_ORDINAL)) {
-            LOG.warn(costType.getCostMode().toString());
-            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-        }
-        if (!costType.getCostMetric().equals(COST_METRIC_ROUTINGCOST)) {
-            LOG.warn(costType.getCostMetric().toString());
-            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-        }
-
-        if (!(params.getFilter() instanceof EndpointFilterData)) {
-            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-        }
-
-        EndpointFilter filter = ((EndpointFilterData)params.getFilter()).getEndpointFilter();
-        List<? extends TypedAddressData> source = filter.getSource();
-        List<? extends TypedAddressData> destination = filter.getDestination();
-
-        int order = 0;
-        LinkedList<EndpointCost> ecList = new LinkedList<EndpointCost>();
-        for (TypedAddressData src: source) {
-            for (TypedAddressData dst: destination) {
-                SourceBuilder srcBuilder = new SourceBuilder();
-                srcBuilder.setAddress(createSourceAddress(src.getAddress()));
-
-                DestinationBuilder dstBuilder = new DestinationBuilder();
-                dstBuilder.setAddress(createDestinationAddress(dst.getAddress()));
-
-
-                EndpointCostBuilder ecBuilder = new EndpointCostBuilder();
-                ecBuilder.setSource(srcBuilder.build());
-                ecBuilder.setDestination(dstBuilder.build());
-                ecBuilder.setCost(createOrdinalCost(++order));
-
-                ecList.add(ecBuilder.build());
-            }
-        }
-
-        EndpointCostMapBuilder ecmBuilder = new EndpointCostMapBuilder();
-        ecmBuilder.setEndpointCost(ecList);
-
-        EndpointCostmapDataBuilder ecmdBuilder = new EndpointCostmapDataBuilder();
-        ecmdBuilder.setEndpointCostMap(ecmBuilder.build());
-
-        EndpointcostResponseBuilder ecrBuilder = new EndpointcostResponseBuilder();
-        ecrBuilder.setEndpointcostData(ecmdBuilder.build());
-
-        QueryOutputBuilder builder = new QueryOutputBuilder();
-        builder.setType(ResourceTypeEndpointcost.class).setResponse(ecrBuilder.build());
-        return RpcResultBuilder.<QueryOutput>success(builder.build()).buildFuture();
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModule.java b/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModule.java
deleted file mode 100644 (file)
index 8b83686..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021;
-
-import org.opendaylight.alto.core.impl.endpointcost.test.AltoEndpointCostProvider;
-
-public class AltoEndpointCostModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021.AbstractAltoEndpointCostModule {
-    public AltoEndpointCostModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoEndpointCostModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021.AltoEndpointCostModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        AltoEndpointCostProvider provider = new AltoEndpointCostProvider();
-
-        getBrokerDependency().registerProvider(provider);
-        return provider;
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactory.java b/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactory.java
deleted file mode 100644 (file)
index beaac02..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-endpointcost-test-impl yang module local name: alto-model-endpointcost-test
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Oct 28 21:04:15 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021;
-public class AltoEndpointCostModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021.AbstractAltoEndpointCostModuleFactory {
-
-}

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/yang/alto-endpoint-test-impl.yang b/alto-core/standard-service-models/model-endpointcost/impl/src/main/yang/alto-endpoint-test-impl.yang
deleted file mode 100644 (file)
index afee1fa..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/yang/alto-endpoint-test-impl.yang
+++ /dev/null
@@ -1,35 +0,0 @@
-module alto-endpointcost-test-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:service:model:test:endpointcost";
-    prefix "alto-model-endpointcost-test-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for endpointcost project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-model-endpointcost-test {
-        base config:module-type;
-        config:java-name-prefix AltoEndpointCost;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-model-endpointcost-test-impl {
-            when "/config:modules/config:module/config:type = 'alto-model-endpointcost-test'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactoryTest.java b/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactoryTest.java
deleted file mode 100644 (file)
index 64c8684..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021;
-
-import org.junit.Test;
-
-public class AltoEndpointCostModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoEndpointCostModuleFactory();
-    }
-}

diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleTest.java b/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleTest.java
deleted file mode 100644 (file)
index ce088dd..0000000
--- a/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.JmxAttribute;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.alto.core.impl.endpointcost.test.AltoEndpointCostProvider;
-
-import javax.management.ObjectName;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AltoEndpointCostModuleTest {
-    @Test
-    public void testCustomValidation() {
-        AltoEndpointCostModule module = new AltoEndpointCostModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class));
-
-        // ensure no exceptions on validation
-        // currently this method is empty
-        module.customValidation();
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        // configure mocks
-        DependencyResolver dependencyResolver = mock(DependencyResolver.class);
-        BindingAwareBroker broker = mock(BindingAwareBroker.class);
-        when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker);
-
-        // create instance of module with injected mocks
-        AltoEndpointCostModule module = new AltoEndpointCostModule(mock(ModuleIdentifier.class), dependencyResolver);
-
-        // getInstance calls resolveInstance to get the broker dependency and then calls createInstance
-        AutoCloseable closeable = module.getInstance();
-
-        // verify that the module registered the returned provider with the broker
-        verify(broker).registerProvider((AltoEndpointCostProvider)closeable);
-
-        // ensure no exceptions on close
-        closeable.close();
-    }
-}

diff --git a/alto-core/standard-service-models/model-endpointcost/it/pom.xml b/alto-core/standard-service-models/model-endpointcost/it/pom.xml
deleted file mode 100644 (file)
index 22feaef..0000000
--- a/alto-core/standard-service-models/model-endpointcost/it/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointcost-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.core</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-service-model-endpointcost-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-endpointcost/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java b/alto-core/standard-service-models/model-endpointcost/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java
deleted file mode 100644 (file)
index 533f25c..0000000
--- a/alto-core/standard-service-models/model-endpointcost/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoEndpointcostIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoEndpointcostIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "alto-model-endpointcost-test";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "alto-endpointcost-test";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.core")
-                .artifactId("alto-service-model-endpointcost-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-service-model-endpointcost-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoEndpointcostIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testendpointcostFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-core/standard-service-models/model-endpointcost/karaf/pom.xml b/alto-core/standard-service-models/model-endpointcost/karaf/pom.xml
deleted file mode 100644 (file)
index bb15f34..0000000
--- a/alto-core/standard-service-models/model-endpointcost/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointcost-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-service-model-endpointcost-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-endpointcost-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointcost-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-core/standard-service-models/model-endpointcost/pom.xml b/alto-core/standard-service-models/model-endpointcost/pom.xml
index 170c774e50a8514846b380c9e6c94f901b1fa171..2a18b57a2c1fca47575cc561b0a649fdd1b89e41 100644 (file)
--- a/alto-core/standard-service-models/model-endpointcost/pom.xml
+++ b/alto-core/standard-service-models/model-endpointcost/pom.xml
@@ -1,79 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright © 2015 Yale University and others. All rights reserved.
+
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>2.0.0</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointcost-aggregator</artifactId>
+  <artifactId>alto-service-model-endpointcost</artifactId>
   <version>0.5.0-SNAPSHOT</version>
   <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-      </modules>
-    </profile>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-basic-types</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-networkmap</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>yang-ext</artifactId>
+    </dependency>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/alto-core/standard-service-models/model-endpointcost/api/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java b/alto-core/standard-service-models/model-endpointcost/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java
similarity index 100%
rename from alto-core/standard-service-models/model-endpointcost/api/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java
rename to alto-core/standard-service-models/model-endpointcost/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java

diff --git a/alto-core/standard-service-models/model-endpointcost/api/src/main/yang/alto-model-endpointcost-rfc7285.yang b/alto-core/standard-service-models/model-endpointcost/src/main/yang/alto-model-endpointcost-rfc7285.yang
similarity index 100%
rename from alto-core/standard-service-models/model-endpointcost/api/src/main/yang/alto-model-endpointcost-rfc7285.yang
rename to alto-core/standard-service-models/model-endpointcost/src/main/yang/alto-model-endpointcost-rfc7285.yang

diff --git a/alto-core/standard-service-models/model-endpointcost/api/src/main/yang/alto-model-endpointcost.yang b/alto-core/standard-service-models/model-endpointcost/src/main/yang/alto-model-endpointcost.yang
similarity index 100%
rename from alto-core/standard-service-models/model-endpointcost/api/src/main/yang/alto-model-endpointcost.yang
rename to alto-core/standard-service-models/model-endpointcost/src/main/yang/alto-model-endpointcost.yang

diff --git a/alto-core/standard-service-models/model-endpointproperty/api/pom.xml b/alto-core/standard-service-models/model-endpointproperty/api/pom.xml
deleted file mode 100644 (file)
index 569b31e..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/api/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.11.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointproperty-api</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-endpointproperty/artifacts/pom.xml b/alto-core/standard-service-models/model-endpointproperty/artifacts/pom.xml
deleted file mode 100644 (file)
index 85d6da6..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/artifacts/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointproperty-artifacts</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-endpointproperty-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-endpointproperty-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-endpointproperty-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-core/standard-service-models/model-endpointproperty/features/pom.xml b/alto-core/standard-service-models/model-endpointproperty/features/pom.xml
deleted file mode 100644 (file)
index 145a1d1..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/features/pom.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointproperty-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointproperty-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointproperty-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointproperty-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-northbound-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-northbound-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-northbound-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-ird-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.basic</groupId>
-      <artifactId>alto-simple-ird-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-northbound-route-endpointproperty-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-northbound-route-endpointproperty-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-northbound-route-endpointproperty-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-endpointproperty/features/src/main/features/features.xml b/alto-core/standard-service-models/model-endpointproperty/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 127e9f5..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/features/src/main/features/features.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-service-model-endpointproperty-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-service-model-endpointproperty-api' version='${project.version}' description='OpenDaylight :: alto-service-model-endpointproperty :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-service-model-base</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-api/${project.version}</bundle>
-  </feature>
-
-  <feature name='odl-alto-service-model-endpointproperty' version='${project.version}' description='OpenDaylight :: alto-service-model-endpointproperty'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-service-model-endpointproperty-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-northbound.xml">
-      mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}/xml/config
-    </configfile>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-service-model-endpointproperty.xml">mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-impl/${project.version}/xml/config</configfile>
-  </feature>
-
-  <feature name='odl-alto-service-model-endpointproperty-rest' version='${project.version}' description='OpenDaylight :: alto-service-model-endpointproperty :: REST'>
-    <feature version="${project.version}">odl-alto-service-model-endpointproperty</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-
-  <feature name='odl-alto-service-model-endpointproperty-ui' version='${project.version}' description='OpenDaylight :: alto-service-model-endpointproperty :: UI'>
-    <feature version="${project.version}">odl-alto-service-model-endpointproperty-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-  <feature name='odl-alto-standard-types' version='${project.version}'
-           description='OpenDaylight :: alto :: standard-types'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-basic-types/${project.version}</bundle>
-  </feature>
-<!--
-  <feature name='odl-alto-standard-service-models-test' version='${project.version}'
-           description='OpenDaylight :: alto :: standard-service-model'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-
-    <feature version='${project.version}'>odl-alto-standard-types</feature>
-    <feature version='${project.version}'>odl-alto-resourcepool</feature>
-
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-service-model-endpointproperty.xml">
-      mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-impl/${project.version}/xml/config
-    </configfile>
-  </feature>
--->
-  <feature name='odl-alto-standard-northbound-route-endpointproperty' version='${project.version}'
-           description='OpenDaylight :: alto :: standard-northbound-route'>
-    <!-- TODO standard routes for network map/cost map/endpoint cost/endpoint property -->
-    <feature version='${project.version}'>odl-alto-standard-service-models</feature>
-    <feature version='${project.version}'>odl-alto-northbound</feature>
-
-    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-endpointproperty-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-route-endpointproperty-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-northbound-route-endpointproperty.xml">
-      mvn:org.opendaylight.alto.core/alto-northbound-route-endpointproperty-impl/${project.version}/xml/config
-    </configfile>
-  </feature>
-
-  <feature name='odl-alto-northbound' version='${project.version}'
-           description='OpenDaylight :: alto :: northbound'>
-    <feature version="${restconf.version}">odl-restconf</feature>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-
-    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-northbound.xml">
-      mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}/xml/config
-    </configfile>
-  </feature>
-
-  <feature name='odl-alto-standard-service-models' version='${project.version}'
-           description='OpenDaylight :: alto :: standard-service-model'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-standard-types</feature>
-    <feature version='${project.version}'>odl-alto-resourcepool</feature>
-
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-ird-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-costmap-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-api/${project.version}</bundle>
-  </feature>
-
-</features>

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/pom.xml b/alto-core/standard-service-models/model-endpointproperty/impl/pom.xml
deleted file mode 100644 (file)
index ed42bb7..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointproperty-impl</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointproperty-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-northbound-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 4f2b278..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:service:model:test:endpointproperty?module=alto-endpointproperty-test-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:service:model:test:endpointproperty">prefix:alto-model-endpointproperty-test</type>
-          <name>alto-endpointproperty-test</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index 954d50d..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/maven-metadata-local.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointproperty-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151028073152</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151028073152</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java
deleted file mode 100644 (file)
index f3dcb2d..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.impl.endpointproperty.test;
-
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import org.opendaylight.alto.core.northbound.api.exception.AltoBadFormatException;
-import org.opendaylight.alto.core.northbound.api.exception.AltoErrorTestException;
-import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.SpecificEndpointProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.AltoModelEndpointpropertyService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.ResourceTypeEndpointproperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.alto.request.endpointproperty.request.EndpointpropertyRequest;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.alto.response.endpointproperty.response.EndpointpropertyResponseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.endpointproperty.request.data.EndpointpropertyParams;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.TypedAddressData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointproperty.filter.data.endpointproperty.filter.PropertyFilter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.EndpointPropertyMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.EndpointProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.EndpointPropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.endpoint.property.Properties;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.endpoint.property.PropertiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.endpoint.property.SourceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.endpoint.property.properties.PropertyContainerBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.input.request.endpointproperty.request.endpointproperty.params.filter.EndpointpropertyFilterData;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.input.request.endpointproperty.request.endpointproperty.params.filter.endpointproperty.filter.data.endpointproperty.filter.property.filter.property.InputGlobalProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.output.response.endpointproperty.response.endpointproperty.data.EndpointPropertymapDataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.output.response.endpointproperty.response.endpointproperty.data.endpoint.propertymap.data.endpoint.property.map.endpoint.property.properties.property.container.property.OutputResourceSpecificPropertyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.output.response.endpointproperty.response.endpointproperty.data.endpoint.propertymap.data.endpoint.property.map.endpoint.property.properties.property.value.PidNameBuilder;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AltoEndpointPropertyProvider implements BindingAwareProvider, AutoCloseable, AltoModelEndpointpropertyService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AltoEndpointPropertyProvider.class);
-
-    private DataBroker m_dataBroker = null;
-    private RoutedRpcRegistration<AltoModelEndpointpropertyService> m_serviceReg = null;
-    private ListenerRegistration<DataChangeListener> m_listener=null;
-
-    private static  final String TEST_ENDPOINTPROPERTY_NAME="test-model-endpointproperty";
-    private static final ResourceId TEST_ENDPOINTPROPERTY_RID = new ResourceId(TEST_ENDPOINTPROPERTY_NAME);
-    private InstanceIdentifier<Resource> m_testIID = null;
-
-    protected void createContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-
-        ResourcepoolUtils.createResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_ENDPOINTPROPERTY_NAME,
-                ResourceTypeEndpointproperty.class,
-                wx
-        );
-
-        ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_ENDPOINTPROPERTY_NAME, wx);
-
-        wx.submit().get();
-    }
-
-
-    protected void removeContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-
-        ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_ENDPOINTPROPERTY_NAME, wx);
-
-        wx.submit().get();
-    }
-
-    protected void setupListener() {
-        ResourcepoolUtils.ContextTagListener listener = new ResourcepoolUtils.ContextTagListener(m_testIID, m_serviceReg);
-        m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                m_testIID,listener, AsyncDataBroker.DataChangeScope.SUBTREE);
-
-        assert m_listener != null;
-    }
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("AltoModelEndpoinPropertyProvider Session Initiated");
-
-        m_dataBroker = session.getSALService(DataBroker.class);
-        m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT,
-                TEST_ENDPOINTPROPERTY_NAME);
-        m_serviceReg = session.addRoutedRpcImplementation(AltoModelEndpointpropertyService.class, this);
-
-        try {
-            setupListener();
-            createContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("AltoModelBaseProvider Closed");
-        if (m_serviceReg != null) {
-            m_serviceReg.close();
-        }
-
-        try {
-            removeContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-    @Override
-    public Future<RpcResult<QueryOutput>> query(QueryInput input) {
-        LOG.info("test-model-endpointproperty has been called");
-        if (!input.getType().equals(ResourceTypeEndpointproperty.class)) {
-            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-        }
-
-        EndpointpropertyRequest request = (EndpointpropertyRequest)input.getRequest();
-        EndpointpropertyParams params = request.getEndpointpropertyParams();
-        EndpointpropertyFilterData filter= (EndpointpropertyFilterData)params.getFilter();
-
-        List<? extends TypedAddressData> endpoints=filter.getEndpointpropertyFilter().getEndpointFilter();
-        List<PropertyFilter> properties = filter.getEndpointpropertyFilter().getPropertyFilter();
-
-        for (PropertyFilter property: properties) {
-            if (property.getProperty() instanceof InputGlobalProperty) {
-                String propertyString = ((InputGlobalProperty)property.getProperty()).getGlobalProperty().getValue();
-                if (propertyString.equals("no-such-property")) {
-                    throw new AltoBadFormatException(AltoErrorTestException.ERROR_CODES.E_INVALID_FIELD_VALUE.name(), "properties", "no-such-property");
-                }
-            }
-        }
-
-        int order = 0;
-        LinkedList<EndpointProperty> eppist = new LinkedList<EndpointProperty>();
-        for (TypedAddressData endpoint: endpoints) {
-            SourceBuilder srcBuilder = new SourceBuilder();
-            srcBuilder.setAddress(endpoint.getAddress());
-
-            PidName pidName = new PidName("PID1");
-            PidNameBuilder pidNameBuilder = new PidNameBuilder();
-            pidNameBuilder.setValue(pidName);
-
-            EndpointPropertyBuilder epBuilder = new EndpointPropertyBuilder();
-            epBuilder.setSource(srcBuilder.build());
-
-            LinkedList<Properties> propertiesInResponse = new LinkedList<Properties>();
-            PropertiesBuilder propertiesBuilder = new PropertiesBuilder();
-            PropertyContainerBuilder pcBuilder = new PropertyContainerBuilder();
-            pcBuilder.setProperty(
-                    new OutputResourceSpecificPropertyBuilder().
-                            setResourceSpecificProperty(new SpecificEndpointProperty("my-default-networkmap.pid")).build());
-            propertiesBuilder.setPropertyContainer(pcBuilder.build()).setPropertyValue(pidNameBuilder.build());
-            propertiesInResponse.add(propertiesBuilder.build());
-            epBuilder.setProperties(propertiesInResponse);
-            //propertiesBuilder.setPropertyContainer(new PropertyContainerBuilder().build()).setPropertyValue(pidName);
-
-
-            /*for (TypedPropertyData property: properties) {
-
-
-            //    SourceBuilder srcBuilder = new SourceBuilder();
-            //    srcBuilder.setAddress(endpoint.getAddress());
-
-
-            //    PropertyContainerBuilder propertyBuilder = new PropertyContainerBuilder();
-            //    propertyBuilder.setProperty(property.getProperty());
-
-                PidName pidName = new PidName("PID1");
-                PidNameBuilder pidNameBuilder = new PidNameBuilder();
-                pidNameBuilder.setValue(pidName);
-
-
-
-                EndpointPropertyBuilder epBuilder = new EndpointPropertyBuilder();
-                epBuilder.setSource(srcBuilder.build());
-                epBuilder.setProperties()
-                        setProperty(propertyBuilder.build());
-                epBuilder.setPropertyValue(pidNameBuilder.build());
-
-
-                eppist.add(epBuilder.build());
-            }*/
-            eppist.add(epBuilder.build());
-        }
-
-        EndpointPropertyMapBuilder endpointPropertyMapBuilder = new EndpointPropertyMapBuilder();
-        endpointPropertyMapBuilder.setEndpointProperty(eppist);
-
-        EndpointPropertymapDataBuilder endpointPropertymapDataBuilder = new EndpointPropertymapDataBuilder();
-        endpointPropertymapDataBuilder.setEndpointPropertyMap(endpointPropertyMapBuilder.build());
-
-        EndpointpropertyResponseBuilder endpointpropertyResponseBuilder = new EndpointpropertyResponseBuilder();
-        endpointpropertyResponseBuilder.setEndpointpropertyData(endpointPropertymapDataBuilder.build());
-
-        QueryOutputBuilder queryOutputBuilder = new QueryOutputBuilder();
-        queryOutputBuilder.setType(ResourceTypeEndpointproperty.class).setResponse(endpointpropertyResponseBuilder.build());
-        return RpcResultBuilder.success(queryOutputBuilder.build()).buildFuture();
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModule.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModule.java
deleted file mode 100644 (file)
index a22d0a9..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021;
-
-import org.opendaylight.alto.core.impl.endpointproperty.test.AltoEndpointPropertyProvider;
-
-public class AltoEndpointPropertyModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021.AbstractAltoEndpointPropertyModule {
-    public AltoEndpointPropertyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoEndpointPropertyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, AltoEndpointPropertyModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        AltoEndpointPropertyProvider provider = new AltoEndpointPropertyProvider();
-
-        getBrokerDependency().registerProvider(provider);
-        return provider;
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactory.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactory.java
deleted file mode 100644 (file)
index 2a22a1b..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-endpointproperty-test-impl yang module local name: alto-model-endpointproperty-test
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Nov 25 19:28:28 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021;
-public class AltoEndpointPropertyModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021.AbstractAltoEndpointPropertyModuleFactory {
-
-}

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/yang/alto-endpoint-test-impl.yang b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/yang/alto-endpoint-test-impl.yang
deleted file mode 100644 (file)
index 093fe86..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/yang/alto-endpoint-test-impl.yang
+++ /dev/null
@@ -1,35 +0,0 @@
-module alto-endpointproperty-test-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:service:model:test:endpointproperty";
-    prefix "alto-model-endpointproperty-test-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for endpointproperty project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-model-endpointproperty-test {
-        base config:module-type;
-        config:java-name-prefix AltoEndpointProperty;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-model-endpointproperty-test-impl {
-            when "/config:modules/config:module/config:type = 'alto-model-endpointproperty-test'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactoryTest.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactoryTest.java
deleted file mode 100644 (file)
index 3562fe3..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactoryTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021;
-
-import org.junit.Test;
-
-
-public class AltoEndpointPropertyModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoEndpointPropertyModuleFactory();
-    }
-}

diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleTest.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleTest.java
deleted file mode 100644 (file)
index 91b4fb0..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.JmxAttribute;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.alto.core.impl.endpointproperty.test.AltoEndpointPropertyProvider;
-
-import javax.management.ObjectName;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AltoEndpointPropertyModuleTest {
-    @Test
-    public void testCustomValidation() {
-        AltoEndpointPropertyModule module = new AltoEndpointPropertyModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class));
-
-        // ensure no exceptions on validation
-        // currently this method is empty
-        module.customValidation();
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        // configure mocks
-        DependencyResolver dependencyResolver = mock(DependencyResolver.class);
-        BindingAwareBroker broker = mock(BindingAwareBroker.class);
-        when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker);
-
-        // create instance of module with injected mocks
-        AltoEndpointPropertyModule module = new AltoEndpointPropertyModule(mock(ModuleIdentifier.class), dependencyResolver);
-
-        // getInstance calls resolveInstance to get the broker dependency and then calls createInstance
-        AutoCloseable closeable = module.getInstance();
-
-        // verify that the module registered the returned provider with the broker
-        verify(broker).registerProvider((AltoEndpointPropertyProvider)closeable);
-
-        // ensure no exceptions on close
-        closeable.close();
-    }
-}

diff --git a/alto-core/standard-service-models/model-endpointproperty/it/pom.xml b/alto-core/standard-service-models/model-endpointproperty/it/pom.xml
deleted file mode 100644 (file)
index 98e7334..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/it/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointproperty-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.core</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-service-model-endpointproperty-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointproperty-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-endpointproperty/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java b/alto-core/standard-service-models/model-endpointproperty/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java
deleted file mode 100644 (file)
index 533f25c..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoEndpointcostIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoEndpointcostIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "alto-model-endpointcost-test";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "alto-endpointcost-test";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.core")
-                .artifactId("alto-service-model-endpointcost-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-service-model-endpointcost-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoEndpointcostIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testendpointcostFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-core/standard-service-models/model-endpointproperty/karaf/pom.xml b/alto-core/standard-service-models/model-endpointproperty/karaf/pom.xml
deleted file mode 100644 (file)
index 17b19b4..0000000
--- a/alto-core/standard-service-models/model-endpointproperty/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointproperty-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-service-model-endpointproperty-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-endpointproperty-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-endpointproperty-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-core/standard-service-models/model-endpointproperty/pom.xml b/alto-core/standard-service-models/model-endpointproperty/pom.xml
index 1db4556332c57a9f58be5c32102f6b083fc3f3b2..576c3c1f1f49a3fb57c11202271c7fe30de56213 100644 (file)
--- a/alto-core/standard-service-models/model-endpointproperty/pom.xml
+++ b/alto-core/standard-service-models/model-endpointproperty/pom.xml
@@ -1,79 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright © 2015 Yale University and others. All rights reserved.
+
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>2.0.0</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-endpointproperty-aggregator</artifactId>
+  <artifactId>alto-service-model-endpointproperty</artifactId>
   <version>0.5.0-SNAPSHOT</version>
   <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-      </modules>
-    </profile>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-basic-types</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-networkmap</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>yang-ext</artifactId>
+    </dependency>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/alto-core/standard-service-models/model-endpointproperty/api/src/main/yang/alto-model-endpointproperty-rfc7285.yang b/alto-core/standard-service-models/model-endpointproperty/src/main/yang/alto-model-endpointproperty-rfc7285.yang
similarity index 100%
rename from alto-core/standard-service-models/model-endpointproperty/api/src/main/yang/alto-model-endpointproperty-rfc7285.yang
rename to alto-core/standard-service-models/model-endpointproperty/src/main/yang/alto-model-endpointproperty-rfc7285.yang

diff --git a/alto-core/standard-service-models/model-endpointproperty/api/src/main/yang/alto-model-endpointproperty.yang b/alto-core/standard-service-models/model-endpointproperty/src/main/yang/alto-model-endpointproperty.yang
similarity index 100%
rename from alto-core/standard-service-models/model-endpointproperty/api/src/main/yang/alto-model-endpointproperty.yang
rename to alto-core/standard-service-models/model-endpointproperty/src/main/yang/alto-model-endpointproperty.yang

diff --git a/alto-core/standard-service-models/model-ird/api/pom.xml b/alto-core/standard-service-models/model-ird/api/pom.xml
deleted file mode 100644 (file)
index 6a79d9c..0000000
--- a/alto-core/standard-service-models/model-ird/api/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.11.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-ird-api</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-ird/artifacts/pom.xml b/alto-core/standard-service-models/model-ird/artifacts/pom.xml
deleted file mode 100644 (file)
index 3dddb62..0000000
--- a/alto-core/standard-service-models/model-ird/artifacts/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../../../</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-ird-artifacts</artifactId>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-ird-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-ird-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-ird-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-core/standard-service-models/model-ird/features/pom.xml b/alto-core/standard-service-models/model-ird/features/pom.xml
deleted file mode 100644 (file)
index 1aed60c..0000000
--- a/alto-core/standard-service-models/model-ird/features/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-ird-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-ird-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-ird-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-ird-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-ird/features/src/main/features/features.xml b/alto-core/standard-service-models/model-ird/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 39650f3..0000000
--- a/alto-core/standard-service-models/model-ird/features/src/main/features/features.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-service-model-ird-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-service-model-ird-api' version='${project.version}' description='OpenDaylight :: alto-service-model-ird :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-service-model-base</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-ird-api/${project.version}</bundle>
-  </feature>
-
-  <feature name='odl-alto-service-model-ird' version='${project.version}' description='OpenDaylight :: alto-service-model-ird'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-service-model-ird-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-ird-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-service-model-ird.xml">mvn:org.opendaylight.alto.core/alto-service-model-ird-impl/${project.version}/xml/config</configfile>
-  </feature>
-
-  <feature name='odl-alto-service-model-ird-rest' version='${project.version}' description='OpenDaylight :: alto-service-model-ird :: REST'>
-    <feature version="${project.version}">odl-alto-service-model-ird</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-
-  <feature name='odl-alto-service-model-ird-ui' version='${project.version}' description='OpenDaylight :: alto-service-model-ird :: UI'>
-    <feature version="${project.version}">odl-alto-service-model-ird-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-core/standard-service-models/model-ird/impl/pom.xml b/alto-core/standard-service-models/model-ird/impl/pom.xml
deleted file mode 100644 (file)
index 5cec77d..0000000
--- a/alto-core/standard-service-models/model-ird/impl/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-ird-impl</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-ird-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-ird/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 9c56615..0000000
--- a/alto-core/standard-service-models/model-ird/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:service:model:test:ird?module=alto-ird-test-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:service:model:test:ird">prefix:alto-model-ird-test</type>
-          <name>alto-ird-test</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-ird/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index 0ef1e20..0000000
--- a/alto-core/standard-service-models/model-ird/impl/src/main/config/maven-metadata-local.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-ird-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151028073152</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151028073152</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>

diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/alto/core/impl/ird/test/AltoIrdProvider.java b/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/alto/core/impl/ird/test/AltoIrdProvider.java
deleted file mode 100644 (file)
index 27e45da..0000000
--- a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/alto/core/impl/ird/test/AltoIrdProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.impl.ird.test;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AltoIrdProvider implements BindingAwareProvider, AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AltoIrdProvider.class);
-
-    private DataBroker m_dataBrokerService = null;
-
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("AltoModelIrdProvider Session Initiated");
-        m_dataBrokerService = session.getSALService(DataBroker.class);
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("AltoModelBaseProvider Closed");
-    }
-}

diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModule.java b/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModule.java
deleted file mode 100644 (file)
index 19cadc8..0000000
--- a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021;
-
-import org.opendaylight.alto.core.impl.ird.test.AltoIrdProvider;
-
-public class AltoIrdModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021.AbstractAltoIrdModule {
-    public AltoIrdModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoIrdModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021.AltoIrdModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        AltoIrdProvider provider = new AltoIrdProvider();
-
-        getBrokerDependency().registerProvider(provider);
-        return provider;
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactory.java b/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactory.java
deleted file mode 100644 (file)
index b769874..0000000
--- a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-ird-test-impl yang module local name: alto-model-ird-test
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Oct 28 11:47:28 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021;
-public class AltoIrdModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021.AbstractAltoIrdModuleFactory {
-
-}

diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/yang/ird-impl.yang b/alto-core/standard-service-models/model-ird/impl/src/main/yang/ird-impl.yang
deleted file mode 100644 (file)
index 08e9d95..0000000
--- a/alto-core/standard-service-models/model-ird/impl/src/main/yang/ird-impl.yang
+++ /dev/null
@@ -1,35 +0,0 @@
-module alto-ird-test-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:service:model:test:ird";
-    prefix "alto-model-ird-test-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for ird project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-model-ird-test {
-        base config:module-type;
-        config:java-name-prefix AltoIrd;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-model-ird-test-impl {
-            when "/config:modules/config:module/config:type = 'alto-model-ird-test'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactoryTest.java b/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactoryTest.java
deleted file mode 100644 (file)
index 347e70b..0000000
--- a/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021;
-
-import org.junit.Test;
-
-public class AltoIrdModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoIrdModuleFactory();
-    }
-}

diff --git a/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleTest.java b/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleTest.java
deleted file mode 100644 (file)
index 0700941..0000000
--- a/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.JmxAttribute;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.alto.core.impl.ird.test.AltoIrdProvider;
-
-import javax.management.ObjectName;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AltoIrdModuleTest {
-    @Test
-    public void testCustomValidation() {
-        AltoIrdModule module = new AltoIrdModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class));
-
-        // ensure no exceptions on validation
-        // currently this method is empty
-        module.customValidation();
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        // configure mocks
-        DependencyResolver dependencyResolver = mock(DependencyResolver.class);
-        BindingAwareBroker broker = mock(BindingAwareBroker.class);
-        when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker);
-
-        // create instance of module with injected mocks
-        AltoIrdModule module = new AltoIrdModule(mock(ModuleIdentifier.class), dependencyResolver);
-
-        // getInstance calls resolveInstance to get the broker dependency and then calls createInstance
-        AutoCloseable closeable = module.getInstance();
-
-        // verify that the module registered the returned provider with the broker
-        verify(broker).registerProvider((AltoIrdProvider)closeable);
-
-        // ensure no exceptions on close
-        closeable.close();
-    }
-}

diff --git a/alto-core/standard-service-models/model-ird/it/pom.xml b/alto-core/standard-service-models/model-ird/it/pom.xml
deleted file mode 100644 (file)
index e432523..0000000
--- a/alto-core/standard-service-models/model-ird/it/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-ird-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.core</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-service-model-ird-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-ird-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-ird/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java b/alto-core/standard-service-models/model-ird/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java
deleted file mode 100644 (file)
index c240b3c..0000000
--- a/alto-core/standard-service-models/model-ird/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoIrdIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoIrdIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "alto-model-ird-test";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "alto-ird-test";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.core")
-                .artifactId("alto-service-model-ird-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-service-model-ird-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoIrdIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testirdFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-core/standard-service-models/model-ird/karaf/pom.xml b/alto-core/standard-service-models/model-ird/karaf/pom.xml
deleted file mode 100644 (file)
index 3cb6066..0000000
--- a/alto-core/standard-service-models/model-ird/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-ird-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-service-model-ird-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-ird-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-ird-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-core/standard-service-models/model-ird/pom.xml b/alto-core/standard-service-models/model-ird/pom.xml
index 1b12ce2b2d9caf5e91d50da2b61039188196abe0..dd47ea1b5e1f7cb52e90aaacd38693568ff78e73 100644 (file)
--- a/alto-core/standard-service-models/model-ird/pom.xml
+++ b/alto-core/standard-service-models/model-ird/pom.xml
@@ -1,79 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright © 2015 Yale University and others. All rights reserved.
+
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>2.0.0</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-ird-aggregator</artifactId>
+  <artifactId>alto-service-model-ird</artifactId>
   <version>0.5.0-SNAPSHOT</version>
   <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-      </modules>
-    </profile>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-basic-types</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>yang-ext</artifactId>
+    </dependency>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/alto-core/standard-service-models/model-ird/api/src/main/yang/alto-model-ird.yang b/alto-core/standard-service-models/model-ird/src/main/yang/alto-model-ird.yang
similarity index 100%
rename from alto-core/standard-service-models/model-ird/api/src/main/yang/alto-model-ird.yang
rename to alto-core/standard-service-models/model-ird/src/main/yang/alto-model-ird.yang

diff --git a/alto-core/standard-service-models/model-networkmap/api/pom.xml b/alto-core/standard-service-models/model-networkmap/api/pom.xml
deleted file mode 100644 (file)
index ade13d1..0000000
--- a/alto-core/standard-service-models/model-networkmap/api/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>0.11.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-networkmap-api</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-basic-types</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-networkmap/artifacts/pom.xml b/alto-core/standard-service-models/model-networkmap/artifacts/pom.xml
deleted file mode 100644 (file)
index cc69e8f..0000000
--- a/alto-core/standard-service-models/model-networkmap/artifacts/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.alto</groupId>
-    <artifactId>alto-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../../../</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-networkmap-artifacts</artifactId>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-networkmap-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-networkmap-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-networkmap-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-core/standard-service-models/model-networkmap/features/pom.xml b/alto-core/standard-service-models/model-networkmap/features/pom.xml
deleted file mode 100644 (file)
index 622dcd9..0000000
--- a/alto-core/standard-service-models/model-networkmap/features/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-networkmap-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/alto-core/standard-service-models/model-networkmap/features/src/main/features/features.xml b/alto-core/standard-service-models/model-networkmap/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 3388f4a..0000000
--- a/alto-core/standard-service-models/model-networkmap/features/src/main/features/features.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-service-model-networkmap-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features</repository>
-
-  <feature name='odl-alto-service-model-networkmap-api' version='${project.version}' description='OpenDaylight :: alto-service-model-networkmap :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${project.version}'>odl-alto-service-model-base</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-api/${project.version}</bundle>
-  </feature>
-
-  <feature name='odl-alto-service-model-networkmap' version='${project.version}' description='OpenDaylight :: alto-service-model-networkmap'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-service-model-networkmap-api</feature>
-    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-service-model-networkmap.xml">mvn:org.opendaylight.alto.core/alto-service-model-networkmap-impl/${project.version}/xml/config</configfile>
-  </feature>
-
-  <feature name='odl-alto-service-model-networkmap-rest' version='${project.version}' description='OpenDaylight :: alto-service-model-networkmap :: REST'>
-    <feature version="${project.version}">odl-alto-service-model-networkmap</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-
-  <feature name='odl-alto-service-model-networkmap-ui' version='${project.version}' description='OpenDaylight :: alto-service-model-networkmap :: UI'>
-    <feature version="${project.version}">odl-alto-service-model-networkmap-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-core/standard-service-models/model-networkmap/impl/pom.xml b/alto-core/standard-service-models/model-networkmap/impl/pom.xml
deleted file mode 100644 (file)
index 2870cb9..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-networkmap-impl</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-resourcepool-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- Testing Dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-networkmap/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 6a6a4c0..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/src/main/config/default-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:service:model:test:networkmap?module=alto-networkmap-test-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:service:model:test:networkmap">prefix:alto-model-networkmap-test</type>
-          <name>alto-networkmap-test</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-networkmap/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index 7df2f5e..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/src/main/config/maven-metadata-local.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-networkmap-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151028073152</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151028073152</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java b/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java
deleted file mode 100644 (file)
index 8d70c71..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.impl.networkmap.test;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-
-import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils;
-import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListener;
-
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.Tag;
-
-import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AltoModelNetworkmapService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.QueryInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.QueryOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.QueryOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.ResourceTypeFilteredNetworkmap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.ResourceTypeNetworkmap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.alto.request.networkmap.request.NetworkmapRequest;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.alto.response.networkmap.response.NetworkmapResponseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.networkmap.request.data.NetworkmapFilter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.networkmap.response.data.NetworkMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.networkmap.response.data.network.map.Partition;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.networkmap.response.data.network.map.PartitionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rfc7285.rev151021.Ipv4PrefixList;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rfc7285.rev151021.Ipv4PrefixListBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rfc7285.rev151021.Ipv6PrefixList;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rfc7285.rev151021.Ipv6PrefixListBuilder;
-
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AltoNetworkmapProvider implements BindingAwareProvider, AutoCloseable, AltoModelNetworkmapService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AltoNetworkmapProvider.class);
-
-    private DataBroker m_dataBroker = null;
-    private RoutedRpcRegistration<AltoModelNetworkmapService> m_serviceReg = null;
-    private ListenerRegistration<DataChangeListener> m_listener = null;
-    private ListenerRegistration<DataChangeListener> m_filteredListener = null;
-
-    private static final String TEST_NETWORKMAP_NAME = "test-model-networkmap";
-    private static final String TEST_FILTERED_NETWORKMAP_NAME = "test-model-filtered-networkmap";
-    private static final ResourceId TEST_NETWORKMAP_RID = new ResourceId(TEST_NETWORKMAP_NAME);
-    private InstanceIdentifier<Resource> m_testIID = null;
-    private InstanceIdentifier<Resource> m_testFilteredIID = null;
-
-    protected void createContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-        ResourcepoolUtils.createResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_NETWORKMAP_NAME,
-                                            ResourceTypeNetworkmap.class, wx);
-
-        Tag tag = ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                                        TEST_NETWORKMAP_NAME, wx);
-
-        ResourcepoolUtils.createResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_FILTERED_NETWORKMAP_NAME,
-                                            ResourceTypeFilteredNetworkmap.class, wx);
-
-        List<InstanceIdentifier<?>> dependencies = new LinkedList<>();
-        dependencies.add(
-                (InstanceIdentifier<?>)ResourcepoolUtils.getContextTagIID(
-                        ResourcepoolUtils.DEFAULT_CONTEXT,
-                        TEST_NETWORKMAP_NAME, tag.getValue())
-        );
-        ResourcepoolUtils.updateResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_FILTERED_NETWORKMAP_NAME,
-                                            dependencies, wx);
-        wx.submit().get();
-    }
-
-    protected void removeContextTag()
-            throws InterruptedException, ExecutionException, TransactionCommitFailedException  {
-        WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction();
-
-        ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_NETWORKMAP_NAME, wx);
-
-        ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                            TEST_FILTERED_NETWORKMAP_NAME, wx);
-
-        wx.submit().get();
-    }
-
-    protected void setupListener() {
-        ContextTagListener listener;
-
-        listener = new ContextTagListener(m_testIID, m_serviceReg);
-        m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                                        m_testIID, listener, DataChangeScope.SUBTREE);
-
-        listener = new ContextTagListener(m_testFilteredIID, m_serviceReg);
-        m_filteredListener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                                        m_testFilteredIID, listener, DataChangeScope.SUBTREE);
-
-        assert m_listener != null;
-        assert m_filteredListener != null;
-    }
-
-    protected void closeListener() {
-        if (m_listener != null) {
-            m_listener.close();
-        }
-        if (m_filteredListener != null) {
-            m_filteredListener.close();
-        }
-    }
-
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("AltoModelNetworkProvider Session Initiated");
-
-        m_dataBroker = session.getSALService(DataBroker.class);
-        m_serviceReg = session.addRoutedRpcImplementation(AltoModelNetworkmapService.class, this);
-        m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                                        TEST_NETWORKMAP_NAME);
-        m_testFilteredIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT,
-                                                                TEST_FILTERED_NETWORKMAP_NAME);
-
-        try {
-            setupListener();
-            createContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("AltoModelBaseProvider Closed");
-
-        if (m_serviceReg != null) {
-            m_serviceReg.close();
-        }
-
-        try {
-            removeContextTag();
-        } catch (Exception e) {
-        }
-    }
-
-    @Override
-    public Future<RpcResult<QueryOutput>> query(QueryInput input) {
-        if (!input.getType().equals(ResourceTypeNetworkmap.class)) {
-            return RpcResultBuilder.<QueryOutput>failed().buildFuture();
-        }
-        NetworkmapRequest request = (NetworkmapRequest)input.getRequest();
-        NetworkmapFilter filter = request.getNetworkmapFilter();
-
-        List<PidName> pids = filter.getPid();
-        List<Class<? extends AddressTypeBase>> types = filter.getAddressType();
-
-        List<Partition> partitionList = new LinkedList<>();
-        int index = 0;
-        for (PidName pid: pids) {
-            ++index;
-
-            PartitionBuilder partitionBuilder = new PartitionBuilder();
-            partitionBuilder.setPid(pid);
-
-            if (types.contains(AddressTypeIpv4.class)) {
-                LinkedList<Ipv4Prefix> ipv4List = new LinkedList<Ipv4Prefix>();
-                ipv4List.add(new Ipv4Prefix("192.168." + index + ".0/24"));
-
-                Ipv4PrefixListBuilder v4Builder = new Ipv4PrefixListBuilder();
-                v4Builder.setIpv4(ipv4List);
-
-                partitionBuilder.addAugmentation(Ipv4PrefixList.class, v4Builder.build());
-            }
-            if (types.contains(AddressTypeIpv6.class)) {
-                LinkedList<Ipv6Prefix> ipv6List = new LinkedList<Ipv6Prefix>();
-                ipv6List.add(new Ipv6Prefix("2001:b8:ca2:" + index + "::0/64"));
-
-                Ipv6PrefixListBuilder v6Builder = new Ipv6PrefixListBuilder();
-                v6Builder.setIpv6(ipv6List);
-
-                partitionBuilder.addAugmentation(Ipv6PrefixList.class, v6Builder.build());
-            }
-
-            partitionList.add(partitionBuilder.build());
-        }
-
-        NetworkMapBuilder nmBuilder = new NetworkMapBuilder();
-        nmBuilder.setPartition(partitionList);
-
-        NetworkmapResponseBuilder nmrBuilder = new NetworkmapResponseBuilder();
-        nmrBuilder.setNetworkMap(nmBuilder.build());
-
-        QueryOutputBuilder builder = new QueryOutputBuilder();
-
-        builder.setType(ResourceTypeNetworkmap.class).setResponse(nmrBuilder.build());
-        return RpcResultBuilder.<QueryOutput>success(builder.build()).buildFuture();
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModule.java b/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModule.java
deleted file mode 100644 (file)
index 5da4624..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021;
-
-import org.opendaylight.alto.core.impl.networkmap.test.AltoNetworkmapProvider;
-
-public class AltoNetworkmapModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021.AbstractAltoNetworkmapModule {
-    public AltoNetworkmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoNetworkmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021.AltoNetworkmapModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        AltoNetworkmapProvider provider = new AltoNetworkmapProvider();
-
-        getBrokerDependency().registerProvider(provider);
-        return provider;
-    }
-
-}

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactory.java b/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactory.java
deleted file mode 100644 (file)
index 35eff9b..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-networkmap-test-impl yang module local name: alto-model-networkmap-test
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Oct 28 11:47:28 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021;
-public class AltoNetworkmapModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021.AbstractAltoNetworkmapModuleFactory {
-
-}

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/yang/networkmap-impl.yang b/alto-core/standard-service-models/model-networkmap/impl/src/main/yang/networkmap-impl.yang
deleted file mode 100644 (file)
index 89ece97..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/src/main/yang/networkmap-impl.yang
+++ /dev/null
@@ -1,35 +0,0 @@
-module alto-networkmap-test-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:service:model:test:networkmap";
-    prefix "alto-model-networkmap-test-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-
-    description
-        "Service definition for networkmap project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-model-networkmap-test {
-        base config:module-type;
-        config:java-name-prefix AltoNetworkmap;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-model-networkmap-test-impl {
-            when "/config:modules/config:module/config:type = 'alto-model-networkmap-test'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactoryTest.java b/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactoryTest.java
deleted file mode 100644 (file)
index b098932..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021;
-
-import org.junit.Test;
-
-public class AltoNetworkmapModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoNetworkmapModuleFactory();
-    }
-}

diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleTest.java b/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleTest.java
deleted file mode 100644 (file)
index 8d9b2ea..0000000
--- a/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.JmxAttribute;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.alto.core.impl.networkmap.test.AltoNetworkmapProvider;
-
-import javax.management.ObjectName;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AltoNetworkmapModuleTest {
-    @Test
-    public void testCustomValidation() {
-        AltoNetworkmapModule module = new AltoNetworkmapModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class));
-
-        // ensure no exceptions on validation
-        // currently this method is empty
-        module.customValidation();
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        // configure mocks
-        DependencyResolver dependencyResolver = mock(DependencyResolver.class);
-        BindingAwareBroker broker = mock(BindingAwareBroker.class);
-        when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker);
-
-        // create instance of module with injected mocks
-        AltoNetworkmapModule module = new AltoNetworkmapModule(mock(ModuleIdentifier.class), dependencyResolver);
-
-        // getInstance calls resolveInstance to get the broker dependency and then calls createInstance
-        AutoCloseable closeable = module.getInstance();
-
-        // verify that the module registered the returned provider with the broker
-        verify(broker).registerProvider((AltoNetworkmapProvider)closeable);
-
-        // ensure no exceptions on close
-        closeable.close();
-    }
-}

diff --git a/alto-core/standard-service-models/model-networkmap/it/pom.xml b/alto-core/standard-service-models/model-networkmap/it/pom.xml
deleted file mode 100644 (file)
index 876ba10..0000000
--- a/alto-core/standard-service-models/model-networkmap/it/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-it-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-networkmap-it</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.alto.core</karaf.distro.groupId>
-    <karaf.distro.artifactId>alto-service-model-networkmap-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>0.5.0-SNAPSHOT</karaf.distro.version>
-    <karaf.distro.type>zip</karaf.distro.type>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-features</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

diff --git a/alto-core/standard-service-models/model-networkmap/it/src/test/java/org/opendaylight/alto/core/it/AltoNetworkmapIT.java b/alto-core/standard-service-models/model-networkmap/it/src/test/java/org/opendaylight/alto/core/it/AltoNetworkmapIT.java
deleted file mode 100644 (file)
index f54b8a6..0000000
--- a/alto-core/standard-service-models/model-networkmap/it/src/test/java/org/opendaylight/alto/core/it/AltoNetworkmapIT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2015 Yale University and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.alto.core.it;
-
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
-import org.ops4j.pax.exam.options.MavenUrlReference;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class AltoNetworkmapIT extends AbstractMdsalTestBase {
-    private static final Logger LOG = LoggerFactory.getLogger(AltoNetworkmapIT.class);
-
-    @Override
-    public String getModuleName() {
-        return "alto-model-networkmap-test";
-    }
-
-    @Override
-    public String getInstanceName() {
-        return "alto-networkmap-test";
-    }
-
-    @Override
-    public MavenUrlReference getFeatureRepo() {
-        return maven()
-                .groupId("org.opendaylight.alto.core")
-                .artifactId("alto-service-model-networkmap-features")
-                .classifier("features")
-                .type("xml")
-                .versionAsInProject();
-    }
-
-    @Override
-    public String getFeatureName() {
-        return "odl-alto-service-model-networkmap-ui";
-    }
-
-    @Override
-    public Option getLoggingOption() {
-        Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
-                logConfiguration(AltoNetworkmapIT.class),
-                LogLevel.INFO.name());
-        option = composite(option, super.getLoggingOption());
-        return option;
-    }
-
-    @Test
-    public void testnetworkmapFeatureLoad() {
-        Assert.assertTrue(true);
-    }
-}

diff --git a/alto-core/standard-service-models/model-networkmap/karaf/pom.xml b/alto-core/standard-service-models/model-networkmap/karaf/pom.xml
deleted file mode 100644 (file)
index 1484246..0000000
--- a/alto-core/standard-service-models/model-networkmap/karaf/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2015 Yale University and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-networkmap-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-service-model-networkmap-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-service-model-networkmap-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-service-model-networkmap-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-core/standard-service-models/model-networkmap/pom.xml b/alto-core/standard-service-models/model-networkmap/pom.xml
index 224def777bd9e156ac4bea7166bd762262d8e51d..b5d26bfa54fd08db666ca987cd0faafab6082119 100644 (file)
--- a/alto-core/standard-service-models/model-networkmap/pom.xml
+++ b/alto-core/standard-service-models/model-networkmap/pom.xml
@@ -1,79 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright © 2015 Yale University and others. All rights reserved.
+
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>2.0.0</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.core</groupId>
-  <artifactId>alto-service-model-networkmap-aggregator</artifactId>
+  <artifactId>alto-service-model-networkmap</artifactId>
   <version>0.5.0-SNAPSHOT</version>
   <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>api</module>
-      </modules>
-    </profile>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-basic-types</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-        <module>it</module>
-      </modules>
-    </profile>
-  </profiles>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+    </dependency>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>yang-ext</artifactId>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/alto-core/standard-service-models/model-networkmap/api/src/main/yang/alto-model-networkmap-rfc7285.yang b/alto-core/standard-service-models/model-networkmap/src/main/yang/alto-model-networkmap-rfc7285.yang
similarity index 100%
rename from alto-core/standard-service-models/model-networkmap/api/src/main/yang/alto-model-networkmap-rfc7285.yang
rename to alto-core/standard-service-models/model-networkmap/src/main/yang/alto-model-networkmap-rfc7285.yang

diff --git a/alto-core/standard-service-models/model-networkmap/api/src/main/yang/alto-model-networkmap.yang b/alto-core/standard-service-models/model-networkmap/src/main/yang/alto-model-networkmap.yang
similarity index 100%
rename from alto-core/standard-service-models/model-networkmap/api/src/main/yang/alto-model-networkmap.yang
rename to alto-core/standard-service-models/model-networkmap/src/main/yang/alto-model-networkmap.yang

diff --git a/alto-extensions/incremental-update/api/pom.xml b/alto-extensions/incremental-update/api/pom.xml
index 4a480d5c2da2b8bb12c1b8af078099715240c065..a86290aaec6dc4434e3a8149543e87eb652182cc 100644 (file)
--- a/alto-extensions/incremental-update/api/pom.xml
+++ b/alto-extensions/incremental-update/api/pom.xml
@@ -23,6 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: org.opendaylight.alto :: ${project.artifactId}</name>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 </project>

diff --git a/alto-extensions/incremental-update/impl/pom.xml b/alto-extensions/incremental-update/impl/pom.xml
index da28910968131aa76b2a2a847b486b74ba5be64b..2a97313b3801566de6b9da9b117ce16deafe29f2 100644 (file)
--- a/alto-extensions/incremental-update/impl/pom.xml
+++ b/alto-extensions/incremental-update/impl/pom.xml
@@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: org.opendaylight.alto :: ${project.artifactId}</name>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/alto-extensions/incremental-update/pom.xml b/alto-extensions/incremental-update/pom.xml
index aa9368794c988ac2f6d6d58bf1dba548e24c8425..75840922f8a64f93163fb54b83ba7a3e8edf7a01 100644 (file)
--- a/alto-extensions/incremental-update/pom.xml
+++ b/alto-extensions/incremental-update/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <groupId>org.opendaylight.alto</groupId>
   <artifactId>incremental-update-aggregator</artifactId>
   <version>0.2.0-SNAPSHOT</version>
-  <name>incremental-update</name> <!-- DO NOT CHANGE - Used by Sonar to set project name -->
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>pom</packaging>
 
   <modules>
@@ -46,59 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <!--
-          This profile is to ensure we only build javadocs reports
-          when we plan to deploy Maven site for our project.
-      -->
-      <id>maven-site</id>
-      <activation>
-        <file>
-          <exists>${user.dir}/deploy-site.xml</exists>
-        </file>
-      </activation>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <inherited>false</inherited>
-            <executions>
-              <execution>
-                <id>aggregate</id>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <configuration>
-              <failsOnError>true</failsOnError>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
 </project>

diff --git a/alto-extensions/multicost/api/pom.xml b/alto-extensions/multicost/api/pom.xml
index 57c6882711574b125b036f50305e5289aad79ad9..5299255ef156698077c88f3f60d35229bafbfc43 100644 (file)
--- a/alto-extensions/multicost/api/pom.xml
+++ b/alto-extensions/multicost/api/pom.xml
@@ -23,6 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: org.opendaylight.alto :: ${project.artifactId}</name>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 </project>

diff --git a/alto-extensions/multicost/impl/pom.xml b/alto-extensions/multicost/impl/pom.xml
index db8eca428029e00c61e3e1ec106e88febac31164..88439fc4da6c47148df106998f9098894e72fdff 100644 (file)
--- a/alto-extensions/multicost/impl/pom.xml
+++ b/alto-extensions/multicost/impl/pom.xml
@@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: org.opendaylight.alto :: ${project.artifactId}</name>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/alto-extensions/multicost/pom.xml b/alto-extensions/multicost/pom.xml
index 953079f23ad2c051bff0acc157ebee7d53ed5965..5a01267d6b208d5e0c4a8ffbcf4eb142e1d52a93 100644 (file)
--- a/alto-extensions/multicost/pom.xml
+++ b/alto-extensions/multicost/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <groupId>org.opendaylight.alto</groupId>
   <artifactId>multicost-aggregator</artifactId>
   <version>0.2.0-SNAPSHOT</version>
-  <name>alto-multicost</name> <!-- DO NOT CHANGE - Used by Sonar to set project name -->
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>pom</packaging>
 
   <modules>
@@ -46,59 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <!--
-          This profile is to ensure we only build javadocs reports
-          when we plan to deploy Maven site for our project.
-      -->
-      <id>maven-site</id>
-      <activation>
-        <file>
-          <exists>${user.dir}/deploy-site.xml</exists>
-        </file>
-      </activation>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <inherited>false</inherited>
-            <executions>
-              <execution>
-                <id>aggregate</id>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <configuration>
-              <failsOnError>true</failsOnError>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
 </project>

diff --git a/alto-extensions/rsade/api/pom.xml b/alto-extensions/rsade/api/pom.xml
index 4291735360e33c667ad56cfeea7d3a48540a7e98..dfc43f6158517d8dbd57ed881d34a62f00a53c73 100644 (file)
--- a/alto-extensions/rsade/api/pom.xml
+++ b/alto-extensions/rsade/api/pom.xml
@@ -23,6 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: org.opendaylight.alto :: ${project.artifactId}</name>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 </project>

diff --git a/alto-extensions/rsade/impl/pom.xml b/alto-extensions/rsade/impl/pom.xml
index 972f3f815b278e152a510d01a1fa604cf5260245..08dc49c7920b0b630e26dec0e397363ebe4eec24 100644 (file)
--- a/alto-extensions/rsade/impl/pom.xml
+++ b/alto-extensions/rsade/impl/pom.xml
@@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: org.opendaylight.alto :: ${project.artifactId}</name>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/alto-extensions/rsade/pom.xml b/alto-extensions/rsade/pom.xml
index 1013a9cdd62347eeb90fe6570c245c1ed4400d23..abdc12d9464b9750daf85121f45f62edf09b5684 100644 (file)
--- a/alto-extensions/rsade/pom.xml
+++ b/alto-extensions/rsade/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <groupId>org.opendaylight.alto</groupId>
   <artifactId>routingstate-abstraction-aggregator</artifactId>
   <version>0.5.0-SNAPSHOT</version>
-  <name>routingstate-abstraction</name> <!-- DO NOT CHANGE - Used by Sonar to set project name -->
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>pom</packaging>
 
   <modules>
@@ -46,59 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <!--
-          This profile is to ensure we only build javadocs reports
-          when we plan to deploy Maven site for our project.
-      -->
-      <id>maven-site</id>
-      <activation>
-        <file>
-          <exists>${user.dir}/deploy-site.xml</exists>
-        </file>
-      </activation>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <inherited>false</inherited>
-            <executions>
-              <execution>
-                <id>aggregate</id>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <configuration>
-              <failsOnError>true</failsOnError>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
 </project>

diff --git a/alto-extensions/simple-pce/artifacts/pom.xml b/alto-extensions/simple-pce/artifacts/pom.xml
deleted file mode 100644 (file)
index c9ae24e..0000000
--- a/alto-extensions/simple-pce/artifacts/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2015 SNLAB and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.ext</groupId>
-  <artifactId>alto-spce-artifacts</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-spce-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-spce-impl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-spce-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>

diff --git a/alto-extensions/simple-pce/features/pom.xml b/alto-extensions/simple-pce/features/pom.xml
deleted file mode 100644 (file)
index 35b8435..0000000
--- a/alto-extensions/simple-pce/features/pom.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2015 SNLAB and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.alto.ext</groupId>
-  <artifactId>alto-spce-features</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <openflow.plugin.version>0.5.0-SNAPSHOT</openflow.plugin.version>
-    <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.l2switch</groupId>
-        <artifactId>l2switch-artifacts</artifactId>
-        <version>${l2switch.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
-      <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <classifier>features</classifier>
-      <version>${dluxapps.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin</artifactId>
-      <classifier>features</classifier>
-      <version>${openflow.plugin.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-spce-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-spce-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.ext</groupId>
-      <artifactId>alto-spce-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.l2switch</groupId>
-      <artifactId>features-l2switch</artifactId>
-      <classifier>features</classifier>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <!-- bundles used by features directly -->
-    <dependency>
-      <groupId>org.opendaylight.alto.spce.network</groupId>
-      <artifactId>network-tracker-config</artifactId>
-      <version>${l2switch.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.alto.spce.network</groupId>
-      <artifactId>network-tracker-impl</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.spce.network</groupId>
-      <artifactId>network-tracker-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.spce.network</groupId>
-      <artifactId>network-tracker-api</artifactId>
-      <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
-      <type>jar</type>
-    </dependency>
-
-  </dependencies>
-</project>

diff --git a/alto-extensions/simple-pce/features/src/main/features/features.xml b/alto-extensions/simple-pce/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 907c582..0000000
--- a/alto-extensions/simple-pce/features/src/main/features/features.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Copyright (c) 2015 Tongji University and others. All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-alto-spce-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features</repository>
-  <feature name='odl-network-tracker-api' version='${project.version}' description='OpenDaylight :: network-tracker :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <bundle>mvn:org.opendaylight.alto.spce.network/network-tracker-api/${project.version}</bundle>
-  </feature>
-
-  <feature name='odl-network-tracker' version='${project.version}' description='OpenDaylight :: network-tracker'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${l2switch.version}'>odl-network-tracker-l2switch</feature>
-    <feature version='${project.version}'>odl-network-tracker-api</feature>
-    <bundle>mvn:org.opendaylight.alto.spce.network/network-tracker-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/network-tracker.xml">mvn:org.opendaylight.alto.spce.network/network-tracker-impl/${project.version}/xml/config</configfile>
-  </feature>
-
-  <feature name='odl-network-tracker-l2switch' version='${l2switch.version}' description='OpenDaylight :: network-tracker :: L2switch Wrapper'>
-    <feature version="${openflow.plugin.version}">odl-openflowplugin-flow-services</feature>
-    <feature version="${openflow.plugin.version}">odl-openflowplugin-southbound</feature>
-    <!-- The following top-level l2switch feature pulls in the following odl-l2switch-* features:
-    addresstracker, arphandler, hosttracker, loopremover, packethandler -->
-    <feature version="${l2switch.version}">odl-l2switch-switch</feature>
-    <!-- odl-l2switch-arphandler uses blueprint now, but we still attempt to write data to
-    the config subsystem in order to set is-proactive-flood-mode to false. -->
-<!--    <configfile finalname="${configfile.directory}/54-alto-arphandler.xml">
-      mvn:org.opendaylight.alto.spce.network/network-tracker-config/0.6.0-SNAPSHOT/xml/config
-    </configfile>-->
-  </feature>
-
-  <feature name='odl-network-tracker-rest' version='${project.version}' description='OpenDaylight :: network-tracker :: REST'>
-    <feature version="${project.version}">odl-network-tracker</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-
-  <feature name='odl-network-tracker-ui' version='${project.version}' description='OpenDaylight :: network-tracker :: UI'>
-    <feature version="${project.version}">odl-network-tracker-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-  <feature name='odl-alto-spce-api' version='${project.version}' description='OpenDaylight :: alto-spce :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <bundle>mvn:org.opendaylight.alto.ext/alto-spce-api/${project.version}</bundle>
-  </feature>
-  <feature name='odl-alto-spce' version='${project.version}' description='OpenDaylight :: alto-spce'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${openflow.plugin.version}'>odl-openflowplugin-southbound</feature>
-    <feature version='${openflow.plugin.version}'>odl-openflowplugin-flow-services</feature>
-    <feature version='${project.version}'>odl-alto-spce-api</feature>
-    <feature version='${project.version}'>odl-network-tracker</feature>
-    <bundle>mvn:org.opendaylight.alto.ext/alto-spce-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-spce.xml">mvn:org.opendaylight.alto.ext/alto-spce-impl/${project.version}/xml/config</configfile>
-  </feature>
-  <feature name='odl-alto-spce-rest' version='${project.version}' description='OpenDaylight :: alto-spce :: REST'>
-    <feature version="${project.version}">odl-alto-spce</feature>
-    <feature version="${restconf.version}">odl-restconf</feature>
-  </feature>
-  <feature name='odl-alto-spce-ui' version='${project.version}' description='OpenDaylight :: alto-spce :: UI'>
-    <feature version="${project.version}">odl-alto-spce-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${dluxapps.version}">odl-dluxapps-yangman</feature>
-  </feature>
-
-</features>

diff --git a/alto-extensions/simple-pce/karaf/pom.xml b/alto-extensions/simple-pce/karaf/pom.xml
deleted file mode 100644 (file)
index 8264f16..0000000
--- a/alto-extensions/simple-pce/karaf/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2015 SNLAB and others. All rights reserved.
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html 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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf4-parent</artifactId>
-    <version>2.0.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.alto.ext</groupId>
-  <artifactId>alto-spce-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <name>ODL :: alto :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-alto-spce-ui</karaf.localFeature>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>alto-spce-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alto-spce-features</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/alto-extensions/simple-pce/pom.xml b/alto-extensions/simple-pce/pom.xml
index f28ecc62a5af2eb910fe602b4247c410917873b1..597ecc0c6be4bd63138099ff48b2403b586aa428 100644 (file)
--- a/alto-extensions/simple-pce/pom.xml
+++ b/alto-extensions/simple-pce/pom.xml
@@ -23,42 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
 
-  <profiles>
-    <profile>
-      <id>minimal</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>network-tracker</module>
-        <module>api</module>
-        <module>impl</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-dev</id>
-      <modules>
-        <module>network-tracker</module>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>alto-test</id>
-      <modules>
-        <module>network-tracker</module>
-        <module>api</module>
-        <module>impl</module>
-        <module>features</module>
-        <module>artifacts</module>
-        <module>karaf</module>
-      </modules>
-    </profile>
-  </profiles>
+  <modules>
+    <module>network-tracker</module>
+    <module>api</module>
+    <module>impl</module>
+  </modules>
 
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>

diff --git a/alto-release-features/features-alto/pom.xml b/alto-release-features/features-alto/pom.xml
index dcccee970c2a80a1f7c314c3f326dc9983fd574c..ffcda20c81dfe2e0475f3454990b268f9efde685 100644 (file)
--- a/alto-release-features/features-alto/pom.xml
+++ b/alto-release-features/features-alto/pom.xml
@@ -17,6 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <groupId>org.opendaylight.alto</groupId>
   <artifactId>features4-alto</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>feature</packaging>
 
   <dependencies>

diff --git a/alto-release-features/odl-alto-auto-maps/pom.xml b/alto-release-features/odl-alto-auto-maps/pom.xml
index 10b9e907eda95a801b75f645a330d91809e92788..51fbd18e6593780ab129262acc2b7193da6a03da 100644 (file)
--- a/alto-release-features/odl-alto-auto-maps/pom.xml
+++ b/alto-release-features/odl-alto-auto-maps/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Auto-maps</name>
+  <name>OpenDaylight :: alto :: Auto Maps</name>
 
   <properties>
     <mdsal.model.groupId>org.opendaylight.mdsal.model</mdsal.model.groupId>

diff --git a/alto-release-features/odl-alto-manual-maps/pom.xml b/alto-release-features/odl-alto-manual-maps/pom.xml
index df161c64b6381ad3ceaa5181c3c06118e1bdd07a..9ab7a42806b3ad460050937b539c15094bd9fcc0 100644 (file)
--- a/alto-release-features/odl-alto-manual-maps/pom.xml
+++ b/alto-release-features/odl-alto-manual-maps/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Manual-maps</name>
+  <name>OpenDaylight :: alto :: Manual Maps</name>
 
   <properties>
     <mdsal.model.groupId>org.opendaylight.mdsal.model</mdsal.model.groupId>

diff --git a/alto-release-features/odl-alto-multicost/pom.xml b/alto-release-features/odl-alto-multicost/pom.xml
index 23b28a3c643f836f26e93db3042448631cbb4c5f..3e2ede66a1db5eee6ee0d901f677c362e2ae20c4 100644 (file)
--- a/alto-release-features/odl-alto-multicost/pom.xml
+++ b/alto-release-features/odl-alto-multicost/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Mutlicost support</name>
+  <name>OpenDaylight :: alto :: Mutlicost Support</name>
 
   <properties>
     <mdsal.model.groupId>org.opendaylight.mdsal.model</mdsal.model.groupId>

diff --git a/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml b/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml
index 60556ccc9924736804c1308cd1489e490f2eaa31..a8ee14c14577ae96dcc76c66a4f2fb04c882f0e8 100644 (file)
--- a/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml
+++ b/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Nonstandard-northbound-route</name>
+  <name>OpenDaylight :: alto :: Nonstandard Northbound Route</name>
 
   <dependencies>
     <!-- Empty in this release -->

diff --git a/alto-release-features/odl-alto-nonstandard-service-models/pom.xml b/alto-release-features/odl-alto-nonstandard-service-models/pom.xml
index 9ef411f80cf301dc5efecd75ada97a97b32596ea..1ef095e8d48971875470e95209dbc6454a9dda18 100644 (file)
--- a/alto-release-features/odl-alto-nonstandard-service-models/pom.xml
+++ b/alto-release-features/odl-alto-nonstandard-service-models/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Nonstandard-service-models</name>
+  <name>OpenDaylight :: alto :: Nonstandard Service Models</name>
 
   <dependencies>
     <!-- Empty in this release -->

diff --git a/alto-release-features/odl-alto-nonstandard-types/pom.xml b/alto-release-features/odl-alto-nonstandard-types/pom.xml
index 544a6d227eb90bd94cd7053a08a5cc0351f225f8..200f81d40622a95c2622c566c21f7df22ce644be 100644 (file)
--- a/alto-release-features/odl-alto-nonstandard-types/pom.xml
+++ b/alto-release-features/odl-alto-nonstandard-types/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Nonstandard-types</name>
+  <name>OpenDaylight :: alto :: Nonstandard Types</name>
 
   <dependencies>
     <!-- Empty in this release -->

diff --git a/alto-release-features/odl-alto-rsabs/pom.xml b/alto-release-features/odl-alto-rsabs/pom.xml
index 4cc4baaeed48568e08acb91ade848ae4a8f87012..df5f211d71ca91afddd49b21929cd29467f9ec1b 100644 (file)
--- a/alto-release-features/odl-alto-rsabs/pom.xml
+++ b/alto-release-features/odl-alto-rsabs/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Routing state abstraction</name>
+  <name>OpenDaylight :: alto :: Routing State Abstraction</name>
 
   <properties>
     <mdsal.model.groupId>org.opendaylight.mdsal.model</mdsal.model.groupId>

diff --git a/alto-release-features/odl-alto-simpleecs/pom.xml b/alto-release-features/odl-alto-simpleecs/pom.xml
index 6cb33a6f5dc7bb7fa6891169b5b25b9c0508c767..e7809e51229a26ea98da90ba1f8dadcd12303bcf 100644 (file)
--- a/alto-release-features/odl-alto-simpleecs/pom.xml
+++ b/alto-release-features/odl-alto-simpleecs/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Simple-ECS</name>
+  <name>OpenDaylight :: alto :: Simple ECS</name>
 
   <properties>
     <l2switch.groupId>org.opendaylight.l2switch</l2switch.groupId>

diff --git a/alto-release-features/odl-alto-simpleird/pom.xml b/alto-release-features/odl-alto-simpleird/pom.xml
index b1d3e662b1d6d5bfd0207af957c075555c9a0213..50dad8f1a7fd01c4c05000953581ebb8a4a51de8 100644 (file)
--- a/alto-release-features/odl-alto-simpleird/pom.xml
+++ b/alto-release-features/odl-alto-simpleird/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Simple-IRD</name>
+  <name>OpenDaylight :: alto :: Simple IRD</name>
 
   <properties>
     <mdsal.model.groupId>org.opendaylight.mdsal.model</mdsal.model.groupId>

diff --git a/alto-release-features/odl-alto-spce/pom.xml b/alto-release-features/odl-alto-spce/pom.xml
index 0c0012d29cf32e692319590dcd0f2f3e7a55c15f..0e7918a2b1e685bdc3320be7fc8ff65cfeb68a19 100644 (file)
--- a/alto-release-features/odl-alto-spce/pom.xml
+++ b/alto-release-features/odl-alto-spce/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: SPCE</name>
+  <name>OpenDaylight :: alto :: Simple Path Computation Engine</name>
 
   <properties>
     <mdsal.model.groupId>org.opendaylight.mdsal.model</mdsal.model.groupId>

diff --git a/alto-release-features/odl-alto-standard-northbound-route/pom.xml b/alto-release-features/odl-alto-standard-northbound-route/pom.xml
index 6f87fb41719d2079c5cc123868671ceec6b516b7..3b766359a8867bdb2ed6d731e6a67891a8d7a584 100644 (file)
--- a/alto-release-features/odl-alto-standard-northbound-route/pom.xml
+++ b/alto-release-features/odl-alto-standard-northbound-route/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Standard-northbound-route</name>
+  <name>OpenDaylight :: alto :: Standard Northbound Route</name>
 
   <dependencies>
     <!-- TODO standard routes for network map/cost map/endpoint cost/endpoint property -->

diff --git a/alto-release-features/odl-alto-standard-resource-translator/pom.xml b/alto-release-features/odl-alto-standard-resource-translator/pom.xml
index 66884b943e0ca2dd572a99f337ab352dfae84995..9a21defd74a78d9402057ec95e7418395bc99bae 100644 (file)
--- a/alto-release-features/odl-alto-standard-resource-translator/pom.xml
+++ b/alto-release-features/odl-alto-standard-resource-translator/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Standard-resource-translator</name>
+  <name>OpenDaylight :: alto :: Standard Resource Translator</name>
 
   <dependencies>
     <!-- Empty in this release -->

diff --git a/alto-release-features/odl-alto-standard-service-models/pom.xml b/alto-release-features/odl-alto-standard-service-models/pom.xml
index 6a486a5e56e97097d2672fba0cc5c21e4c28471c..05bf0b638ce5ea33dabd4e830065fa9835ca077c 100644 (file)
--- a/alto-release-features/odl-alto-standard-service-models/pom.xml
+++ b/alto-release-features/odl-alto-standard-service-models/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Standard-service-model</name>
+  <name>OpenDaylight :: alto :: Standard Service Model</name>
 
   <properties>
     <mdsal.model.groupId>org.opendaylight.mdsal.model</mdsal.model.groupId>
@@ -53,32 +53,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-base-api</artifactId>
+      <artifactId>alto-service-model-base</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-ird-api</artifactId>
+      <artifactId>alto-service-model-ird</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-networkmap-api</artifactId>
+      <artifactId>alto-service-model-networkmap</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-endpointcost-api</artifactId>
+      <artifactId>alto-service-model-endpointcost</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-costmap-api</artifactId>
+      <artifactId>alto-service-model-costmap</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.core</groupId>
-      <artifactId>alto-service-model-endpointproperty-api</artifactId>
+      <artifactId>alto-service-model-endpointproperty</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/alto-release-features/odl-alto-standard-types/pom.xml b/alto-release-features/odl-alto-standard-types/pom.xml
index 613130a3da94a9e52631ce7f921125e3929517ae..e27c3942b9d8f338b186d1cf58088a5fe302249f 100644 (file)
--- a/alto-release-features/odl-alto-standard-types/pom.xml
+++ b/alto-release-features/odl-alto-standard-types/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.5.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
-  <name>OpenDaylight :: alto :: Standard-types</name>
+  <name>OpenDaylight :: alto :: Standard Types</name>
 
   <properties>
     <mdsal.model.groupId>org.opendaylight.mdsal.model</mdsal.model.groupId>

diff --git a/alto-release-features/pom.xml b/alto-release-features/pom.xml
index f0bbb734097eaf60a97ae90ee5b660c25e529c9e..bb96166fd1160ddef724726466dd9a296f0945a1 100644 (file)
--- a/alto-release-features/pom.xml
+++ b/alto-release-features/pom.xml
@@ -17,28 +17,36 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <groupId>org.opendaylight.alto</groupId>
   <artifactId>features-aggregator</artifactId>
   <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>pom</packaging>
 
   <modules>
+    <!-- Top features -->
     <module>features-alto</module>
     <module>odl-alto-release</module>
     <module>odl-alto-core</module>
     <module>odl-alto-basic</module>
     <module>odl-alto-extension</module>
-    <module>odl-alto-spce</module>
+
+    <!-- ALTO core features -->
     <module>odl-alto-standard-types</module>
     <module>odl-alto-resourcepool</module>
     <module>odl-alto-northbound</module>
     <module>odl-alto-standard-service-models</module>
     <module>odl-alto-standard-northbound-route</module>
     <module>odl-alto-standard-resource-translator</module>
+    <module>odl-alto-nonstandard-types</module>
+    <module>odl-alto-nonstandard-service-models</module>
+    <module>odl-alto-nonstandard-northbound-route</module>
+
+    <!-- ALTO basic features -->
     <module>odl-alto-simpleird</module>
     <module>odl-alto-manual-maps</module>
     <module>odl-alto-simpleecs</module>
     <module>odl-alto-auto-maps</module>
-    <module>odl-alto-nonstandard-types</module>
-    <module>odl-alto-nonstandard-service-models</module>
-    <module>odl-alto-nonstandard-northbound-route</module>
+
+    <!-- ALTO extension features -->
+    <module>odl-alto-spce</module>
     <module>odl-alto-multicost</module>
     <module>odl-alto-iupd</module>
     <module>odl-alto-rsabs</module>

diff --git a/pom.xml b/pom.xml
index 3798e06f34807d2a775a6d421fbe91df73a76706..f63ce9d3575428830d71597d60721273d153c0d5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -56,4 +56,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </profile>
   </profiles>
 
+  <!--
+      Maven Site Configuration
+
+      The following configuration is necessary for maven-site-plugin to
+      correctly identify the correct deployment path for OpenDaylight Maven
+      sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/</url>
+    </site>
+  </distributionManagement>
 </project>