Fixing flux feature after karat changes.

Activator changes to use /dlux in url
dlux-web jar file fixed, so it can put every static file under pages folder.
changed port according to Karaf

Change-Id: Ic47e7f6e967e166fc49ec2dde1c48165762692fb
Signed-off-by: Harman Singh <harmasin@cisco.com>

diff --git a/README.md b/README.md
index b527fb95c586d269342ad7c3e82bf010557c05fd..9c39851ba649ad90a3f37fe17ef2c9e491c1c7c4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ OpenDaylight DLUX is a Javascript-based stateless user interface that communicat
 \r
    $ grunt live\r
 \r
-It will start server at http://localhost:9000/. It expects your controller to be running at localhost:8080.\r
+It will start server at http://localhost:9000/. It expects your controller to be running at localhost:8181.\r
 \r
 You can change the base url of controller in file dlux-web/config/development.json\r
 \r
@@ -34,7 +34,7 @@ It will generate dlux-web-0.1.0-SNAPSHOT.jar under dlux-web/target/.
 This assumes that dlux is deployed on same node where md-sal is present. If md-sal is present at different OSGi container,\r
 then you should update the base url in file dlux-web/config/production.json\r
 \r
-6. Copy this jar bundle to plugins directory inside your controller distribution. Then, you can access Dlux UI at http://<<Controller IP>>:8080/dlux/index.html.\r
+6. Copy this jar bundle to plugins directory inside your controller distribution. Then, you can access Dlux UI at http://<<Controller IP>>:8181/dlux/index.html.\r
 \r
 \r
 ## Overall Directory Structure\r

diff --git a/dlux-web/build.config.js b/dlux-web/build.config.js
index 0190cfe9b3b856cb9a9d46e00a090237569d10e9..1eb27fbfcd4811e7e74e72ba6b96bd99b24c9f0f 100644 (file)
--- a/dlux-web/build.config.js
+++ b/dlux-web/build.config.js
@@ -8,7 +8,7 @@ module.exports = {
    * completely built.\r
    */\r
   build_dir: 'build',\r
-  compile_dir: 'target/generated-resources',\r
+  compile_dir: 'target/generated-resources/pages',\r
   \r
   /**\r
    * This is a collection of file patterns that refer to our app code (the\r

diff --git a/dlux-web/config/development.json b/dlux-web/config/development.json
index 3f9ab56ee36dea0d49fc7082fdc9cc999778610d..872eee7ffa5b37d0017ab844b51aafb11fbca30c 100644 (file)
--- a/dlux-web/config/development.json
+++ b/dlux-web/config/development.json
@@ -1,3 +1,3 @@
 {
-    "baseURL": "http://localhost:8080"
+    "baseURL": "http://localhost:8181"
 }
\ No newline at end of file

diff --git a/dlux-web/optimize.js b/dlux-web/optimize.js
index 200b2a4cc09e7104dcb48fe2e1ea6a90228b300b..87251687307102499be2c1ad77347983554c4225 100644 (file)
--- a/dlux-web/optimize.js
+++ b/dlux-web/optimize.js
@@ -2,7 +2,7 @@
     appDir: "build/",
     mainConfigFile: "src/main.js",
     baseUrl: "src",
-    dir: "target/generated-resources",
+    dir: "target/generated-resources/pages",
     removeCombined: true,
     findNestedDependencies: true,
     modules: [

diff --git a/dlux-web/src/main/java/org/opendaylight/dlux/web/Activator.java b/dlux-web/src/main/java/org/opendaylight/dlux/web/Activator.java
index 54c8a63388911bd513df63e9738d64f2f57a3817..abd4d8ec2660ecf21231a08d44199d415ae28f1a 100644 (file)
--- a/dlux-web/src/main/java/org/opendaylight/dlux/web/Activator.java
+++ b/dlux-web/src/main/java/org/opendaylight/dlux/web/Activator.java
@@ -14,7 +14,7 @@ public class Activator implements BundleActivator {
       public void removedService(ServiceReference reference, Object service) {
 
         try {
-           ((HttpService) service).unregister("/");
+           ((HttpService) service).unregister("/dlux");
         } catch (IllegalArgumentException exception) {
            // Ignore; servlet registration probably failed earlier on...
         }
@@ -24,7 +24,7 @@ public class Activator implements BundleActivator {
         // HTTP service is available, register our servlet...
         HttpService httpService = (HttpService) this.context.getService(reference);
         try {
-          httpService.registerResources("/", "/pages",  null);
+          httpService.registerResources("/dlux", "/pages",  null);
         } catch (Exception exception) {
           exception.printStackTrace();
         }