fix for BUG 760 (provided configs)

- added unpacking of xml from resources to target/provided-configs
- limited to artifactIds: openflowplugin-controller-config
- copied content of target/provided-configs to opendaylight/configuration/initial by assembly-plugin
- changed execution id in pom to match id of execution with the same purpose in distribution/services

Change-Id: Ice4247682ae53576146b8f0f61ebc9599c35b6a8
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/distributions/base/pom.xml b/distributions/base/pom.xml
index babb4ceec9c34f7061d722978baa51f7f017b2ca..02485257f1decb68af2b86ceb9086d01c1abc178 100644 (file)
--- a/distributions/base/pom.xml
+++ b/distributions/base/pom.xml
@@ -42,6 +42,11 @@ see https://git.opendaylight.org/gerrit/#/c/390/
       <artifactId>openflowplugin</artifactId>
       <version>0.0.3-SNAPSHOT</version>
     </dependency>
       <artifactId>openflowplugin</artifactId>
       <version>0.0.3-SNAPSHOT</version>
     </dependency>

+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowplugin-controller-config</artifactId>
+      <version>0.0.3-SNAPSHOT</version>
+    </dependency>

     
     <!-- openflowjava -->
     <dependency>
     
     <!-- openflowjava -->
     <dependency>


@@ -90,6 +95,20 @@ see https://git.opendaylight.org/gerrit/#/c/390/
              <ignorePermissions>false</ignorePermissions>
             </configuration>
           </execution>
              <ignorePermissions>false</ignorePermissions>
             </configuration>
           </execution>

+          <execution>
+            <id>unpack-provided-configs</id>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <phase>generate-resources</phase>
+            <configuration>
+             <outputDirectory>${project.build.directory}/provided-configs</outputDirectory>
+             <includeArtifactIds>openflowplugin-controller-config</includeArtifactIds>
+             <includes>**\/*.xml</includes>
+             <excludeTransitive>true</excludeTransitive>
+             <ignorePermissions>false</ignorePermissions>
+            </configuration>
+          </execution>

         </executions>
       </plugin>
       <plugin>
         </executions>
       </plugin>
       <plugin>

diff --git a/distributions/base/src/assemble/bin.xml b/distributions/base/src/assemble/bin.xml
index 19bf40efe2f5851b86464dd447590a72425f58ba..eb621150d8e84a405eece1c446f87dedc5905272 100644 (file)
--- a/distributions/base/src/assemble/bin.xml
+++ b/distributions/base/src/assemble/bin.xml
@@ -47,6 +47,13 @@
           <exclude>opendaylight/run.sh</exclude>
       </excludes>
     </fileSet>
           <exclude>opendaylight/run.sh</exclude>
       </excludes>
     </fileSet>

+    <fileSet>
+      <directory>${project.build.directory}/provided-configs</directory>
+      <outputDirectory>/opendaylight/configuration</outputDirectory>
+      <excludes>
+        <exclude>**/META-INF/**</exclude>
+      </excludes>
+    </fileSet>

   </fileSets>
   <files>
     <file>
   </fileSets>
   <files>
     <file>