Display plugin version on the administration page

PeteGoo · Feb 8, 2015 · 474855e · 474855e
1 parent 6a8bd7b
commit 474855e
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 8 deletions.
diff --git a/tcslackbuildnotifier-core/pom.xml b/tcslackbuildnotifier-core/pom.xml
@@ -35,6 +35,13 @@
 			</plugin>
 		</plugins>
 
+		<resources> 
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering> 
+			</resource>
+		</resources>
+
 		<!-- <resources> <resource> <directory>src/main/resources</directory> <filtering>false</filtering> 
 			</resource> <resource> <directory>src/main/teamcity-plugin-resources</directory> 
 			<filtering>true</filtering> <includes> <include>*.xml</include> <include>*.properties</include> 

diff --git a/...ore/src/main/java/slacknotifications/teamcity/settings/SlackNotificationMainSettings.java b/...ore/src/main/java/slacknotifications/teamcity/settings/SlackNotificationMainSettings.java
@@ -7,11 +7,18 @@
 import slacknotifications.SlackNotificationProxyConfig;
 import slacknotifications.teamcity.Loggers;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
+
 public class SlackNotificationMainSettings implements MainConfigProcessor {
 	private static final String NAME = SlackNotificationMainSettings.class.getName();
 	private SlackNotificationMainConfig slackNotificationMainConfig;
 	private SBuildServer server;
     private ServerPaths serverPaths;
+    private String version;
 
     public SlackNotificationMainSettings(SBuildServer server, ServerPaths serverPaths){
         this.serverPaths = serverPaths;
@@ -132,4 +139,14 @@ public int getMaxCommitsToDisplay() {
     public void refresh() {
         this.slackNotificationMainConfig.refresh();
     }
+
+    public String getPluginVersion() throws IOException {
+        if(version != null){
+            return version;
+        }
+        Properties props = new Properties();
+        props.load(SlackNotificationMainSettings.class.getResourceAsStream("/version.txt"));
+        version = props.getProperty("version");
+        return version;
+    }
 }
diff --git a/tcslackbuildnotifier-core/src/main/resources/version.txt b/tcslackbuildnotifier-core/src/main/resources/version.txt
@@ -0,0 +1 @@
+version=${pom.version}
diff --git a/tcslackbuildnotifier-core/tcslackbuildnotifier-core.iml b/tcslackbuildnotifier-core/tcslackbuildnotifier-core.iml
@@ -12,10 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />

diff --git a/...er-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotifierAdminPage.java b/...er-web-ui/src/main/java/slacknotifications/teamcity/extension/SlackNotifierAdminPage.java
@@ -1,6 +1,5 @@
 package slacknotifications.teamcity.extension;
 
-import com.intellij.openapi.util.text.StringUtil;
 import jetbrains.buildServer.controllers.admin.AdminPage;
 import jetbrains.buildServer.serverSide.SBuildServer;
 import jetbrains.buildServer.serverSide.auth.Permission;
@@ -14,8 +13,10 @@
 import slacknotifications.teamcity.settings.SlackNotificationMainSettings;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.Properties;
 
 /**
  * Created by Peter on 24/01/2015.
@@ -77,6 +78,12 @@ public void fillModel(@NotNull Map<String, Object> model, @NotNull HttpServletRe
         model.put("encryptedProxyPassword", proxyConfig.getCreds() == null || proxyConfig.getCreds().getPassword() == null ? null : RSACipher.encryptDataForWeb(proxyConfig.getCreds().getPassword()));
         model.put("hexEncodedPublicKey", RSACipher.getHexEncodedPublicKey());
 
+        try {
+            model.put("pluginVersion", this.slackMainSettings.getPluginVersion());
+        } catch (IOException e) {
+            Loggers.ACTIVITIES.error("Could not retrieve slack plugin version", e);
+        }
+
         model.put("disabled", !this.slackMainSettings.getEnabled());
         model.put("jspHome", this.jspHome);
     }

diff --git a/...fier-web-ui/src/main/resources/buildServerResources/SlackNotification/css/adminStyles.css b/...fier-web-ui/src/main/resources/buildServerResources/SlackNotification/css/adminStyles.css
@@ -1,3 +1,9 @@
 #slackNotificationErrors ul li {
     color: red;
+}
+
+.slackNotifierVersionInfo {
+    color: #888;
+    font-size: 90%;
+    float:right;
 }
diff --git a/...r-web-ui/src/main/resources/buildServerResources/SlackNotification/slackAdminSettings.jsp b/...r-web-ui/src/main/resources/buildServerResources/SlackNotification/slackAdminSettings.jsp
@@ -10,6 +10,9 @@
 <div id="settingsContainer">
   <form action="${actionUrl}" id="slackNotifierAdminForm" method="post" onsubmit="return SlackNotifierAdmin.save()" >
     <div class="editNotificatorSettingsPage">
+          <div>
+             <span class="slackNotifierVersionInfo">Version: <c:out value='${pluginVersion}'/>&nbsp;<a href="https://github.com/petegoo/tcSlackBuildNotifier" class="helpIcon" style="vertical-align: middle;" target="_blank"><bs:helpIcon/></a></span>
+          </div>
           <c:choose>
             <c:when test="${disabled}">
               <div class="pauseNote" style="margin-bottom: 1em;">
@@ -22,6 +25,7 @@
               </div>
             </c:otherwise>
           </c:choose>
+
           <bs:messages key="message" />
           <br/>
           <div style="slack-config-errors" id="slackNotificationErrors">

diff --git a/tcslackbuildnotifier-web-ui/tcslackbuildnotifier-web-ui.iml b/tcslackbuildnotifier-web-ui/tcslackbuildnotifier-web-ui.iml
@@ -13,9 +13,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: logkit:logkit:1.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: avalon-framework:avalon-framework:4.1.3" level="project" />
     <orderEntry type="module" module-name="tcslackbuildnotifier-core" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
     <orderEntry type="module" module-name="tcslackbuildnotifier-core" scope="TEST" production-on-test="" />