From c225666e276e9b532dc45cc4f1e295348c94da52 Mon Sep 17 00:00:00 2001
From: Adrien LAUER <adrien.lauer@gmail.com>
Date: Fri, 13 Nov 2015 01:01:39 +0100
Subject: [PATCH] Fix rest paths

---
 .travis.yml                                   |  4 +--
 .../batch/internal/rest/job/JobResource.java  |  2 +-
 .../jobexecution/JobExecutionResource.java    |  2 +-
 .../rest/jobinstance/JobInstanceResource.java |  2 +-
 .../stepexecution/StepExecutionResource.java  |  2 +-
 bower.json                                    | 25 -----------------
 package.json                                  | 28 -------------------
 web/pom.xml                                   |  2 +-
 8 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 bower.json
 delete mode 100644 package.json

diff --git a/.travis.yml b/.travis.yml
index 217184f..7ce5d8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@ jdk: oraclejdk8
 
 node_js: "0.12"
 
-before_install: npm install -g bower grunt-cli
-
 notifications:
   irc: "chat.freenode.net#seedstack-dev"
   
@@ -15,6 +13,8 @@ cache:
   directories:
     - "$HOME/.m2/repository"
 
+before_install: npm install -g bower grunt-cli
+
 install:
   - rm ~/.m2/settings.xml
   - if [ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_BRANCH = master ]; then GOAL=deploy; else GOAL=install; fi
diff --git a/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/job/JobResource.java b/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/job/JobResource.java
index b36f7ee..0cab397 100644
--- a/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/job/JobResource.java
+++ b/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/job/JobResource.java
@@ -40,7 +40,7 @@
  *
  * @author aymen.abbes@ext.mpsa.com
  */
-@Path("/jobs")
+@Path("/seed-monitoring/jobs")
 public class JobResource {
 
     /**
diff --git a/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/jobexecution/JobExecutionResource.java b/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/jobexecution/JobExecutionResource.java
index 2c4afaa..198fa9e 100644
--- a/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/jobexecution/JobExecutionResource.java
+++ b/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/jobexecution/JobExecutionResource.java
@@ -33,7 +33,7 @@
  *
  * @author aymen.abbes@ext.mpsa.com
  */
-@Path("/jobs/{jobName}/job-executions")
+@Path("/seed-monitoring/jobs/{jobName}/job-executions")
 public class JobExecutionResource {
     @Inject
     @Named("jobService")
diff --git a/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/jobinstance/JobInstanceResource.java b/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/jobinstance/JobInstanceResource.java
index aa6f7cb..2df94ac 100644
--- a/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/jobinstance/JobInstanceResource.java
+++ b/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/jobinstance/JobInstanceResource.java
@@ -35,7 +35,7 @@
  *
  * @author aymen.abbes@ext.mpsa.com
  */
-@Path("/jobs/{jobName}/job-instances")
+@Path("/seed-monitoring/jobs/{jobName}/job-instances")
 public class JobInstanceResource {
     /**
      * The job service.
diff --git a/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/stepexecution/StepExecutionResource.java b/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/stepexecution/StepExecutionResource.java
index 35ae64e..6b63472 100644
--- a/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/stepexecution/StepExecutionResource.java
+++ b/batch/src/main/java/org/seedstack/monitoring/batch/internal/rest/stepexecution/StepExecutionResource.java
@@ -31,7 +31,7 @@
  *
  * @author aymen.abbes@ext.mpsa.com
  */
-@Path("/jobs/executions/{jobExecutionId}/steps")
+@Path("/seed-monitoring/jobs/executions/{jobExecutionId}/steps")
 public class StepExecutionResource {
     @Inject
     @Named("jobService")
diff --git a/bower.json b/bower.json
deleted file mode 100644
index 0d1f30f..0000000
--- a/bower.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "seedstack-monitoring-addon",
-  "version": "2.1.0",
-  "ignore": [
-    ".*",
-    "*.iml",
-    "*.md",
-    "specs",
-    "bom",
-    "core",
-    "demo",
-    "doc",
-    "rest",
-    "web",
-    "bower_components",
-    "coverage",
-    "node_modules",
-    "gruntfile.js",
-    "target",
-    "package.json"
-  ],
-  "dependencies": {
-    "w20": "~2.0.0"
-  }
-}
\ No newline at end of file
diff --git a/package.json b/package.json
deleted file mode 100644
index 6326275..0000000
--- a/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "seedstack-monitoring-addon",
-  "version": "2.1.0",
-  "description": "SeedStack monitoring add-on",
-  "license": "MPL 2.0",
-  "contributors": [
-    {
-      "name": "Aymen ABBES",
-      "email": "aymen.abbes@ext.mpsa.com"
-    },
-    {
-      "name": "Adrien LAUER",
-      "email": "adrien.lauer@mpsa.com"
-    },
-    {
-      "name": "Kavi RAMYEAD",
-      "email": "kavi.ramyead@ext.mpsa.com"
-    }
-  ],
-  "devDependencies": {
-    "grunt": "~0.4",
-    "grunt-contrib-clean": "~0.6",
-    "grunt-contrib-jshint": "~0.10",
-    "grunt-contrib-concat": "~0.5.0",
-    "grunt-contrib-uglify": "~0.6.0",
-    "grunt-bower-task": "~0.4"
-  }
-}
diff --git a/web/pom.xml b/web/pom.xml
index 3796610..0570d85 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -53,7 +53,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <copy todir="${project.build.directory}/classes/META-INF/resources/resources/bower_components/w20-monitoring-addon">
+                                <copy todir="${project.build.directory}/classes/META-INF/resources/bower_components/w20-monitoring-addon">
                                     <fileset dir="${project.build.directory}/grunt/bower_components/w20-monitoring-addon" />
                                 </copy>
                             </target>