java/code/src/com/redhat/rhn/domain/server/Server.java | 13 +++-----
java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 26 ----------------
java/spacewalk-java.spec | 6 +++
rel-eng/packages/spacewalk-java | 2 -
4 files changed, 12 insertions(+), 35 deletions(-)
New commits:
commit d79f7fcac9fb6a1cb85a9ccbe6e0e2c88fbf336f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Sep 2 15:06:00 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.37-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 90a3dfe..b733fee 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.36
+Version: 1.6.37
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -547,6 +547,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Sep 02 2011 Miroslav Suchý 1.6.37-1
+- show cname aliases in hw tab from config file (msuchy(a)redhat.com)
+- Checkstyle fixes (mzazrivec(a)redhat.com)
+
* Fri Sep 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.36-1
- checkstyle fix (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5b0caad..8089b4e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.36-1 java/
+1.6.37-1 java/
commit 3176e7223d3899f0d2884e9defa58c82c5faed93
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Sep 2 08:54:48 2011 +0200
show cname aliases in hw tab from config file
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java
b/java/code/src/com/redhat/rhn/domain/server/Server.java
index dd2f696..ee7a1d0 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -113,6 +113,8 @@ public class Server extends BaseDomainHelper implements Identifiable
{
private Set<? extends ServerGroup> groups;
private Set<Capability> capabilities;
+ public static final String VALID_CNAMES = "valid_cnames_";
+
/**
* @return Returns the capabilities.
*/
@@ -950,13 +952,10 @@ public class Server extends BaseDomainHelper implements Identifiable
{
*/
public List<String> getCnames() {
List<String> result = new ArrayList();
- Iterator nets = networks.iterator();
- if (nets.hasNext()) {
- nets.next(); // skip primary interface
- }
- while (nets.hasNext()) {
- Network net = (Network) nets.next();
- result.add(net.getHostname());
+ List proxyCnames = Config.get().getList(VALID_CNAMES +
+ serverInfo.getId().toString());
+ if (!proxyCnames.isEmpty()) {
+ result.addAll(proxyCnames);
}
return result;
}
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
index 1fa7ca4..04405f9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
@@ -5,15 +5,6 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html:html xhtml="true">
- <head>
- <script src="/dojo/dojo/dojo.js" djConfig="parseOnLoad:
true">
- <script type="text/javascript">
- dojo.require("dijit.form.DropDownButton");
- dojo.require("dijit.TooltipDialog");
- dojo.require("dijit.form.TextBox");
- dojo.require("dijit.form.Button");
- </script>
- </head>
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
@@ -164,23 +155,6 @@
</c:otherwise>
</c:choose>
</td>
- <td>
- <div dojoType="dijit.form.DropDownButton">
- <span>
- + Add CName alias
- </span>
- <div dojoType="dijit.TooltipDialog">
- <label for="cname_alias">
- CName alias:
- </label>
- <input dojoType="dijit.form.TextBox"
id="cname_alias" name="cname_alias">
- <br>
- <button dojoType="dijit.form.Button"
type="submit">
- Save
- </button>
- </div>
- </div>
- </td>
</tr>
<c:forEach items="${network_cnames}" var="cname_alias"
varStatus="loop">
<tr>