Fixing some changes to feature file

Change-Id: I8c7a384a8c37450997da4348b73ecbe28b99e042
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
Signed-off-by: André Martins <aanm@ua.pt>

diff --git a/features/pom.xml b/features/pom.xml
index 49092573412f2384861931f4c32ff39c98562218..475b8574f15bcc96d0e4d88acc1e8f5f68c0a60f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -8,12 +8,10 @@
   </parent>
   <artifactId>features-openflowplugin</artifactId>
   <name>Openflow Protocol Plugin - Karaf Features</name>
-  <packaging>kar</packaging>
-  
+  <packaging>pom</packaging>
   <properties>
     <features.file>features.xml</features.file>
-  </properties> 
-
+  </properties>
   <build>
     <resources>
       <resource>
@@ -35,9 +33,9 @@
                 </goals>
                 <configuration>
                     <featuresFile>${project.build.directory}/classes/${features.file}</featuresFile>
-                </configuration>                
+                </configuration>
             </execution>
-        </executions>            
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index e9bfc7fb9c986a0e8aa97fc46aa9410dd0cb65c2..888a078d357062b3bae5172d1bd00c2101fa9875 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <features name="openflowplugin-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <feature name='odl-openflowplugin' description="OpenDaylight :: Openflow Plugin :: Plugin" version='${project.version}'>
-        <feature version='${config.version}'>odl-config-subsystem</feature>
         <feature version="${mdsal.version}">odl-mdsal-all</feature>
         <feature version="${openflowjava.version}">odl-openflowjava</feature>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}</bundle>
+        <configfile finalname="classes/initial/42-openflowplugin.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config</configfile>
     </feature>
 </features>

diff --git a/openflowplugin-controller-config/pom.xml b/openflowplugin-controller-config/pom.xml
index 30b82121b12c3f1321e3c527351958bb3f0375c2..bae466e85d0b8b6681967c094543db89e18313f0 100644 (file)
--- a/openflowplugin-controller-config/pom.xml
+++ b/openflowplugin-controller-config/pom.xml
@@ -10,13 +10,38 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-parent</artifactId>
-      <version>0.0.3-SNAPSHOT</version>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>openflowplugin-controller-config</artifactId>
     <description>Controller Configuration files for openflowplugin + openflowjava couple</description>
     <packaging>jar</packaging>
-  
+    <build>
+        <plugins>
+            <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/initial/42-openflowplugin.xml</file>
+                                    <type>xml</type>
+                                    <classifier>config</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>