Merge "Removed hardcoded version numbers from bundles and loader"

[dlux.git] / modules / pom.xml

diff --git a/modules/pom.xml b/modules/pom.xml
index 0c11ea3ef6fb542273fed8a79fc1aee56c3d124c..9f1b3708d5f25f362c938454172cad21eae9b0dd 100644 (file)
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -36,6 +36,11 @@ sd">
     <module>network-resources</module>
     <module>flow-resources</module>
     <module>container-resources</module>
+    <module>topology-resources</module>
+    <module>loader-resources</module>
+    <module>connection_manager-resources</module>
+    <module>core-resources</module>
+    <module>common-topbar-resources</module>
   </modules>
 
   <dependencies>
@@ -93,6 +98,31 @@ sd">
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>dlux.container.resources</artifactId>
       <version>${container.resources.version}</version>
+  </dependency>
+  <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>dlux.topology.resources</artifactId>
+      <version>${topology.resources.version}</version>
+  </dependency>
+  <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>dlux.loader.resources</artifactId>
+      <version>${loader.resources.version}</version>
+  </dependency>
+  <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>dlux.connection_manager.resources</artifactId>
+      <version>${connection_manager.resources.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>dlux.core.resources</artifactId>
+      <version>${core.resources.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>dlux.common.topbar.resources</artifactId>
+      <version>${common.topbar.resources.version}</version>
     </dependency>
   </dependencies>
 
@@ -116,7 +146,20 @@ sd">
                 <directory>../dlux-web/src/app/network</directory>
                 <directory>../dlux-web/src/app/flow</directory>
                 <directory>../dlux-web/src/app/container</directory>
-                <includes></includes>
+                <directory>../dlux-web/src/app/topology</directory>
+                <directory>../dlux-web/src/</directory>
+                <directory>../dlux-web/src/app/connection_manager</directory>
+                <directory>../dlux-web/src/app/core</directory>
+                <directory>../dlux-web/src/common/topbar</directory>
+                <includes>
+                         <include></include>
+                         <include>index.html</include>
+                         <include>main.js</include>
+                         <include>app/app.controller.js</include>
+                         <include>app/app.module.js</include>
+                         <include>app/routingConfig.js</include>
+                         <include>assets/</include>
+                           </includes>
                 <excludes></excludes>
                 <followSymlinks>false</followSymlinks>
               </fileset>
@@ -142,6 +185,11 @@ sd">
                 dlux.node.resources,
                 dlux.yangui.resources,
                 dlux.container.resources,
+                dlux.topology.resources,
+                dlux.connection_manager.resources,
+                dlux.network.resources,
+                dlux.flow.resources,
+                dlux.core.resources,
               </includeArtifactIds>
               <excludes>META-INF\/**</excludes>
               <excludeTransitive>true</excludeTransitive>
@@ -159,15 +207,30 @@ sd">
               <outputDirectory>${project.basedir}/../dlux-web/src/common/</outputDirectory>
               <groupId>org.opendaylight.dlux</groupId>
               <includeArtifactIds>
-                         dlux.common.yangutils.resources,
-                         dlux.common.navigation.resources,
-                         dlux.common.layout.resources,
-                         dlux.common.authentication.resources,
-                         dlux.common.login.resources,
-                         dlux.common.general.resources,
-                dlux.network.resources,
-                dlux.flow.resources,
-                   </includeArtifactIds>
+                dlux.common.yangutils.resources,
+                dlux.common.navigation.resources,
+                dlux.common.layout.resources,
+                dlux.common.authentication.resources,
+                dlux.common.login.resources,
+                dlux.common.general.resources,
+                dlux.common.topbar.resources,
+              </includeArtifactIds>
+              <excludes>META-INF\/**</excludes>
+              <excludeTransitive>true</excludeTransitive>
+              <ignorePermissions>false</ignorePermissions>
+            </configuration>
+          </execution>
+         <!--loader Resources-->
+          <execution>
+            <id>unpack-loader-resources</id>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <phase>generate-sources</phase>
+            <configuration>
+              <outputDirectory>${project.basedir}/../dlux-web/src/</outputDirectory>
+              <groupId>org.opendaylight.dlux</groupId>
+              <includeArtifactIds>dlux.loader.resources</includeArtifactIds>
               <excludes>META-INF\/**</excludes>
               <excludeTransitive>true</excludeTransitive>
               <ignorePermissions>false</ignorePermissions>