utils/spacewalk-hostname-rename
by Tomáš Kašpárek
utils/spacewalk-hostname-rename | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 94338efd5949b068a0b997cda7a971a5df3c98d7
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Nov 13 09:26:46 2013 +0100
adding postgresql92-postgresql to possible db service names
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index fa8c512..06472c1 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -48,6 +48,9 @@ elif [ "$(spacewalk-cfg-get db_backend)" = "postgresql" ]; then
if [ -x /etc/init.d/postgresql ]; then
DB_SERVICE="postgresql"
fi
+ if [ -x /etc/init.d/postgresql92-postgresql ]; then
+ DB_SERVICE="postgresql92-postgresql"
+ fi
fi
MONITORING_ENABLED=`awk -F= '! /[[:space:]]*#/ && /web.is_monitoring_backend/ {gsub(/[[:space:]]*/,""); print $2}' $RHN_CONF_FILE`
10 years, 2 months
Changes to 'refs/tags/spacewalk-java-2.1.134-1'
by Jan Dobes
Tag 'spacewalk-java-2.1.134-1' created by Jan Dobes <jdobes(a)redhat.com> at 2014-01-28 11:52 +0000
Tagging package [spacewalk-java] version [2.1.134-1] in directory [java/].
Changes since spacewalk-repo-2.1-2:
Bo Maryniuk (6):
Datepicker UI unification: SSM/Packages/Remove
Datepicker UI unification: SSM/Packages/Install
Datepicker UI unification: SSM/Packages/Verify
Datepicker UI unification: SSM/Packages/Upgrade
Datepicker UI unification: SSM/Configuration/Enable
Datepicker UI unification: Systems/Software/Packages/List-Remove
Jan Dobes (2):
remove old message
Automatic commit of package [spacewalk-java] release [2.1.134-1].
---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 56 +++---
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 56 ++----
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 59 ++----
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 55 ++----
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 49 ++---
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 88 ++++------
java/spacewalk-java.spec | 14 +
rel-eng/packages/spacewalk-java | 2
9 files changed, 167 insertions(+), 218 deletions(-)
---
10 years, 2 months
8 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 56 +++---
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 56 ++----
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 59 ++----
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 55 ++----
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 49 ++---
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 88 ++++------
java/spacewalk-java.spec | 14 +
rel-eng/packages/spacewalk-java | 2
9 files changed, 167 insertions(+), 218 deletions(-)
New commits:
commit 67f0e9a33af3f8b47c8efba87b935853ccbcd752
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jan 28 12:52:39 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.134-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index de2c030..f94c613 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.133
+Version: 2.1.134
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,18 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jan 28 2014 Jan Dobes 2.1.134-1
+- remove old message
+- Datepicker UI unification: Systems/Software/Packages/List-Remove
+- Datepicker UI unification: SSM/Configuration/Enable
+- Datepicker UI unification: SSM/Packages/Upgrade
+- Datepicker UI unification: SSM/Packages/Verify
+- Datepicker UI unification: SSM/Packages/Install
+- Datepicker UI unification: SSM/Packages/Remove
+- add javadoc comment
+- removing @Override annotation from method that isn't overriden
+- remove unnecessary cast
+
* Mon Jan 27 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.133-1
- Unstyled Systems/Software/Channels
- Fixed unstyled form for XCCDF scaner on SSM and single system
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 92c46e7..5f6c19e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.133-1 java/
+2.1.134-1 java/
commit 316dffcf8eccf2b37ec5762fc4adbed6da6dffa0
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jan 28 12:40:07 2014 +0100
remove old message
there is no longer asap and select date option, only select date
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
index 879c85b..569314b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
@@ -46,7 +46,6 @@
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
<jsp:param name="widget" value="date"/>
</jsp:include>
- <span class="help-block"><bean:message key="${widgetSummary}"/></span>
</div>
</div>
<div class="form-group">
commit e9cd596285ff0d2f66fa7ef61c5add172736bb1d
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 17:08:39 2014 +0100
Datepicker UI unification: Systems/Software/Packages/List-Remove
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
index f9bbe02..879c85b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
@@ -37,60 +37,47 @@
</rl:list>
<c:if test="${not empty requestScope.pageList}">
- <div class="text-right">
- <div align="left">
- <p><bean:message key="${widgetSummary}"/></p>
- </div>
-
- <table class="schedule-action-interface" align="center">
-
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked" /></td>
- <th><bean:message key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true"/></td>
- <th><bean:message key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" />
- </th>
- <td>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
<jsp:param name="widget" value="date"/>
</jsp:include>
- </td>
- </tr>
- </table>
-
- <hr />
- <c:if test="${not empty requestScope.enableRemoteCommand}">
- <rhn:require mixins="com.redhat.rhn.common.security.acl.SystemAclHandler" acl="system_feature(ftr_remote_command); client_capable(script.run)">
- <c:choose>
- <c:when test="${requestScope.mode == 'remove'}">
- <input type="submit"
- name ="dispatch"
- value='<bean:message key="removeconfirm.jsp.runremotecommand"/>'/>
- </c:when>
- <c:when test="${requestScope.mode == 'install'}">
- <input type="submit"
- name ="dispatch"
- value='<bean:message key="installconfirm.jsp.runremotecommand"/>'/>
- </c:when>
- <c:otherwise>
- <input type="submit"
- name ="dispatch"
- value='<bean:message key="upgradeconfirm.jsp.runremotecommand"/>'/>
- </c:otherwise>
- </c:choose>
- </rhn:require>
- </c:if>
- <input type="submit"
- name ="dispatch"
- value='<bean:message key="installconfirm.jsp.confirm"/>'/>
- </div>
-
- <input type="hidden" name="sid" value="${param.sid}" /></c:if>
+ <span class="help-block"><bean:message key="${widgetSummary}"/></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:if test="${not empty requestScope.enableRemoteCommand}">
+ <rhn:require mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"
+ acl="system_feature(ftr_remote_command); client_capable(script.run)">
+ <c:choose>
+ <c:when test="${requestScope.mode == 'remove'}">
+ <input type="submit" name ="dispatch"
+ value='<bean:message key="removeconfirm.jsp.runremotecommand"/>'/>
+ </c:when>
+ <c:when test="${requestScope.mode == 'install'}">
+ <input type="submit" name ="dispatch"
+ value='<bean:message key="installconfirm.jsp.runremotecommand"/>'/>
+ </c:when>
+ <c:otherwise>
+ <input type="submit" name ="dispatch"
+ value='<bean:message key="upgradeconfirm.jsp.runremotecommand"/>'/>
+ </c:otherwise>
+ </c:choose>
+ </rhn:require>
+ </c:if>
+ <input type="submit" name ="dispatch"
+ value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ <input type="hidden" name="sid" value="${param.sid}" />
+ </div>
+ </div>
+ </div>
+ <input type="hidden" name="use_date" value="true" />
+</c:if>
</rl:listset>
</body>
commit b8520bbad4aa47a4e9a0aee5035ecbcf25d0368c
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 16:05:57 2014 +0100
Datepicker UI unification: SSM/Configuration/Enable
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
index 770a620..c83408b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
@@ -4,31 +4,31 @@
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<c:if test="${not empty requestScope.pageList}">
-<p><bean:message key="targetsystems.jsp.widgetsummary" /></p>
-<table class="table">
- <tr>
- <td><html:radio property="use_date" value="false" /></td>
- <td><bean:message key="targetsystems.jsp.now"/></td>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true" /></td>
- <td><bean:message key="targetsystems.jsp.usedate"/></td>
- </tr>
- <tr>
- <td>
- <rhn:icon type="header-system" />
- </td>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
-</table>
-
-<div class="pull-right">
- <html:submit property="dispatch">
- <bean:message key="targetsystems.jsp.enable" />
- </html:submit>
-</div>
-</c:if>
\ No newline at end of file
+ <div class="form-horizontal">
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <span class="help-block">
+ <bean:message key="targetsystems.jsp.widgetsummary" />
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-md-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <html:submit property="dispatch">
+ <bean:message key="targetsystems.jsp.enable" />
+ </html:submit>
+ <input type="hidden" name="use_date" value="true" />
+ </div>
+ </div>
+ </div>
+</c:if>
commit 26e92d487ccaaa6f66aaa4326c427bb6b6428750
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 15:44:34 2014 +0100
Datepicker UI unification: SSM/Packages/Upgrade
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
index e258855..a5bc167 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
@@ -52,45 +52,32 @@
</rl:list>
- <div class="text-right">
-
- <div align="left">
- <p><bean:message key="installconfirm.jsp.widgetsummary"/></p>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
</div>
-
- <table class="schedule-action-interface" align="center">
-
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked"/>
- </td>
- <th><bean:message key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true"/></td>
- <th><bean:message key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message key="upgradeconfirm.jsp.runremotecommand"/>'/>
- <input type="submit"
- name="dispatch"
- value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message key="upgradeconfirm.jsp.runremotecommand"/>'/>
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ </div>
+ </div>
</div>
<input type="hidden" name="packagesDecl" value="${requestScope.packagesDecl}" />
<input type="hidden" name="mode" value="${param.mode}" />
+ <input type="hidden" name="use_date" value="true" />
</rl:listset>
commit 51291b3b14b7cda1c84b5fc9a320db4f54d80bf2
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 15:42:39 2014 +0100
Datepicker UI unification: SSM/Packages/Verify
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
index 9780610..83b129c 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
@@ -47,42 +47,29 @@
</rl:list>
- <div class="text-right">
-
- <div align="left">
- <p><bean:message key="installconfirm.jsp.widgetsummary"/></p>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
</div>
-
- <table class="schedule-action-interface" align="center">
-
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked"/>
- </td>
- <th><bean:message key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true"/></td>
- <th><bean:message key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ </div>
+ </div>
</div>
<input type="hidden" name="packagesDecl" value="${requestScope.packagesDecl}" />
<input type="hidden" name="cid" value="${param.cid}" />
+ <input type="hidden" name="use_date" value="true" />
</rl:listset>
commit 6a37c8307a3d05db5e40757c1689df04d347c83d
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 15:35:10 2014 +0100
Datepicker UI unification: SSM/Packages/Install
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
index 8e3fa1d..2b4c50e 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
@@ -38,46 +38,34 @@
</rl:list>
- <div class="text-right">
-
- <div align="left">
- <p><bean:message key="installconfirm.jsp.widgetsummary"/></p>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message key="installconfirm.jsp.runremotecommand"/>'/>
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ </div>
</div>
-
- <table class="schedule-action-interface" align="center">
-
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked"/>
- </td>
- <th><bean:message key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true"/></td>
- <th><bean:message key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message key="installconfirm.jsp.runremotecommand"/>'/>
- <input type="submit"
- name="dispatch"
- value='<bean:message key="installconfirm.jsp.confirm"/>'/>
</div>
<input type="hidden" name="packagesDecl" value="${requestScope.packagesDecl}" />
<input type="hidden" name="cid" value="${param.cid}" />
<input type="hidden" name="mode" value="${param.mode}" />
+ <input type="hidden" name="use_date" value="true" />
+
</rl:listset>
</body>
commit 8af83156f3b89186d7cc73adc5db046cddf8496d
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 14:55:39 2014 +0100
Datepicker UI unification: SSM/Packages/Remove
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 059a4a4..6b09a0e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -6240,6 +6240,12 @@ value for this entitlement, excluding the default organization's consumption.</s
<context context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="schedule.jsp.at">
+ <source>Schedule no sooner than a specified time:</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="scheduleremote.jsp.schedulepackageremoval">
<source>Confirm Remote Command and Schedule Package Removal</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
index 7299058..e2d98cf 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
@@ -47,46 +47,29 @@
</rl:list>
- <div class="text-right">
-
- <div align="left">
- <p><bean:message key="installconfirm.jsp.widgetsummary"/></p>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
</div>
-
- <table class="schedule-action-interface" align="center">
-
- <tr>
- <td><input type="radio" name="use_date" value="false" checked="checked"/>
- </td>
- <th><bean:message key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date" value="true"/></td>
- <th><bean:message key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message key="removeconfirm.jsp.runremotecommand"/>'/>
- <input type="submit"
- name="dispatch"
- value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit" name="dispatch" class="btn btn-success"
+ value='<bean:message key="removeconfirm.jsp.runremotecommand"/>'/>
+ <input type="submit" name="dispatch" class="btn btn-success"
+ value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ </div>
+ </div>
+ <input type="hidden" name="packagesDecl" value="${requestScope.packagesDecl}" />
+ <input type="hidden" name="mode" value="${param.mode}" />
+ <input type="hidden" name="use_date" value="true" />
</div>
-
- <input type="hidden" name="packagesDecl" value="${requestScope.packagesDecl}" />
- <input type="hidden" name="mode" value="${param.mode}" />
-
</rl:listset>
</body>
10 years, 2 months
Changes to 'refs/tags/spacewalk-repo-2.1-2'
by Michael Mraka
Tag 'spacewalk-repo-2.1-2' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-28 11:03 +0000
Tagging package [spacewalk-repo] version [2.1-2] in directory [spec-tree/spacewalk-repo/].
Changes since spacewalk-repo-2.1.2-1:
Michael Mraka (2):
reverted versioning of package
Automatic commit of package [spacewalk-repo] minor release [2.1-2].
---
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 7 +++++--
spec-tree/spacewalk-repo/tito.props | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 2 months
2 commits - rel-eng/packages spec-tree/spacewalk-repo
by Michael Mraka
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 7 +++++--
spec-tree/spacewalk-repo/tito.props | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 1d74dedb0976f9a1e57d91fb1f0552d73f3fc5fd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 28 12:03:19 2014 +0100
Automatic commit of package [spacewalk-repo] minor release [2.1-2].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index 492d238..a357436 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-2.1.2-1 spec-tree/spacewalk-repo/
+2.1-2 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 58509d2..e2d2962 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
Version: 2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Base
# This src.rpm is cannonical upstream
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo
%changelog
+* Tue Jan 28 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1-2
+- reverted versioning of package
+
* Tue Jan 28 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1
- fixed variable quoting
commit 34ecca45432ae6ba139da503c3d05fada26c3bf6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 28 11:59:21 2014 +0100
reverted versioning of package
mistakenly changed in 6da311369259d11c32dbb80df1ae50b70a6d9e41
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 42c188f..58509d2 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,6 +1,6 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
-Version: 2.1.2
+Version: 2.1
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
diff --git a/spec-tree/spacewalk-repo/tito.props b/spec-tree/spacewalk-repo/tito.props
index 355908e..2a8b6d9 100644
--- a/spec-tree/spacewalk-repo/tito.props
+++ b/spec-tree/spacewalk-repo/tito.props
@@ -1,2 +1,3 @@
[buildconfig]
builder = spacewalkx.builderx.NoTgzBuilder
+tagger = tito.tagger.ReleaseTagger
10 years, 2 months
Changes to 'refs/tags/spacewalk-repo-2.1.2-1'
by Michael Mraka
Tag 'spacewalk-repo-2.1.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-28 10:00 +0000
Tagging package [spacewalk-repo] version [2.1.2-1] in directory [spec-tree/spacewalk-repo/].
Changes since spacewalk-web-2.1.52-1:
Michael Mraka (2):
fixed variable quoting
Automatic commit of package [spacewalk-repo] release [2.1.2-1].
Tomas Lestach (3):
remove unnecessary cast
removing @Override annotation from method that isn't overriden
add javadoc comment
---
java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java | 5 ++++-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java | 2 +-
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 7 +++++--
4 files changed, 11 insertions(+), 5 deletions(-)
---
10 years, 2 months
2 commits - rel-eng/packages spec-tree/spacewalk-repo
by Michael Mraka
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ecdbddf9c38842d99e6b1db1f869dac15e1a73ed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 28 11:00:26 2014 +0100
Automatic commit of package [spacewalk-repo] release [2.1.2-1].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index eb3ac0e..492d238 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-2.1.1-1 spec-tree/spacewalk-repo/
+2.1.2-1 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index d70982b..42c188f 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,6 +1,6 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo
%changelog
+* Tue Jan 28 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1
+- fixed variable quoting
+
* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1
- reverted tagger to VersionTagger
commit c689beea2041af744c810d0a8f11c6077a8f6fbe
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 28 09:52:45 2014 +0100
fixed variable quoting
it should expand neither in macro nor in shell
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index e53092d..d70982b 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -34,7 +34,7 @@ rm -rf $RPM_BUILD_ROOT
# some sane default value
%define reposubdir RHEL/%{rhel}
# redefine on fedora
-%{?fedora: %define reposubdir Fedora/\$releasever}
+%{?fedora: %define reposubdir Fedora/\\\$releasever}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk.repo <<REPO
10 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 65255fb20e2ae038a1d4f08e1fba31382d7e309e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 28 10:31:42 2014 +0100
add javadoc comment
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java
index 774c61e..3f89f95 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java
@@ -55,6 +55,9 @@ public class ProbesListAction extends RhnAction implements Listable {
return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
+ /**
+ * {@inheritDoc}
+ */
public List getResult(RequestContext context) {
ManagedServerGroup serverGroup = context.lookupAndBindServerGroup();
return MonitoringManager.getInstance().
10 years, 2 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 36aad0e900849e5b344d0c1dc3b88bdaf2c6ec3f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 28 10:26:21 2014 +0100
removing @Override annotation from method that isn't overriden
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java
index fcaae78..774c61e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/ProbesListAction.java
@@ -54,7 +54,7 @@ public class ProbesListAction extends RhnAction implements Listable {
return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
- @Override
+
public List getResult(RequestContext context) {
ManagedServerGroup serverGroup = context.lookupAndBindServerGroup();
return MonitoringManager.getInstance().
commit 295a5ddda301e0abc701d005fc532776bea461d7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 28 10:25:17 2014 +0100
remove unnecessary cast
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java
index 5e4c998..d83a3cb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java
@@ -52,7 +52,7 @@ public class SystemRebootAction extends RhnAction {
DynaActionForm form = (DynaActionForm) formIn;
RequestContext context = new RequestContext(request);
User user = context.getLoggedInUser();
- Map<String, Object> params = (Map<String, Object>) makeParamMap(request);
+ Map<String, Object> params = makeParamMap(request);
String forward = RhnHelper.DEFAULT_FORWARD;
Long sid = context.getRequiredParam(RequestContext.SID);
10 years, 2 months
Changes to 'master-action-chaining'
by Silvio Moioli
New branch 'master-action-chaining' available with the following commits:
commit 6b379a4a40802a48186ae72df2c4dc46601c9bb5
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Jan 24 19:40:47 2014 +0100
Squashme: ActionChain API
commit 06adbb8d698a44052b7cd131d8055440db39b708
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Jan 23 20:22:32 2014 +0100
TBD: Added ActionChainHandler
commit 2582d5cadbf2029c30940ed6f04cf662da132481
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 17:16:03 2014 +0100
Action Chain Edit page: add delete chain button
commit f499f59f13da59a7a4b0e397e67b6f65f7282b2d
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 15:18:24 2014 +0100
Action Chain Edit page added
Browsing only at the moment, editing will be added later
commit 9b01229c5bb5178e46954a06d6f8f19583b2ef0f
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 16:44:48 2014 +0100
Action Chain List page added
commit e1a422849204a69f3c2f0f265202d8df57ad6a60
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:21:11 2014 +0100
Reboot: use proper user messages
commit 1843b0d2e32e9d18ac39a7c73af5a3b8d080620d
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:18:15 2014 +0100
Reboot: allow queuing to Action Chains
commit 2a7298150e985bc788f26d7ed8c00a50b45c9f15
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:00:37 2014 +0100
Deploy Configuration: use proper user message
commit ee4343164bd34b2134153d9be50af39b19d718fa
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 17:42:37 2014 +0100
Deploy Configuration: allow queuing to Action Chains
commit 90df8bcae9d6cefe170b2d4e36046f1cf881713d
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:36:34 2014 +0100
Remote Command: use proper user message
commit e417881c11f34e396c6b4918bda2d7f7ced8a98a
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:32:05 2014 +0100
Remote Command: allow queuing to Action Chains
commit 95d9dbdc58c0a5fee462986495d0f563a7070af0
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:53:37 2014 +0100
Errata actions: use proper user message
commit c493fe57310ab49abdfd32de66d54f3e00669842
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:27:50 2014 +0100
Errata actions: allow queuing to Action Chains
commit 0b55d48bf54cae6fd81bb2d56ad441f735c2518a
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 12:17:04 2014 +0100
Remove functionality to add remote command before a package action, it is superseded by Action Chains
commit 03277d07f9271c42e98103a7790c665ee52f9606
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 13:44:54 2014 +0100
Single system package actions: use proper user message
commit abe356e332b20ed64e329a6a84b729635fbfc150
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 09:23:45 2014 +0100
Single system package actions: allow queuing to Action Chains
commit fdc5bb863a9698fe81b473e2bf9219cd6862410a
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:50 2014 +0100
Controller helper tests added
commit ea62b89e4a0a445ec5a81b4be9b7416061518af1
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:38 2014 +0100
Controller helper class added
commit b1a83c2f9b6922b46764143337192e5ee7ea5cac
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:48 2014 +0100
ORM class tests added
commit 85add3f6da33714a41d63dae82567177df16fb45
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:23 2014 +0100
ORM classes for new tables added
commit 1568572ed5d57191e5ea1f88c5e8e43f69b33521
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 13 12:23:52 2014 +0100
New tables and upgrade scripts added
commit 073ed38547923d8fdfa4b14ab72cca56513827c9
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:27 2014 +0100
Front-end code for action chain creation/selection added
commit 2dc4311aa150800bf2553b28f6ff5f24b23aec9c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 14:48:17 2014 +0100
Javascript library jQuery UI added
commit 8c1184019c9e636b6e6261f4adab73edb16c2f29
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:55 2014 +0100
Javascript library select2 added
commit 9e569049f37879777801c2465fd318eee40e3327
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 10:54:01 2014 +0100
ActionFormatter: utility methods tests
commit bd8322af47fcc2a779388a48b99b418db9b37c23
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 09:10:19 2014 +0100
ActionFormatter: add utility methods
commit ce33eef48b3c5a2b8d154f626502134554e47010
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 8 18:34:43 2014 +0100
Refactoring: use a fragment for scheduling options on supported operations
10 years, 2 months