BUG-109: move tunnel API to its appropriate place

Change-Id: I1e102d4b09f8eabcbd1f0f99d4bd41f228aaa996
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/topology/pom.xml b/topology/pom.xml
index 625cbe2a3948e4a73d52de0e07488ada149e472a..8ec5799ff5e966706e28db2473ea8e18595b2843 100644 (file)
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -22,7 +22,7 @@
         <module>provider-bgp</module>
         <module>provider-pcep</module>
                <module>tunnel-api</module>
-        <module>tunnel-pcep</module>
+        <module>tunnel-pcep-api</module>
         <module>segment-routing</module>
     </modules>
 </project>

diff --git a/topology/tunnel-pcep/.project b/topology/tunnel-pcep-api/.project
similarity index 100%
rename from topology/tunnel-pcep/.project
rename to topology/tunnel-pcep-api/.project

diff --git a/topology/tunnel-pcep/pom.xml b/topology/tunnel-pcep-api/pom.xml
similarity index 86%
rename from topology/tunnel-pcep/pom.xml
rename to topology/tunnel-pcep-api/pom.xml
index affb2e8e0c96d0b7a747dee850f14fc866c24a31..1962f35f1bf4eaa874a7ec85242eb57d0a98bdcc 100644 (file)
--- a/topology/tunnel-pcep/pom.xml
+++ b/topology/tunnel-pcep-api/pom.xml
@@ -10,7 +10,7 @@
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
-       <artifactId>topology-tunnel-pcep</artifactId>
+       <artifactId>topology-tunnel-pcep-api</artifactId>
        <description>Topology Tunnel PCEP binding</description>
        <packaging>bundle</packaging>
        <name>${project.artifactId}</name>
@@ -29,11 +29,6 @@
                        <artifactId>topology-tunnel-api</artifactId>
             <version>${project.version}</version>
                </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
@@ -44,12 +39,6 @@
             <artifactId>yang-common</artifactId>
             <version>${yangtools.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-inventory</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
        </dependencies>
 
        <build>
@@ -99,9 +88,6 @@
                        <Export-Package>
                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.rev130820,
                        </Export-Package>
-                       <Private-Package>
-                           org.opendaylight.protocol.tunnel.pcep,
-                       </Private-Package>
                    </instructions>
                </configuration>
            </plugin>

diff --git a/topology/tunnel-pcep/src/main/yang/topology-tunnel-pcep.yang b/topology/tunnel-pcep-api/src/main/yang/topology-tunnel-pcep.yang
similarity index 100%
rename from topology/tunnel-pcep/src/main/yang/topology-tunnel-pcep.yang
rename to topology/tunnel-pcep-api/src/main/yang/topology-tunnel-pcep.yang