Turn stateful/impl dependecies around

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

diff --git a/pcep/ietf-stateful02/pom.xml b/pcep/ietf-stateful02/pom.xml
index 46f8029e16b0f4618478b57c68a852e95be97399..68d6ef881984c203e1e8d36e7b9c93c9710e7597 100644 (file)
--- a/pcep/ietf-stateful02/pom.xml
+++ b/pcep/ietf-stateful02/pom.xml
@@ -52,6 +52,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-tunnel-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-impl</artifactId>
+        </dependency>
 
         <!--
             FIXME: this is in support of the generated code. This should not

diff --git a/pcep/ietf-stateful07/pom.xml b/pcep/ietf-stateful07/pom.xml
index e7134168b7b4fd1eae4aeb2b01273a37d6878789..872d15ff1882b11af0b1ec5f2f928b44c0a2db2f 100644 (file)
--- a/pcep/ietf-stateful07/pom.xml
+++ b/pcep/ietf-stateful07/pom.xml
@@ -52,6 +52,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-tunnel-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-impl</artifactId>
+        </dependency>
 
         <!--
             FIXME: this is in support of the generated code. This should not

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java
similarity index 99%
rename from pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java
rename to pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java
index eced8ebc8af8924b218ae1c9ce57e4918ebbc619..6e0fb25a39c7d28bd2266a5251fb78ad3f3efd5c 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java
+++ b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java
@@ -5,7 +5,7 @@
  * 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.protocol.pcep.impl;
+package org.opendaylight.protocol.pcep.ietf;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -23,6 +23,7 @@ import org.opendaylight.protocol.pcep.ietf.initiated00.PcinitiateMessageParser;
 import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPReportMessageParser;
 import org.opendaylight.protocol.pcep.ietf.stateful07.PCEPUpdateRequestMessageParser;
 import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
+import org.opendaylight.protocol.pcep.impl.Activator;
 import org.opendaylight.protocol.pcep.impl.message.PCEPCloseMessageParser;
 import org.opendaylight.protocol.pcep.impl.message.PCEPErrorMessageParser;
 import org.opendaylight.protocol.pcep.impl.message.PCEPKeepAliveMessageParser;

diff --git a/pcep/impl/src/test/resources/PCEPCloseMessage1.bin b/pcep/ietf-stateful07/src/test/resources/PCEPCloseMessage1.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCEPCloseMessage1.bin
rename to pcep/ietf-stateful07/src/test/resources/PCEPCloseMessage1.bin

diff --git a/pcep/impl/src/test/resources/PCEPOpenMessage1.bin b/pcep/ietf-stateful07/src/test/resources/PCEPOpenMessage1.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCEPOpenMessage1.bin
rename to pcep/ietf-stateful07/src/test/resources/PCEPOpenMessage1.bin

diff --git a/pcep/impl/src/test/resources/PCEPRequestMessage1.bin b/pcep/ietf-stateful07/src/test/resources/PCEPRequestMessage1.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCEPRequestMessage1.bin
rename to pcep/ietf-stateful07/src/test/resources/PCEPRequestMessage1.bin

diff --git a/pcep/impl/src/test/resources/PCErr.3.bin b/pcep/ietf-stateful07/src/test/resources/PCErr.3.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCErr.3.bin
rename to pcep/ietf-stateful07/src/test/resources/PCErr.3.bin

diff --git a/pcep/impl/src/test/resources/PCErr.5.bin b/pcep/ietf-stateful07/src/test/resources/PCErr.5.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCErr.5.bin
rename to pcep/ietf-stateful07/src/test/resources/PCErr.5.bin

diff --git a/pcep/impl/src/test/resources/PCNtf.5.bin b/pcep/ietf-stateful07/src/test/resources/PCNtf.5.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCNtf.5.bin
rename to pcep/ietf-stateful07/src/test/resources/PCNtf.5.bin

diff --git a/pcep/impl/src/test/resources/PCRep.1.bin b/pcep/ietf-stateful07/src/test/resources/PCRep.1.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCRep.1.bin
rename to pcep/ietf-stateful07/src/test/resources/PCRep.1.bin

diff --git a/pcep/impl/src/test/resources/PCRep.2.bin b/pcep/ietf-stateful07/src/test/resources/PCRep.2.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCRep.2.bin
rename to pcep/ietf-stateful07/src/test/resources/PCRep.2.bin

diff --git a/pcep/impl/src/test/resources/PCRep.3.bin b/pcep/ietf-stateful07/src/test/resources/PCRep.3.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCRep.3.bin
rename to pcep/ietf-stateful07/src/test/resources/PCRep.3.bin

diff --git a/pcep/impl/src/test/resources/PCRep.5.bin b/pcep/ietf-stateful07/src/test/resources/PCRep.5.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCRep.5.bin
rename to pcep/ietf-stateful07/src/test/resources/PCRep.5.bin

diff --git a/pcep/impl/src/test/resources/PCReq.3.bin b/pcep/ietf-stateful07/src/test/resources/PCReq.3.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCReq.3.bin
rename to pcep/ietf-stateful07/src/test/resources/PCReq.3.bin

diff --git a/pcep/impl/src/test/resources/PCRpt.1.bin b/pcep/ietf-stateful07/src/test/resources/PCRpt.1.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCRpt.1.bin
rename to pcep/ietf-stateful07/src/test/resources/PCRpt.1.bin

diff --git a/pcep/impl/src/test/resources/PCRpt.2.bin b/pcep/ietf-stateful07/src/test/resources/PCRpt.2.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCRpt.2.bin
rename to pcep/ietf-stateful07/src/test/resources/PCRpt.2.bin

diff --git a/pcep/impl/src/test/resources/PCRpt.3.bin b/pcep/ietf-stateful07/src/test/resources/PCRpt.3.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCRpt.3.bin
rename to pcep/ietf-stateful07/src/test/resources/PCRpt.3.bin

diff --git a/pcep/impl/src/test/resources/PCRpt.5.bin b/pcep/ietf-stateful07/src/test/resources/PCRpt.5.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCRpt.5.bin
rename to pcep/ietf-stateful07/src/test/resources/PCRpt.5.bin

diff --git a/pcep/impl/src/test/resources/PCUpd.2.bin b/pcep/ietf-stateful07/src/test/resources/PCUpd.2.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCUpd.2.bin
rename to pcep/ietf-stateful07/src/test/resources/PCUpd.2.bin

diff --git a/pcep/impl/src/test/resources/PCUpd.5.bin b/pcep/ietf-stateful07/src/test/resources/PCUpd.5.bin
similarity index 100%
rename from pcep/impl/src/test/resources/PCUpd.5.bin
rename to pcep/ietf-stateful07/src/test/resources/PCUpd.5.bin

diff --git a/pcep/impl/src/test/resources/Pcinit.bin b/pcep/ietf-stateful07/src/test/resources/Pcinit.bin
similarity index 100%
rename from pcep/impl/src/test/resources/Pcinit.bin
rename to pcep/ietf-stateful07/src/test/resources/Pcinit.bin

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index a927096ed09981916e235cb7527e5999d5ef875c..70243cf9f806bb8b444bc8cfaf4223fcaadd3e61 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -40,16 +40,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-ietf-stateful07</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-ietf-stateful02</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>