Merge pull request #22 from adrienlauer/fix-rest-paths

Fix rest paths
seedstack · Nov 13, 2015 · 5bf2148 · 5bf2148
2 parents 86cca3a + c225666
commit 5bf2148
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 60 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,15 +6,15 @@ jdk: oraclejdk8
 
 node_js: "0.12"
 
-before_install: npm install -g bower grunt-cli
-
 notifications:
   irc: "chat.freenode.net#seedstack-dev"
 
 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
@@ -40,7 +40,7 @@
  *
  * @author aymen.abbes@ext.mpsa.com
  */
-@Path("/jobs")
+@Path("/seed-monitoring/jobs")
 public class JobResource {
 
     /**

diff --git a/.../java/org/seedstack/monitoring/batch/internal/rest/jobexecution/JobExecutionResource.java b/.../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/...in/java/org/seedstack/monitoring/batch/internal/rest/jobinstance/JobInstanceResource.java b/...in/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/...ava/org/seedstack/monitoring/batch/internal/rest/stepexecution/StepExecutionResource.java b/...ava/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
diff --git a/package.json b/package.json
diff --git 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>