Bug-194: Moved tcpmd5/jni-cfg to tcpmd5/jni

-moved cfg yang model and java files
-preserved minimalistic pom.xml in tcpmd5/jni-cfg

Change-Id: Ifee8463c33376a9da076dcc9297452d506e47897
Signed-off-by: Milos Fabian <milfabia@cisco.com>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 5bf4ad28685567984dd31c5e1aa966a6e4481515..b2d494c505bfb36980f5706edc32e5a59058729a 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -183,7 +183,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-jni-cfg</artifactId>
+            <artifactId>tcpmd5-jni</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index c2dd9430a8e0d1f10854a907c885005d4272c0cd..74873a7bff6e450bc692e93032c50443c1702322 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -197,8 +197,9 @@
            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>tcpmd5-jni-cfg</artifactId>
+                <artifactId>tcpmd5-jni</artifactId>
                 <version>${project.version}</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>

diff --git a/pcep/topology-provider/pom.xml b/pcep/topology-provider/pom.xml
index e1cfa5acff59e4cd8a1ef570869e64efd4361c8d..3aa9e18696dec092300d281025912329cf08e168 100644 (file)
--- a/pcep/topology-provider/pom.xml
+++ b/pcep/topology-provider/pom.xml
@@ -175,7 +175,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-jni-cfg</artifactId>
+            <artifactId>tcpmd5-jni</artifactId>
             <scope>test</scope>
         </dependency>
             <dependency>

diff --git a/tcp-md5/jni-cfg/pom.xml b/tcp-md5/jni-cfg/pom.xml
index accfae0767a3976837b974d5c855bfb3c0265bb4..d0bfa6def846133ac00f1ef24600857d2c859e1d 100644 (file)
--- a/tcp-md5/jni-cfg/pom.xml
+++ b/tcp-md5/jni-cfg/pom.xml
@@ -25,27 +25,8 @@
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-jni</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/tcp-md5/jni/pom.xml b/tcp-md5/jni/pom.xml
index f3ac292a08edd7783d903503bc2dbff643a79067..8b2c099b1fb094cf7b2247208ebc5fc06641a74e 100644 (file)
--- a/tcp-md5/jni/pom.xml
+++ b/tcp-md5/jni/pom.xml
@@ -46,6 +46,11 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+
         <!-- Testing dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -69,6 +74,11 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
+
             <plugin>
                 <groupId>com.github.goldin</groupId>
                 <artifactId>copy-maven-plugin</artifactId>

diff --git a/tcp-md5/jni-cfg/src/main/java/org/opendaylight/controller/config/yang/tcpmd5/jni/cfg/NativeKeyAccessFactoryModule.java b/tcp-md5/jni/src/main/java/org/opendaylight/controller/config/yang/tcpmd5/jni/cfg/NativeKeyAccessFactoryModule.java
similarity index 100%
rename from tcp-md5/jni-cfg/src/main/java/org/opendaylight/controller/config/yang/tcpmd5/jni/cfg/NativeKeyAccessFactoryModule.java
rename to tcp-md5/jni/src/main/java/org/opendaylight/controller/config/yang/tcpmd5/jni/cfg/NativeKeyAccessFactoryModule.java

diff --git a/tcp-md5/jni-cfg/src/main/java/org/opendaylight/controller/config/yang/tcpmd5/jni/cfg/NativeKeyAccessFactoryModuleFactory.java b/tcp-md5/jni/src/main/java/org/opendaylight/controller/config/yang/tcpmd5/jni/cfg/NativeKeyAccessFactoryModuleFactory.java
similarity index 100%
rename from tcp-md5/jni-cfg/src/main/java/org/opendaylight/controller/config/yang/tcpmd5/jni/cfg/NativeKeyAccessFactoryModuleFactory.java
rename to tcp-md5/jni/src/main/java/org/opendaylight/controller/config/yang/tcpmd5/jni/cfg/NativeKeyAccessFactoryModuleFactory.java

diff --git a/tcp-md5/jni-cfg/src/main/yang/odl-tcpmd5-jni-cfg.yang b/tcp-md5/jni/src/main/yang/odl-tcpmd5-jni-cfg.yang
similarity index 100%
rename from tcp-md5/jni-cfg/src/main/yang/odl-tcpmd5-jni-cfg.yang
rename to tcp-md5/jni/src/main/yang/odl-tcpmd5-jni-cfg.yang