Remove no more used RFC 8040 configuration file

Delete not used restconf8040.cfg file which was supposed to hold
configuration which can be in fact set in karaf's
etc/org.opendaylight.restconf.nb.rfc8040 file.

When present the file is used to overwrite default values specified in
OSGiNorthbound class.

JIRA: NETCONF-1219
Change-Id: I6dbc1c5696b59d6b2592dbbf01873243ebacd73f
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>
Signed-off-by: Samuel Schneider <samuel.schneider@pantheon.tech>

diff --git a/features/odl-restconf-nb/pom.xml b/features/odl-restconf-nb/pom.xml
index b372bdab5eedaa82ed73e5b275b42cd345fff107..38a6c7d9e3f03fd145864963f8de8b3ccf587855 100644 (file)
--- a/features/odl-restconf-nb/pom.xml
+++ b/features/odl-restconf-nb/pom.xml
@@ -49,11 +49,5 @@
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>restconf-nb</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>restconf-nb</artifactId>
-            <type>cfg</type>
-            <classifier>config</classifier>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-restconf-nb/src/main/feature/feature.xml b/features/odl-restconf-nb/src/main/feature/feature.xml
index b99ff8a868768a43cdaf38c4d343661e42ca769d..622ce6a682b95c3c97f8d35e91a592771ca103b0 100644 (file)
--- a/features/odl-restconf-nb/src/main/feature/feature.xml
+++ b/features/odl-restconf-nb/src/main/feature/feature.xml
@@ -9,8 +9,5 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-restconf-nb-${project.version}">
     <feature name="odl-restconf-nb" version="${project.version}">
         <feature version="[12,13)">odl-mdsal-model-rfc8072</feature>
-        <configfile finalname="etc/org.opendaylight.restconf.nb.rfc8040.cfg">
-            mvn:org.opendaylight.netconf/restconf-nb/${project.version}/cfg/config
-        </configfile>
     </feature>
 </features>

diff --git a/restconf/restconf-nb/pom.xml b/restconf/restconf-nb/pom.xml
index 2939356f691ecd76b0dc1a409a47865c36e00a37..62360293b0d57c7d7bff0c87825fdfcb5d50f467 100644 (file)
--- a/restconf/restconf-nb/pom.xml
+++ b/restconf/restconf-nb/pom.xml
@@ -331,28 +331,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/restconf8040.cfg</file>
-                  <type>cfg</type>
-                  <classifier>config</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

diff --git a/restconf/restconf-nb/src/main/resources/restconf8040.cfg b/restconf/restconf-nb/src/main/resources/restconf8040.cfg
deleted file mode 100644 (file)
index 58eac64..0000000
--- a/restconf/restconf-nb/src/main/resources/restconf8040.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-#example of restconf8040 configuration
-#Default values:
-#maximum-fragment-length=0
-#heartbeat-interval=10000
-#idle-timeout=30000
-#ping-executor-name-prefix=ping-executor
-#max-thread-count=1
-# Note: this option is deprecated and scheduled for removal
-#use-sse=true