Fix BUG 4281

Caused by: java.lang.IllegalStateException: Resource '/META-INF/yang/openflow-instruction.yang' is missing

added KEY_WORD into modules ment to live outside of md-sal

Change-Id: I3d6cc4d3d9bf5eb845ab5757447bed462567c335
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 80e5103f1ab16b7e8440c47fc891a9c93c5b6ab4..efaa892af2935024940845f1c187861c29ceeb5c 100644 (file)
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -43,49 +43,6 @@
       </dependencies>
     </dependencyManagement>
 
-    <build>
-      <plugins>
-            <!-- TODO: maven-antrun-plugin deletes yang source files from target.
-                       This is done because otherwise openflowjava models are stored in controller
-                       and exposed for further use - which is not desired.
-                       (https://bugs.opendaylight.org/show_bug.cgi?id=2926)
-
-                       This plugin should be removed after relevant configuration is added into 
-                       yang-maven-plugin - which is supposed to happen in BERYLLIUM release -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <delete>
-                                    <fileset dir="${project.build.directory}/classes/META-INF/yang">
-                                        <include name="*.yang"/>
-                                        <exclude name="openflow-types.yang"/>
-                                        <exclude name="openflow-extensible-match.yang"/>
-                                        <exclude name="openflow-action.yang"/>
-                                        <exclude name="openflow-configuration.yang"/>
-                                    </fileset>
-                                    <fileset dir="${project.build.directory}/generated-sources/yang/META-INF/yang">
-                                        <include name="*.yang"/>
-                                        <exclude name="openflow-types.yang"/>
-                                        <exclude name="openflow-extensible-match.yang"/>
-                                        <exclude name="openflow-action.yang"/>
-                                        <exclude name="openflow-configuration.yang"/>
-                                    </fileset>
-                                </delete>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index 576a7f45b4f85fa01edb9ca742f6a99d4df84abe..d2ae42f68197778a99d4c181a2a69ee1a796c2d3 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-action.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-action.yang
@@ -17,7 +17,7 @@
     import openflow-extensible-match { prefix oxm;}
 
     revision "2015-02-03" {
-        description "OpenFlow 1.3 - action model";
+        description "#NOT_PUBLISHED# OpenFlow 1.3 - action model";
     }
 
     identity experimenter-action-sub-type {

diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang
index 2df9d5b6cb4d303de2e3801d2bf576d663dc1a6d..f0f96369a403facdb4d872f04de89d95944bd526 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -21,7 +21,7 @@
     import openflow-extensible-match {prefix oxm;}
 
     revision "2015-02-25" {
-        description "OpenFlow 1.3 - augments model.
+        description "#NOT_PUBLISHED# OpenFlow 1.3 - augments model.
                     Please visit
                     https://wiki.opendaylight.org/view/File:OpenFlow_Protocol_Library_-_Project_documentation.pdf
                      - Augmentation Tables chapter";

diff --git a/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang b/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
index f9d3f6c3278390d8820cd7325acac296da88ca54..f1f9e9b93d1da7986ac6c89adcef752f52d38048 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
@@ -15,7 +15,7 @@
     import openflow-types {prefix oft;}
 
     revision "2015-02-25" {
-        description "OpenFlow 1.3 - match model";
+        description "#NOT_PUBLISHED# OpenFlow 1.3 - match model";
     }
 
     identity oxm-match-type {

diff --git a/openflow-protocol-api/src/main/yang/openflow-instruction.yang b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
index a58fc349bbea58dc7c3d960fcbe9bf5d67e54fc3..b9e515b3a2c66369d29e67922c320e1d717f455b 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-instruction.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
@@ -14,7 +14,7 @@
     import openflow-action {prefix ofaction;}
 
     revision "2013-07-31" {
-        description "OpenFlow 1.3 - instruction model";
+        description "#NOT_PUBLISHED# OpenFlow 1.3 - instruction model";
     }
 
     container instruction-container {

diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index 9c9dbf0e6d01221cdb962e58d9a66d88c1fc45ea..3d9f1d6c25247f120cafa215cc10d6f73583ee4e 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -18,7 +18,7 @@
     import openflow-action {prefix ofaction;}
 
     revision "2013-07-31" {
-        description "OpenFlow 1.3 - protocol objects model";
+        description "#NOT_PUBLISHED# OpenFlow 1.3 - protocol objects model";
     }
 
     // Generic Structures

diff --git a/openflow-protocol-api/src/main/yang/openflow-types.yang b/openflow-protocol-api/src/main/yang/openflow-types.yang
index be0e9f5dd7bddf589ce1971962fc6277a0520bf1..251a845ee0a213d48484b11cc2acb35ea38ede81 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-types.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-types.yang
@@ -11,7 +11,7 @@
     prefix "oft";
 
     revision "2013-07-31" {
-        description "OpenFlow 1.3 - common types model";
+        description "#NOT_PUBLISHED# OpenFlow 1.3 - common types model";
     }
 
     typedef port-number {

diff --git a/openflow-protocol-api/src/main/yang/system-notifications.yang b/openflow-protocol-api/src/main/yang/system-notifications.yang
index b31dd02b63e8c3af5b8d85cae0843ac233712605..5bd805c37cc1f1be899e61a92306382b413ea614 100644 (file)
--- a/openflow-protocol-api/src/main/yang/system-notifications.yang
+++ b/openflow-protocol-api/src/main/yang/system-notifications.yang
@@ -11,7 +11,7 @@
     prefix "ofs";
 
     revision "2013-09-27" {
-        description "Model of system messages used in OpenFlow Protocol Library";
+        description "#NOT_PUBLISHED# Model of system messages used in OpenFlow Protocol Library";
     }
 
     notification disconnect-event {