i18n & fix

jenkinsci · Aug 6, 2017 · 318cc09 · 318cc09
1 parent 0d38248
commit 318cc09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/kagilum/plugins/icescrum/IceScrumSession.java b/src/main/java/com/kagilum/plugins/icescrum/IceScrumSession.java
@@ -66,8 +66,9 @@ public boolean isConnect() {
                     throw new IOException(Messages.IceScrumSession_icescrum_http_notfound());
                 }
                 if (version.startsWith("7.")) {
-                    method = new GetMethod(settings.getUrl() + settings.getPath() + settings.getPkey() + "/build");
+                    method = new GetMethod(settings.getUrl() + settings.getPath() + settings.getPkey() + "/build/jenkins");
                     return executeMethod(method, 200);
+
                 } else {
                     //Only Pro version contains build business object
                     if (!version.contains("Pro")){
@@ -168,7 +169,7 @@ private void setAuthentication(HttpMethodBase method) throws MalformedURLExcepti
     private void checkServerStatus(int code) throws IOException {
         switch(code){
             case HttpStatus.SC_SERVICE_UNAVAILABLE:
-                throw new IOException(Messages.IceScrumSession_icescrum_http_unavailable());
+                throw new IOException(settings.isTokenAuth() ? Messages.IceScrumSession_icescrum_http_unavailable_new() : Messages.IceScrumSession_icescrum_http_unavailable());
             case HttpStatus.SC_UNAUTHORIZED:
                 throw new IOException(Messages.IceScrumSession_icescrum_http_unauthorized());
             case HttpStatus.SC_FORBIDDEN:

diff --git a/src/main/resources/com/kagilum/plugins/icescrum/Messages.properties b/src/main/resources/com/kagilum/plugins/icescrum/Messages.properties
@@ -10,6 +10,7 @@ IceScrumSession.icescrum.http.forbidden=You haven''t access to this project...
 IceScrumSession.icescrum.http.notfound=No project or iceScrum server found...
 IceScrumSession.icescrum.http.unauthorized=Wrong access token or login/pass...
 IceScrumSession.icescrum.http.unavailable=Either Web services or Continuous integration is not activated on your iceScrum project...
+IceScrumSession.icescrum.http.unavailable.new=Jenkins app is not activated on your iceScrum project...
 IceScrumBuildNotifier.icescrum.build.success=Successfully sent current build status & link to tasks on iceScrum project (
 IceScrumBuildNotifier.icescrum.build.error=Error, Jenkins couldn''t send current build status & link to tasks on iceScrum project (
 IceScrumBuildNotifier.icescrum.build.empty=Warning\: Jenkins didn''t find any tasks to update in iceScrum