Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2012-11-28 23:16:05 -0500
committerWinston Prakash2012-11-28 23:16:05 -0500
commit106dc4a364c4d64c8ae601119949c30b1b202f3d (patch)
tree99393a8815b08aa476e09ffaa044f3547282f689
parent28bb28226ad3ece95cb5b7d0090e30c40f11ed66 (diff)
downloadorg.eclipse.hudson.core-106dc4a364c4d64c8ae601119949c30b1b202f3d.tar.gz
org.eclipse.hudson.core-106dc4a364c4d64c8ae601119949c30b1b202f3d.tar.xz
org.eclipse.hudson.core-106dc4a364c4d64c8ae601119949c30b1b202f3d.zip
Do not send stack trace while creating Windows Service if JNA Plugin is not installed. Just send the message to install the JNA plugin
-rw-r--r--hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java12
-rw-r--r--hudson-core/src/main/resources/org/eclipse/hudson/plugins/PluginCenter/index.jelly65
2 files changed, 67 insertions, 10 deletions
diff --git a/hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
index 1d07322c..b836a28d 100644
--- a/hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
+++ b/hudson-core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
@@ -103,10 +103,14 @@ public class WindowsInstallerLink extends ManagementLink {
sendError(".NET Framework 2.0 or later is required for this feature", req, rsp);
}
} catch (NativeAccessException exc) {
- StringWriter stWriter = new StringWriter();
- PrintWriter writer = new PrintWriter(stWriter);
- exc.printStackTrace(writer);
- sendError("Native function isDotNetInstalled() failed. " + stWriter.toString(), req, rsp);
+ if (exc.getMessage().contains("Native Windows Support plugin not installed")) {
+ sendError("Java Native Access support plugin is not installed. It is required to create Windows Service", req, rsp);
+ } else {
+ StringWriter stWriter = new StringWriter();
+ PrintWriter writer = new PrintWriter(stWriter);
+ exc.printStackTrace(writer);
+ sendError("Native Windows function isDotNetInstalled() failed. " + stWriter.toString(), req, rsp);
+ }
}
diff --git a/hudson-core/src/main/resources/org/eclipse/hudson/plugins/PluginCenter/index.jelly b/hudson-core/src/main/resources/org/eclipse/hudson/plugins/PluginCenter/index.jelly
index 9f27f7db..55287078 100644
--- a/hudson-core/src/main/resources/org/eclipse/hudson/plugins/PluginCenter/index.jelly
+++ b/hudson-core/src/main/resources/org/eclipse/hudson/plugins/PluginCenter/index.jelly
@@ -123,6 +123,9 @@
<div id="innerTabs">
<ul>
<li>
+ <a href="#compatibilityTab">Compatibility</a>
+ </li>
+ <li>
<a href="#featuredTab">Featured</a>
</li>
<li>
@@ -135,9 +138,59 @@
<a href="#searchTab">Search</a>
</li>
</ul>
+
+ <div id="compatibilityTab">
+ <ul id="installList" class="setup">
+ <li>
+ <p class="description">
+ These core plugins provide key extensions to Hudson to ensure maximum compatibility with a wide range of 3rd party plugins and Operating Systems function.
+ Although these plugins are not required we
+ <em>strongly</em> recommend that you install them to ensure maximum compatibility with the existing range of 3rd party Hudson plugins.
+ </p>
+ <div class="tabBody">
+ <div class="items-container">
+
+ <j:forEach var="category" items="${it.updateSiteManager.PluginCategories}">
+ <j:set var="pluginsList" value="${it.getCategorizedAvailablePlugins('compatibility', category)}" />
+ <j:if test="${!empty(pluginsList)}">
+ <table width="98%" border="0" id="compatibilityPlugins" cellpadding="5" style="margin-left:10px">
+ <j:forEach var="p" items="${pluginsList}">
+ <tr>
+ <td class="column1">
+ <j:if test="${!it.isInstalled(p)}">
+ <input class="install_cb_${p.name}" type="checkbox" value="${p.name}"/>
+ <img class="install_img_${p.name}" style="display:none;"/>
+ </j:if>
+ <j:if test="${it.isInstalled(p)}">
+ <img src="${imagesURL}/green-check.jpg" alt=""/>
+ </j:if>
+ </td>
+ <td class="column2">
+ <div>
+ <a href="${p.wikiUrl}" target="_blank">
+ ${p.displayName}
+ </a>
+ </div>
+ <div class="excerpt" style="padding-top: 5px;">
+ <j:out value="${it.markupFormatter.translate(p.description)}" />
+ </div>
+ </td>
+ <td class="column3" >
+ ${p.version}
+ </td>
+ </tr>
+ </j:forEach>
+ </table>
+ </j:if>
+ </j:forEach>
+ </div>
+ </div>
+ </li>
+ </ul>
+ </div>
<div id="featuredTab">
- <ul id="installList" class="setup">
+ <ul class="setup">
<li>
<p class="description">
Following are featured plugins. They are tested and certified by Hudson QA team. Select the plugins and click install to download and install the plugins.
@@ -192,7 +245,7 @@
</div>
<div id="recommendedTab">
- <ul id="installList" class="setup">
+ <ul class="setup">
<li>
<p class="description">
Following plugins are recommended. They are actively maintained by Hudson community developers and widely used.
@@ -247,7 +300,7 @@
</div>
<div id="othersTab">
- <ul id="installList" class="setup">
+ <ul class="setup">
<li>
<p class="description">
Following plugins are available for install. If you have trouble using any of these plugins contact Hudson developer community mailing list at dev@hudson.java.net.
@@ -302,7 +355,7 @@
</div>
<div id="searchTab">
- <ul id="installList" class="setup">
+ <ul class="setup">
<li>
<p class="description">
Search and find plugins to install. Then select the plugins and click install to download and install the plugins.
@@ -341,7 +394,7 @@
<br style="clear:both"/>
</div>
<div id="installedTab">
- <ul id="installList" class="setup">
+ <ul class="setup">
<li>
<p class="description">
Following plugins are already installed in your Hudson server. Click button to disable/enable the plugins.
@@ -417,7 +470,7 @@
</span>
</div>
<div id="advancedTab">
- <ul id="installList" class="setup">
+ <ul class="setup">
<li>
<h3 style="margin-left: 0px">
Proxy Setup

Back to the top