X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=loader%2Fimpl%2Fpom.xml;h=8dbd3cef3b7691c5155f0a319156a4e8c773f0e3;hb=9c997d6b281d34c73b16cb880514ae897a1b66c7;hp=d7db3e210c1e8314c93b5e8997f94bfd47752480;hpb=ab8b833101156d63ef013f4b295effcf157454d7;p=dlux.git

diff --git a/loader/impl/pom.xml b/loader/impl/pom.xml
index d7db3e21..8dbd3cef 100644
--- a/loader/impl/pom.xml
+++ b/loader/impl/pom.xml
@@ -4,48 +4,67 @@
   <parent>
     <groupId>org.opendaylight.dlux</groupId>
     <artifactId>dlux-parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>loader.implementation</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>dlux-web</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>loader</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>4.3.0</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>4.3.0</version>
     </dependency>
     <dependency>
 	<groupId>org.slf4j</groupId>
 	<artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
+      <version>${javax.servlet-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>dlux.loader.resources</artifactId>
       <version>${loader.resources.version}</version>
     </dependency>
+      <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+          <scope>test</scope>
+      </dependency>
   </dependencies>
  <build>
     <resources>
       <resource>
         <directory>target/generated-resources</directory>
-      </resource>   
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
     </resources>
     <plugins>
       <!--Clean extracted resources-->
@@ -67,7 +86,7 @@
           </configuration>
       </plugin>
       <!--Copy resources from the dlux-web/build dir-->
-      <!--<plugin>
+      <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <version>2.6</version>
         <executions>
@@ -78,7 +97,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.basedir}/src/main/resources/dlux</outputDirectory>
+              <outputDirectory>${project.basedir}/target/generated-resources/dlux</outputDirectory>
               <resources>
                 <resource>
                   <directory>${project.basedir}/../../dlux-web/build/</directory>
@@ -86,7 +105,8 @@
                       <include>src/main.js</include>
                       <include>src/app/app.controller.js</include>
                       <include>src/app/app.module.js</include>
-                      <include>src/app/app.routingConfig.js</include>
+                      <include>src/app/routingConfig.js</include>
+                      <include>src/common/config/env.module.js</include>
                       <include>vendor/**</include>
                       <include>assets/**</include>
                     </includes>
@@ -105,7 +125,7 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.basedir}/src/main/resources/index</outputDirectory>
+              <outputDirectory>${project.basedir}/target/generated-resources/index</outputDirectory>
               <resources>
                 <resource>
                   <directory>${project.basedir}/../../dlux-web/build/</directory>
@@ -118,13 +138,12 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>-->
-     <plugin>
+      </plugin>
+    <!-- <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>2.6</version>
         <executions>
-     <!--loader Resources-->
           <execution>
             <id>unpack-loader-resources</id>
             <goals>
@@ -141,7 +160,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin> -->
     <plugin>
 
       <groupId>org.apache.maven.plugins</groupId>
@@ -154,12 +173,12 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
             <Import-Package>org.osgi.framework,
                             org.opendaylight.dlux.loader,
-                            org.opendaylight.dlux.loader.implementation,
                             org.osgi.service.http,
                             javax.servlet,
                             javax.servlet.http,*