spacewalk-commits December 2013

spacewalk-commits@lists.fedorahosted.org

11 participants
227 discussions

java/spacewalk-java.spec rel-eng/packages
by Jan Dobes 09 Dec '13

09 Dec '13

java/spacewalk-java.spec | 10 +++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 83d3cf566ca54b4fa4057a0c84a888c00369f58c Author: Jan Dobes <jdobes(a)redhat.com> Date: Mon Dec 9 19:09:50 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.91-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 0b73981..c871028 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.90 +Version: 2.1.91 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,14 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Dec 09 2013 Jan Dobes 2.1.91-1 +- system group details - linking + cleanup +- converting system group details page to java +- LoginExpiredTest fixed +- VirtualizationEntitlementTestCase: dead code removed +- LoginExpiredSatTestCase: rename to respect test convention +- removed trailing whitespaces from jsp{,f} sources + * Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.90-1 - bootstrap tuning diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index a5a1c10..3f07c31 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.90-1 java/ +2.1.91-1 java/

1 0

2 commits - java/code spacewalk/config web/html web/include web/modules
by Jan Dobes 09 Dec '13

09 Dec '13

java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 9 java/code/src/com/redhat/rhn/domain/server/ManagedServerGroup.java | 11 + java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java | 61 +++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 42 ++++ java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java | 18 + java/code/webapp/WEB-INF/nav/system_group_detail.xml | 3 java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 4 java/code/webapp/WEB-INF/pages/groups/detail.jsp | 104 ++++++++++ java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 2 java/code/webapp/WEB-INF/struts-config.xml | 9 spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 6 web/html/network/systems/groups/apply_errata_confirm.pxt | 2 web/html/network/systems/groups/details.pxt | 91 -------- web/html/network/systems/groups/edit_properties.pxt | 2 web/html/network/systems/ssm/groups/index.pxt | 2 web/include/nav/system_group_detail.xml | 3 web/modules/sniglets/Sniglets/ListView/SystemGroupList.pm | 2 21 files changed, 267 insertions(+), 112 deletions(-) New commits: commit 2bf6908e42067aeab8d75eb31195deb471d9ecb9 Author: Jan Dobes <jdobes(a)redhat.com> Date: Thu Dec 5 11:29:06 2013 +0100 system group details - linking + cleanup diff --git a/java/code/webapp/WEB-INF/nav/system_group_detail.xml b/java/code/webapp/WEB-INF/nav/system_group_detail.xml index 2bba613..7671f0a 100644 --- a/java/code/webapp/WEB-INF/nav/system_group_detail.xml +++ b/java/code/webapp/WEB-INF/nav/system_group_detail.xml @@ -1,8 +1,7 @@ <?xml version="1.0"?> <rhn-navi-tree label="system_group_detail" invisible="1" formvar="sgid" title-depth="1"> <rhn-tab name="Details"> - <rhn-tab-url>/network/systems/groups/details.pxt</rhn-tab-url> - <rhn-tab-url>/network/systems/groups/delete_confirm.pxt</rhn-tab-url> + <rhn-tab-url>/rhn/groups/GroupDetail.do</rhn-tab-url> </rhn-tab> <rhn-tab name="Systems"> <rhn-tab-url>/rhn/groups/ListRemoveSystems.do</rhn-tab-url> diff --git a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp index ba5045c..a319d5a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp @@ -35,7 +35,7 @@ headerkey="assignedgroups.jsp.group" sortattr="name"> - <c:out value="<a href=\"/network/systems/groups/details.pxt?sgid=${current.id}\">${current.name}</a>" escapeXml="false" /> + <c:out value="<a href=\"/rhn/groups/GroupDetail.do?sgid=${current.id}\">${current.name}</a>" escapeXml="false" /> </rl:column> <rl:column sortable="true" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf index 20b192c..32c5b07 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf @@ -44,7 +44,7 @@ filterattr="name"> <c:choose> <c:when test = "${not empty requestScope.accessMap[current.id]}"> - <a href="/network/systems/groups/details.pxt?sgid=${current.id}">${current.name}</a> + <a href="/rhn/groups/GroupDetail.do?sgid=${current.id}">${current.name}</a> </c:when> <c:otherwise> ${current.name} diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf index a583eee..befbbd5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf @@ -54,7 +54,7 @@ bound="false" headerkey="grouplist.jsp.name" sortattr="name"> - <c:out value="<a href=\"/network/systems/groups/details.pxt?sgid=${current.id}\">" escapeXml="false" /> + <c:out value="<a href=\"/rhn/groups/GroupDetail.do?sgid=${current.id}\">" escapeXml="false" /> <c:out value="${current.name}" escapeXml="true" /> <c:out value="</a>" escapeXml="false" /> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf index b7b9648..1fb250f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf @@ -53,7 +53,7 @@ bound="false" headerkey="grouplist.jsp.name" sortattr="name" defaultsort="asc" filterattr="name" styleclass="${nameStyle}"> - <a href="/network/systems/groups/details.pxt?sgid=${current.id}">${current.name}</a> + <a href="/rhn/groups/GroupDetail.do?sgid=${current.id}">${current.name}</a> </rl:column> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp index 5e49ea5..7b8c1c6 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp @@ -33,12 +33,12 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf" %> <rl:column headerkey="yourrhn.jsp.systemgroups"> - <a href="/network/systems/groups/details.pxt?sgid=${current.id}"> + <a href="/rhn/groups/GroupDetail.do?sgid=${current.id}"> <c:out value="${current.name}"/></a> </rl:column> <rl:column headerkey="grouplist.jsp.systems"> - <a href="/network/systems/groups/details.pxt?sgid=${current.id}"> + <a href="/rhn/groups/GroupDetail.do?sgid=${current.id}"> <c:out value="${current.serverCount}"/></a> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp index ee16ba7..2cb4a91 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp @@ -137,7 +137,7 @@ <tr class="list-row-odd" id = "systemGroupsRow"> <c:set var ="key" value="System Groups"/> <c:set var ="items_list" value="${requestScope.systems.systemGroups}"/> - <c:set var ="href" value="/network/systems/groups/details.pxt?sgid="/> + <c:set var ="href" value="/rhn/groups/GroupDetail.do?sgid="/> <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> </tr> <tr> diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index fe5c465..de4a5f4 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -127,12 +127,6 @@ PerlConfigRequire PXT/Apache24Config.pm PerlAuthenHandler PXT::ApacheAuth require acl org_entitlement(sw_mgr_enterprise) - <Files details.pxt> - AuthType Basic - AuthName "RHN System Group Admin Area" - require acl user_has_access_to_servergroup() - </Files> - <Files admin_list.pxt> AuthType Basic AuthName "RHN System Group Admin Area" diff --git a/web/html/network/systems/groups/apply_errata_confirm.pxt b/web/html/network/systems/groups/apply_errata_confirm.pxt index 7a92ca3..2b58446 100644 --- a/web/html/network/systems/groups/apply_errata_confirm.pxt +++ b/web/html/network/systems/groups/apply_errata_confirm.pxt @@ -31,7 +31,7 @@ <column name="Entitlement" label="entitlement_level" width="15%" align="center" /> - <action name="Apply Errata" label="confirm_errata_application" url="/network/systems/groups/details.pxt" /> + <action name="Apply Errata" label="confirm_errata_application" url="/rhn/groups/GroupDetail.do" /> </rhn-listview> </grail-canvas-template> diff --git a/web/html/network/systems/groups/details.pxt b/web/html/network/systems/groups/details.pxt deleted file mode 100644 index a79a200..0000000 --- a/web/html/network/systems/groups/details.pxt +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pxt-passthrough> - <pxt-use class="Grail::Frame" /> - <pxt-use class="Sniglets::Users" /> - <pxt-use class="Sniglets::ServerGroup" /> - <pxt-use class="Sniglets::Lists" /> - <pxt-use class="Sniglets::Navi" /> - <pxt-use class="Sniglets::HTML" /> - - <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - -<pxt-include file="/network/components/system_groups/sgdc_header.pxi" /> - -<rhn-admin-server-group-edit-form> - -<div class="row-0"> -<div class="col-md-6"> -<div class="panel panel-default"> - -<div class="panel-heading"> -<h2>Group Updates</h2> - -<rhn-system-group-status-interface> -<div class="system-status">{icon} <span class="{status_class}">{status_str}</span> {message}</div> -</rhn-system-group-status-interface> - - -<br /> -</div> -<pxt-form method="POST" action="/rhn/groups/ListRemoveSystems.do"> - -<div class="panel-body"> -<table class="table"> - <tr> - <th>Admins:</th> - <td> -{admin_count}<br /> - -<rhn-require acl="user_role(system_group_admin)"> -<br /> -<pxt-formvar> -<a href="/network/systems/groups/admin_list.pxt?sgid={formvar:sgid}">Edit group administrators</a> -</pxt-formvar> -</rhn-require> -</td> - </tr> - <tr> - <th>Systems:</th> - <td>{systems_area}</td> - </tr> -</table> -</div> -</pxt-form> -</div> -</div> - -<div class="col-md-6"> -<div class="panel panel-default"> -<div class="panel-heading"> - <h2>System Group Properties</h2> -</div> - <div class="panel-body"> - <table class="table"> - <tr> - <th>Name:</th> - <td>{name}</td> - </tr> - - <tr> - <th valign="top">Description:</th> - <td>{description}</td> - </tr> - </table> - </div> - - - -<rhn-require acl="user_role(system_group_admin)"> -<br /> -<pxt-formvar> -<div align="center"><a href="edit_properties.pxt?sgid={formvar:sgid}">Edit Group Properties</a></div> -</pxt-formvar> -</rhn-require> -</div> -</div> -</div> -</rhn-admin-server-group-edit-form> - - </grail-canvas-template> -</pxt-passthrough> - diff --git a/web/html/network/systems/groups/edit_properties.pxt b/web/html/network/systems/groups/edit_properties.pxt index 27b8c3f..a2a8df1 100644 --- a/web/html/network/systems/groups/edit_properties.pxt +++ b/web/html/network/systems/groups/edit_properties.pxt @@ -43,7 +43,7 @@ {admin_server_group_formvars} <pxt-formvar> - <input type="hidden" name="redirect_to" value="/network/systems/groups/details.pxt?sgid={formvar:sgid}" /> + <input type="hidden" name="redirect_to" value="/rhn/groups/GroupDetail.do?sgid={formvar:sgid}" /> </pxt-formvar> </rhn-admin-server-group-edit-form> diff --git a/web/html/network/systems/ssm/groups/index.pxt b/web/html/network/systems/ssm/groups/index.pxt index 84eb854..d193526 100644 --- a/web/html/network/systems/ssm/groups/index.pxt +++ b/web/html/network/systems/ssm/groups/index.pxt @@ -32,7 +32,7 @@ <var name="sgid" /> </formvars> <column name="System Group" label="group_name" width="55%"> - <url>/network/systems/groups/details.pxt?sgid={column:id}</url> + <url>/rhn/groups/GroupDetail.do?sgid={column:id}</url> </column> <column name="Add" label="add_to_group_radio" width="15%" align="center" /> <column name="Remove" label="remove_from_group_radio" width="15%" align="center" /> diff --git a/web/include/nav/system_group_detail.xml b/web/include/nav/system_group_detail.xml index 2bba613..7671f0a 100644 --- a/web/include/nav/system_group_detail.xml +++ b/web/include/nav/system_group_detail.xml @@ -1,8 +1,7 @@ <?xml version="1.0"?> <rhn-navi-tree label="system_group_detail" invisible="1" formvar="sgid" title-depth="1"> <rhn-tab name="Details"> - <rhn-tab-url>/network/systems/groups/details.pxt</rhn-tab-url> - <rhn-tab-url>/network/systems/groups/delete_confirm.pxt</rhn-tab-url> + <rhn-tab-url>/rhn/groups/GroupDetail.do</rhn-tab-url> </rhn-tab> <rhn-tab name="Systems"> <rhn-tab-url>/rhn/groups/ListRemoveSystems.do</rhn-tab-url> diff --git a/web/modules/sniglets/Sniglets/ListView/SystemGroupList.pm b/web/modules/sniglets/Sniglets/ListView/SystemGroupList.pm index 1a68166..bfdaa6a 100644 --- a/web/modules/sniglets/Sniglets/ListView/SystemGroupList.pm +++ b/web/modules/sniglets/Sniglets/ListView/SystemGroupList.pm @@ -153,7 +153,7 @@ sub comparison_to_snapshot_provider { foreach my $group_name (sort {uc $a cmp uc $b} keys %all_groups) { my $group = $all_groups{$group_name}; - my $url = PXT::HTML->link('/network/systems/groups/details.pxt?sgid=' . $group->{ID}, + my $url = PXT::HTML->link('/rhn/groups/GroupDetail.do?sgid=' . $group->{ID}, $group_name, ); commit 826ac169a222415099094ceec5d56bfd536c31e0 Author: Jan Dobes <jdobes(a)redhat.com> Date: Thu Dec 5 11:43:37 2013 +0100 converting system group details page to java diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml index bbe1f20..53b3b51 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml @@ -132,4 +132,13 @@ ORDER BY UPPER(SG.name), SG.id </query> </mode> +<mode name="group_errata_counts"> + <query params="sgid, org_id"> +SELECT SECURITY_ERRATA as se, BUG_ERRATA as be, ENHANCEMENT_ERRATA as ee + FROM rhnServerGroupOverview + WHERE org_id = :org_id + AND group_id = :sgid + </query> +</mode> + </datasource_modes> diff --git a/java/code/src/com/redhat/rhn/domain/server/ManagedServerGroup.java b/java/code/src/com/redhat/rhn/domain/server/ManagedServerGroup.java index 5b8bac9..4a08796 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ManagedServerGroup.java +++ b/java/code/src/com/redhat/rhn/domain/server/ManagedServerGroup.java @@ -60,4 +60,15 @@ public class ManagedServerGroup extends ServerGroup { protected void setAssociatedAdmins(Set newUsers) { this.associatedAdmins = newUsers; } + + /** + * returns count of associated users for this group + * without permission check (we need this count for + * displaying to associated users which aren't system group + * admins - not the same thing!) + * @return count of associated users + */ + public int getAssociatedAdminsCount() { + return getAssociatedAdmins().size(); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java new file mode 100644 index 0000000..5039105 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java @@ -0,0 +1,61 @@ +/** + * Copyright (c) 2009--2010 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.rhn.frontend.action.groups; + +import java.util.HashMap; + +import com.redhat.rhn.domain.server.ManagedServerGroup; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.manager.system.ServerGroupManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +/** + * GroupDetailAction + * @version $Rev$ + */ +public class GroupDetailAction extends RhnAction { + + /** {@inheritDoc} */ + @Override + public ActionForward execute(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) { + RequestContext rctx = new RequestContext(request); + + User user = rctx.getLoggedInUser(); + ManagedServerGroup sg = rctx.lookupAndBindServerGroup(); + HashMap errataCounts = + (HashMap) ServerGroupManager.getInstance().errataCounts(user, sg); + + request.setAttribute("id", sg.getId()); + request.setAttribute("errata_counts", errataCounts); + request.setAttribute("admin_count", sg.getAssociatedAdminsCount()); + request.setAttribute("system_count", sg.getCurrentMembers()); + request.setAttribute("name", sg.getName()); + request.setAttribute("description", sg.getDescription()); + + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } +} 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 d5e9872..3a04505 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 @@ -5261,6 +5261,48 @@ value for this entitlement, excluding the default organization's consumption.</s <trans-unit id="systemgroup.systems.remove"> <source>Remove Systems</source> </trans-unit> + <trans-unit id="systemgroup.details.status"> + <source>System Group Status</source> + </trans-unit> + <trans-unit id="systemgroup.details.updates"> + <source>Updates:</source> + </trans-unit> + <trans-unit id="systemgroup.details.criticalupdates"> + <source>critical updates available</source> + </trans-unit> + <trans-unit id="systemgroup.details.someupdates"> + <source>updates available</source> + </trans-unit> + <trans-unit id="systemgroup.details.noupdates"> + <source>No applicable errata</source> + </trans-unit> + <trans-unit id="systemgroup.details.none"> + <source>(none)</source> + </trans-unit> + <trans-unit id="systemgroup.details.properties"> + <source>System Group Properties</source> + </trans-unit> + <trans-unit id="systemgroup.details.editproperties"> + <source>Edit These Properties</source> + </trans-unit> + <trans-unit id="systemgroup.details.admins"> + <source>Admins:</source> + </trans-unit> + <trans-unit id="systemgroup.details.manageadmins"> + <source>Edit group administrators</source> + </trans-unit> + <trans-unit id="systemgroup.details.systems"> + <source>Systems:</source> + </trans-unit> + <trans-unit id="systemgroup.details.name"> + <source>Name:</source> + </trans-unit> + <trans-unit id="systemgroup.details.description"> + <source>Description:</source> + </trans-unit> + <trans-unit id="systemgroup.details.admincount"> + <source>group administrator(s)</source> + </trans-unit> </group> <group> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java index 2cf59cd..10262fb 100644 --- a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.manager.system; +import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.hibernate.LookupException; @@ -424,4 +425,21 @@ public class ServerGroupManager { public List<Long> listInactiveServers(ServerGroup sg, Long threshold) { return ServerGroupFactory.listInactiveServerIds(sg, threshold); } + + /** + * Returns counts of applicable errata to given server group. + * @param user the user to get org from + * @param group the server group object to get counts + * @return map with counts of security, bugfix and enhancement errata + */ + public Map errataCounts(User user, ServerGroup group) { + SelectMode m = ModeFactory.getMode("SystemGroup_queries", "group_errata_counts"); + Map params = new HashMap(); + params.put("org_id", user.getOrg().getId()); + params.put("sgid", group.getId()); + + DataResult result = m.execute(params); + + return (Map) result.get(0); + } } diff --git a/java/code/webapp/WEB-INF/pages/groups/detail.jsp b/java/code/webapp/WEB-INF/pages/groups/detail.jsp new file mode 100644 index 0000000..1064e6f --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/groups/detail.jsp @@ -0,0 +1,104 @@ +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> +<html> +<head> + <meta name="page-decorator" content="none" /> +</head> +<body> + +<%@ include file="/WEB-INF/pages/common/fragments/groups/header.jspf" %> + +<div class="row-0"> +<div class="col-md-6"> +<div class="panel panel-default"> + +<div class="panel-heading"> + <h3><bean:message key="systemgroup.details.status"/></h3> +</div> + +<div class="panel-body"> +<table class="table"> + <tr> + <th><bean:message key="systemgroup.details.updates"/></th> + <td> + <div class="system-status"> + <c:if test="${errata_counts['se'] > 0}"> + <i class="fa fa-exclamation-circle fa-1-5x text-danger"></i> + <span class="system-status-critical-updates"><bean:message key="systemgroup.details.criticalupdates"/></span> + <a class="btn btn-danger" href="/network/systems/groups/errata_list.pxt?sgid=${id}">${errata_counts['se']} <i class="fa fa-arrow-right"></i></a> + </c:if> + <c:if test="${(errata_counts['se'] == 0) && ((errata_counts['be'] > 0) || (errata_counts['ee'] > 0))}"> + <i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i> + <span class="system-status-updates"><bean:message key="systemgroup.details.someupdates"/></span> + <a class="btn btn-warning" href="/network/systems/groups/errata_list.pxt?sgid=${id}"><i class="fa fa-arrow-right"></i></a> + </c:if> + <c:if test="${(errata_counts['se'] == 0) && (errata_counts['be'] == 0) && (errata_counts['ee'] == 0)}"> + <i class="fa fa-check-circle fa-1-5x text-success"></i> + <span class="system-status-up-to-date"><bean:message key="systemgroup.details.noupdates"/></span> + </c:if> + </div> + </td> + </tr> + <tr> + <th><bean:message key="systemgroup.details.admins"/></th> + <td> + <c:if test="${admin_count > 0}"> + ${admin_count} <bean:message key="systemgroup.details.admincount"/> + </c:if> + <c:if test="${admin_count == 0}"> + <span class="no-details"><bean:message key="systemgroup.details.none"/></span> + </c:if> + <br /> + + <rhn:require acl="user_role(org_admin) or user_role(system_group_admin)"> + <br /> + <a href="/network/systems/groups/admin_list.pxt?sgid=${id}"><bean:message key="systemgroup.details.manageadmins"/></a> + </rhn:require> + </td> + </tr> + <tr> + <th><bean:message key="systemgroup.details.systems"/></th> + <td> + <c:if test="${system_count > 0}"> + <a class="btn btn-info" href="/rhn/groups/ListRemoveSystems.do?sgid=${id}">${system_count} <i class="fa fa-arrow-right"></i></a> + </c:if> + <c:if test="${system_count == 0}"> + <span class="no-details"><bean:message key="systemgroup.details.none"/></span> + </c:if> + </td> + </tr> +</table> +</div> +</div> +</div> + +<div class="col-md-6"> +<div class="panel panel-default"> +<div class="panel-heading"> + <h3><bean:message key="systemgroup.details.properties"/> + <rhn:require acl="user_role(org_admin) or user_role(system_group_admin)"> + (<a href="/network/systems/groups/edit_properties.pxt?sgid=${id}"><bean:message key="systemgroup.details.editproperties"/></a>) + </rhn:require></h3> +</div> + +<div class="panel-body"> +<table class="table"> + <tr> + <th><bean:message key="systemgroup.details.name"/></th> + <td>${name}</td> + </tr> + <tr> + <th valign="top"><bean:message key="systemgroup.details.description"/></th> + <td>${description}</td> + </tr> +</table> +</div> +</div> +</div> +</div> + +</body> +</html> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index f5f3637..48e51ee 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -3881,6 +3881,15 @@ </action> + <action path="/groups/GroupDetail" + scope="request" + type="com.redhat.rhn.frontend.action.groups.GroupDetailAction" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <set-property property="postRequiredIfSubmitted" value="true" /> + <forward name="default" + path="/WEB-INF/pages/groups/detail.jsp" /> + </action> + <action path="/groups/ListRemoveSystems" scope="request" type="com.redhat.rhn.frontend.action.groups.ListRemoveSystemsAction"

1 0

Branch 'master-bootstrap-css-fixes' - 28 commits - java/code rel-eng/packages search-server/spacewalk-search
by Silvio Moioli 09 Dec '13

09 Dec '13

dev/null |binary java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 11 - java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 15 + java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp | 58 ++--- java/code/webapp/WEB-INF/pages/kickstart/locale.jsp | 82 ++++---- java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf | 24 +- java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp | 13 + java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp | 69 ++----- java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf | 2 java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 14 + rel-eng/packages/spacewalk-search | 2 search-server/spacewalk-search/build.properties | 2 search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar |binary search-server/spacewalk-search/spacewalk-search.spec | 22 ++ search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml | 76 +++---- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml | 44 +--- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml | 29 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml | 48 ++-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 69 +++---- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml | 31 +-- search-server/spacewalk-search/src/config/rhn-search | 2 search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java | 31 +++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java | 72 +++++++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java | 97 ---------- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 52 ----- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java | 19 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java | 31 +-- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java | 27 +- search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java | 9 search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java | 8 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java | 4 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java | 8 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java | 5 42 files changed, 504 insertions(+), 597 deletions(-) New commits: commit 0bfcd3c4029fcf886e3ab5001a7dc75860457095 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 9 18:10:03 2013 +0100 List pagination buttons: restore hover text diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index 0b1d7b4..aea165b 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -587,16 +587,9 @@ public class ListTagUtil { ListTagUtil.write(pageContext, "\" value=\""); ListTagUtil.write(pageContext, linkData[2]); } + ListTagUtil.write(pageContext, "\" title=\""); + ListTagUtil.write(pageContext, linkData[3]); ListTagUtil.write(pageContext, "\"></button>"); - - /* - if (linkData[1] = null) { - ListTagUtil.write(pageContext, "<input type=\"hidden\" name=\""); - ListTagUtil.write(pageContext, linkData[1]); - ListTagUtil.write(pageContext, "\" value=\""); - ListTagUtil.write(pageContext, linkData[2]); - ListTagUtil.write(pageContext, "\" />"); - */ } ListTagUtil.write(pageContext, "</div>"); } commit 1edefb2d465f3a67c1f8c91e46b974d9929004e2 Merge: b467167 3fcfa76 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 9 08:56:35 2013 -0800 Merge pull request #25 from SUSE/bofh-trello-fix-edit-autoninstallable-distribution-page TB3: Fix Edit Autoinstallable Distribution page commit b4671671de48060ab63a2e936b0536853324da0d Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Mon Dec 9 17:43:43 2013 +0100 button send aligned to the center diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp index f85bd23..ca03d30 100644 --- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp @@ -192,7 +192,7 @@ </c:if> -<div class="text-right"> +<div class="text-center"> <html:submit styleClass="btn btn-success"> <bean:message key="usercreate.jsp.createlogin"/> </html:submit> commit ec979a81b3f8087746078fde03c9208c84406baf Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 9 17:23:53 2013 +0100 Disabled buttons' style fixed diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp index bcdaaf3..4735276 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -78,7 +78,7 @@ </button> </c:when> <c:otherwise> - <button type="button" class="btn btn-success" disabled="disabled"> + <button type="button" class="btn" disabled> <bean:message key="button.update"/> </button> </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp index 002eb5d..f88ca7c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp @@ -161,7 +161,7 @@ </html:submit> </c:when> <c:otherwise> - <html:submit property="delete_button" disabled="true" styleClass="btn btn-success"> + <html:submit property="delete_button" disabled styleClass="btn"> <bean:message key="channel.delete.jsp.channelheader"/> </html:submit> </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp index 5e1b2bf..39637c0 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp @@ -83,11 +83,16 @@ </rl:list> <div class="text-right"> - <input type="submit" class="btn btn-default" name="confirm" value="<bean:message key='channel.jsp.manage.package.confirmbutton'/>" - <c:choose> - <c:when test="${empty pageList}">disabled</c:when> - </c:choose> - > + <input type="submit" name="confirm" value="<bean:message key='channel.jsp.manage.package.confirmbutton'/>" + <c:choose> + <c:when test="${empty pageList}"> + class="btn" disabled + </c:when> + <c:otherwise> + class="btn btn-default" + </c:otherwise> + </c:choose> + ></input> </div> <rhn:submitted/> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp index a7eac1a..0cfb891 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp @@ -19,9 +19,16 @@ <%@ include file="tree-form.jspf" %> <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> - <button <c:if test="${requestScope.hidesubmit == 'true'}">disabled="disabled"</c:if> - type="submit" - class="btn btn-success"> + <button type="submit" + <c:choose> + <c:when test="${requestScope.hidesubmit == 'true'}"> + disabled class="btn" + </c:when> + <c:otherwise> + class="btn btn-success" + </c:otherwise> + </c:choose> + > <bean:message key="createtree.jsp.submit"/> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf index 3db4dfe..440a13b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf @@ -91,7 +91,7 @@ onclick="showImages();" value="${rhn:localize('images.jsp.cancel')}" /> <html:submit property="dispatch" - styleClass="btn btn-success" + styleClass="${(empty sessionScope.imagesList)? 'btn' : 'btn-success'}" disabled="${empty sessionScope.imagesList}"> <bean:message key="images.jsp.dispatch" /> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp index ea2d14f..cf5d4cd 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp @@ -34,10 +34,16 @@ </div> <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" - class="btn btn-success" - value="<bean:message key='message.Update'/>" - <c:if test="${empty mailableAddress}">disabled="disabled"</c:if> > + <button type="submit" value="<bean:message key='message.Update'/>" + <c:choose> + <c:when test="${empty mailableAddress}"> + disabled class="btn" + </c:when> + <c:otherwise> + class="btn btn-success" + </c:otherwise> + </c:choose> + > <bean:message key="message.Update"/> </button> </div> commit 3fcfa768e432030c584011820d82a9fbfd414536 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Dec 9 13:59:17 2013 +0100 TB3: Fix Edit Autoinstallable Distribution page diff --git a/java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf b/java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf index 2df575b..efa0342 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf +++ b/java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf @@ -1,27 +1,27 @@ <html:hidden property="refreshForm" styleId="refreshForm" value="false"/> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="tree-form.jspf.label"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:text property="label" maxlength="64" size="64" styleClass="form-control"/> </div> </div> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="tree-form.jspf.location"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:text property="basepath" maxlength="256" size="64" styleClass="form-control"/> </div> </div> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="softwareedit.jsp.basechannel"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <c:if test="${requestScope.nochannels != 'true'}"> <html:select property="channelid" onchange="refresh('treeEditForm');" styleClass="form-control"> <html:options collection="channels" property="value" labelProperty="label" /> @@ -35,10 +35,10 @@ <c:if test="${requestScope.nochannels != 'true'}"> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="tree-form.jspf.installer"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <c:choose> <c:when test="${requestScope.noinstalltypes == 'true'}"> <bean:message key="tree-form.jspf.noinstalltypes" /> @@ -55,19 +55,19 @@ </div> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <bean:message key="kickstartdetails.jsp.kernel_options"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:text property="kernelopts" maxlength="256" size="64" styleClass="form-control"/> </div> </div> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <bean:message key="kickstartdetails.jsp.post_kernel_options"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:text property="postkernelopts" maxlength="256" size="64" styleClass="form-control"/> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp index c5e8226..99cb196 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp @@ -4,48 +4,35 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html:html > - -<head> -<meta http-equiv="Pragma" content="no-cache" /> - -<script language="javascript" src="/javascript/refresh.js"></script> -</head> - -<body> -<rhn:toolbar base="h1" icon="fa-rocket" - deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstree.id}" - deletionType="deleteTree" - imgAlt="kickstarts.alt.img"> - <bean:message key="treeedit.jsp.toolbar"/> -</rhn:toolbar> - - - <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_tree_details.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - - - - -<h2><bean:message key="treeedit.jsp.header2"/></h2> -<bean:message key="treecreate.jsp.header1"/> - - -<div> - <html:form method="post" action="/kickstart/TreeEdit.do"> - <rhn:csrf /> - <%@ include file="tree-form.jspf" %> - <hr/><table align="right"> - <c:if test="${requestScope.hidesubmit != 'true'}"> - <tr> - <td><html:submit><bean:message key="edittree.jsp.submit"/></html:submit></td> - </tr> - </c:if> - </table> - <html:hidden property="submitted" value="true"/> - <html:hidden property="kstid" value="${kstid}"/> + <head> + <meta http-equiv="Pragma" content="no-cache" /> + <script language="javascript" src="/javascript/refresh.js"></script> + </head> + <body> + <rhn:toolbar base="h1" icon="fa-rocket" + deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstree.id}" + deletionType="deleteTree" + imgAlt="kickstarts.alt.img"> + <bean:message key="treeedit.jsp.toolbar"/> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/kickstart_tree_details.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="treeedit.jsp.header2"/></h2> + <bean:message key="treecreate.jsp.header1"/> + <html:form method="post" action="/kickstart/TreeEdit.do" styleClass="form-horizontal"> + <rhn:csrf /> + <%@ include file="tree-form.jspf" %> + <c:if test="${requestScope.hidesubmit != 'true'}"> + <div class="col-md-offset-3 col-md-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="edittree.jsp.submit"/> + </html:submit> + </div> + </c:if> + <html:hidden property="submitted" value="true"/> + <html:hidden property="kstid" value="${kstid}"/> </html:form> -</div> </body> </html:html> commit 66abb15e8b7b1d97c40499ce0db3cdbed4910808 Merge: a80ab7e 6bab6fd Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Dec 9 02:42:35 2013 -0800 Merge pull request #20 from SUSE/bofh-master-bootstrap-css-fixes-autoinstall-partitioning Bofh master bootstrap css fixes autoinstall partitioning commit a80ab7ec3f75d7129b2694a7691b961a5358e6bd Merge: b65a95c 6ad5685 Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Dec 9 02:40:54 2013 -0800 Merge pull request #18 from SUSE/bofh-master-bootstrap-css-fixes-autoinstall TB3: Locale form in autoinstallation commit b65a95c46cbed677f712c442b63888d1942cb184 Merge: af7fe09 56ae852 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 9 08:23:46 2013 +0100 Merge branch 'master' into master-bootstrap-css-fixes commit 56ae852cf76565d58ca13a6dc441265ea521f013 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 17:04:32 2013 +0100 Automatic commit of package [spacewalk-search] release [2.1.7-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 57e73af..bd48388 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.6-1 search-server/spacewalk-search/ +2.1.7-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 5cc0ee8..101e000 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.6 +Version: 2.1.7 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -186,6 +186,22 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Fri Dec 06 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.7-1 +- 1023669 - have unique id for SnapshotTag +- 1023669 - remove unused logger +- 1023669 - start using verifyServerVisibility +- 1023669 - start using errata visibility +- 1023669 - fix list iterations as query parameters +- 1023669 - add connection customizer +- 1023669 - introduce C3P0DataSourceFactory +- 1023669 - link cglib-node and objectweb-asm for DelteIndexes +- 1023669 - require and link c3p0 +- 1023669 - require and link cglib-nodep and objectweb-asm +- 1023669 - replace ibatis jar with mybatis +- 1023669 - adapt code for mybatis +- 1023669 - migrate to mybatis +- 1023669 - remove original setSessionTimeZone + * Fri Nov 15 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.6-1 - Fix custom info value index removal in advanced search commit 9c6c5ec64dffb23dea2d413acc10cd70034787e2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 14:50:39 2013 +0100 1023669 - have unique id for SnapshotTag diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java index 732f56a..a59f5bd 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java @@ -20,7 +20,6 @@ package com.redhat.satellite.search.db.models; * @version $Rev$ */ public class SnapshotTag extends GenericRecord { - private long id; private long snapshotId; private long tagNameId; private long serverId; @@ -28,18 +27,19 @@ public class SnapshotTag extends GenericRecord { private String name; private String created; private String modified; - /** - * @return the id - */ - public long getId() { - return id; - } - /** - * @param idIn the id to set - */ - public void setId(long idIn) { - this.id = idIn; - } + + private String makeUniqId(long serverIdIn, long snapshotdIn) { + return serverIdIn + "-" + snapshotdIn; + } + + /** + * + * @return uniqId + */ + public String getUniqId() { + return makeUniqId(serverId, snapshotId); + } + /** * @return the snapshotId */ @@ -124,5 +124,4 @@ public class SnapshotTag extends GenericRecord { public void setModified(String modifiedIn) { this.modified = modifiedIn; } - } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java index 1e31647..78bc0b4 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java @@ -36,6 +36,7 @@ public class IndexSnapshotTagsTask extends GenericIndexTask { throws ClassCastException { SnapshotTag sTag = (SnapshotTag)data; Map<String, String> attrs = new HashMap<String, String>(); + attrs.put("uniqId", sTag.getUniqId()); attrs.put("snapshotId", new Long(sTag.getSnapshotId()).toString()); attrs.put("tagNameId", new Long(sTag.getTagNameId()).toString()); attrs.put("serverId", new Long(sTag.getServerId()).toString()); @@ -98,9 +99,9 @@ public class IndexSnapshotTagsTask extends GenericIndexTask { * {@inheritDoc} */ public String getUniqueFieldId() { - return "tagNameId"; + return "uniqId"; } - + /** * {@inheritDoc} */ commit 6e9f2b8e96b9b9b771c2c43068430b5f1af2955f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 18:04:31 2013 +0100 1023669 - remove unused logger diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java index 60df540..adee517 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java @@ -18,8 +18,6 @@ import com.redhat.satellite.search.db.models.GenericRecord; import com.redhat.satellite.search.db.models.HardwareDevice; import com.redhat.satellite.search.index.builder.BuilderFactory; -import org.apache.log4j.Logger; - import java.util.HashMap; import java.util.Map; @@ -29,8 +27,6 @@ import java.util.Map; */ public class IndexHardwareDevicesTask extends GenericIndexTask { - private static Logger log = Logger.getLogger(IndexHardwareDevicesTask.class); - /** * {@inheritDoc} */ commit fd0668d0e3782c29ac773ea383774112d0472ec1 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 17:07:43 2013 +0100 1023669 - start using verifyServerVisibility diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml index 9f761f5..a6a75ac 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml @@ -83,13 +83,14 @@ SELECT last_modified from rhnIndexerWork where object_type='server' </select> <select id="verifyServerVisibility" resultType="string"> - SELECT object_id - FROM rhnVisibleObjects - WHERE pxt_session_id = #{session_id} - AND object_type = #{object_type} - AND object_id IN + SELECT DISTINCT s.id + FROM rhnServer s + INNER JOIN rhnUserServerPerms usp ON s.id = usp.server_id + INNER JOIN pxtsessions ps ON ps.web_user_id = usp.user_id + WHERE ps.id = #{session_id} + AND s.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> <select id="maxServerId" resultType="java.lang.Long"> @@ -99,4 +100,4 @@ <select id="queryAllServerIds" resultType="Long"> SELECT id from rhnServer </select> -</mapper> \ No newline at end of file +</mapper> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java index 2e491a4..3832dff 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java @@ -150,7 +150,8 @@ public class IndexHandler { retry = false; List<Result> hits = indexManager.search(indexName, query, lang, isFineGrained); - if (indexName.equals("package") || indexName.equals("errata")) { + if (indexName.equals("package") || indexName.equals("errata") + || indexName.equals("server")) { return screenHits(sessionId, indexName, hits); } return hits; @@ -210,6 +211,9 @@ public class IndexHandler { else if ("errata".equals(indexName)) { query = databaseManager.getQuery("verifyErrataVisibility"); } + else if ("server".equals(indexName)) { + query = databaseManager.getQuery("verifyServerVisibility"); + } else { if (log.isDebugEnabled()) { log.debug("screenHits(" + indexName + commit 773441bc54f5e503f8095b44c528299ce60f8bc5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 11:58:57 2013 +0100 1023669 - start using errata visibility diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index 86736e3..8ae20ae 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -46,13 +46,13 @@ from rhnErrata e, rhnChannelErrata ce, rhnAvailableChannels ac, - pxrsessions ps, + pxtsessions ps, web_contact wc where e.id = ce.errata_id and ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #{sessionId} + ps.id = #{session_id} and e.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> #{item} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java index 26c26f7..2e491a4 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java @@ -150,7 +150,7 @@ public class IndexHandler { retry = false; List<Result> hits = indexManager.search(indexName, query, lang, isFineGrained); - if (indexName.compareTo("package") == 0) { + if (indexName.equals("package") || indexName.equals("errata")) { return screenHits(sessionId, indexName, hits); } return hits; commit fca32356713665947a21ec7b02e0ce0aea22c7cd Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 11:58:33 2013 +0100 1023669 - fix list iterations as query parameters diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index 3f6b9e7..86736e3 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -55,7 +55,7 @@ ps.id = #{sessionId} and e.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> -</mapper> \ No newline at end of file +</mapper> diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml index 61ecd4b..3643781 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml @@ -71,7 +71,7 @@ and ps.id = #{session_id} and p.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> -</mapper> \ No newline at end of file +</mapper> commit 8ad305a04ad2c87ffc1691f3749e6c66e1734db7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 12:02:43 2013 +0100 1023669 - add connection customizer diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index 906d492..bcb2e52 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -19,6 +19,7 @@ <property name="jdbcUrl" value="${search.connection.driver_proto}:${db_name}"/> <property name="user" value="${db_user}"/> <property name="password" value="${db_password}"/> + <property name="connectionCustomizerClassName" value="com.redhat.satellite.search.config.translator.RhnConnectionCustomizer" /> </dataSource> </environment> </environments> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java new file mode 100644 index 0000000..6baa29d --- /dev/null +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java @@ -0,0 +1,72 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.satellite.search.config.translator; + +import com.mchange.v2.c3p0.ConnectionCustomizer; +import com.redhat.satellite.search.db.DatabaseManager; + +import org.apache.log4j.Logger; + +import java.lang.reflect.Method; +import java.sql.Connection; +import java.util.TimeZone; +/** + * RhnConnectionCustomizer + * @version $Rev$ + */ +public class RhnConnectionCustomizer implements ConnectionCustomizer { + + private static final Logger LOG = Logger.getLogger(RhnConnectionCustomizer.class); + + /** + * {@inheritDoc} + */ + public void onAcquire(Connection c, String pdsIdt) throws Exception { + if (DatabaseManager.isOracle()) { + try { + Method setSessionTimeZoneMethod = Class.forName( + "oracle.jdbc.driver.OracleConnection").getMethod( + "setSessionTimeZone", String.class); + if (setSessionTimeZoneMethod != null) { + setSessionTimeZoneMethod.invoke(c, TimeZone.getDefault().getID()); + } + } + catch (Exception e) { + LOG.warn("Failed to set session time zone."); + } + } + } + + /** + * {@inheritDoc} + */ + public void onCheckIn(Connection c, String pdsIdt) throws Exception { + // empty + } + + /** + * {@inheritDoc} + */ + public void onCheckOut(Connection c, String pdsIdt) throws Exception { + // empty + } + + /** + * {@inheritDoc} + */ + public void onDestroy(Connection c, String pdsIdt) throws Exception { + // empty + } +} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index d62c0c7..01c9ed1 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -37,7 +37,7 @@ import org.apache.log4j.Logger; public class DatabaseManager { private SqlSessionFactory sessionFactory = null; - private boolean isOracle; + private static boolean isOracle; private static Logger log = Logger.getLogger(DatabaseManager.class); @@ -117,4 +117,8 @@ public class DatabaseManager { public WriteQuery getWriterQuery(String name) { return new WriteQuery(sessionFactory.openSession(), name); } + + public static boolean isOracle() { + return isOracle; + } } commit 628312a320a62114a97ce91c14b6e612287fd2c2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Dec 4 17:25:25 2013 +0100 1023669 - introduce C3P0DataSourceFactory diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index a9ebaa8..906d492 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -13,14 +13,12 @@ <environments default="default"> <environment id="default"> - <transactionManager type="JDBC"> - </transactionManager> - - <dataSource type="SIMPLE"> - <property name="JDBC.Driver" value="${search.connection.driver_class}"/> - <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> - <property name="JDBC.Username" value="${db_user}"/> - <property name="JDBC.Password" value="${db_password}"/> + <transactionManager type="JDBC" /> + <dataSource type="com.redhat.satellite.search.config.translator.C3P0DataSourceFactory"> + <property name="driverClass" value="${search.connection.driver_class}"/> + <property name="jdbcUrl" value="${search.connection.driver_proto}:${db_name}"/> + <property name="user" value="${db_user}"/> + <property name="password" value="${db_password}"/> </dataSource> </environment> </environments> @@ -35,4 +33,4 @@ <mapper resource="com/redhat/satellite/search/db/server_custom_info.xml"/> <mapper resource="com/redhat/satellite/search/db/xccdf_ident.xml"/> </mappers> - </configuration> \ No newline at end of file + </configuration> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java new file mode 100644 index 0000000..ddf2f6a --- /dev/null +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.satellite.search.config.translator; + +import com.mchange.v2.c3p0.ComboPooledDataSource; +import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory; + +/** + * DataSourceFactory using c3p0 + * C3P0DataSourceFactory + * @version $Rev$ + */ +public class C3P0DataSourceFactory extends UnpooledDataSourceFactory { + + public C3P0DataSourceFactory() { + this.dataSource = new ComboPooledDataSource(); + } +} commit d0cfd085c7e09688a914d97b999e13d06505b9f1 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 16:56:12 2013 +0100 1023669 - link cglib-node and objectweb-asm for DelteIndexes diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search index b00b4de..6bff688 100644 --- a/search-server/spacewalk-search/src/config/rhn-search +++ b/search-server/spacewalk-search/src/config/rhn-search @@ -76,7 +76,7 @@ unlock() { removeindex() { JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib:/usr/lib/gcj/postgresql-jdbc:/usr/lib64/gcj/postgresql-jdbc' - SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar` + SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar /usr/share/java/cglib-nodep.jar /usr/share/java/objectweb-asm/asm.jar` CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes } commit bee0af607cb413cc6d7a1a3fb3990b4e6932e614 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 15:00:11 2013 +0100 1023669 - require and link c3p0 diff --git a/search-server/spacewalk-search/build.properties b/search-server/spacewalk-search/build.properties index 5fa6842..2cfbe0a 100644 --- a/search-server/spacewalk-search/build.properties +++ b/search-server/spacewalk-search/build.properties @@ -19,4 +19,4 @@ javadoc.method.scope=public javadoc.type.scope=package javadoc.var.scope=package javadoc.lazy=true -jpackage.jars="commons-lang commons-logging redstone-xmlrpc redstone-xmlrpc-client quartz tanukiwrapper log4j commons-httpclient oro commons-cli commons-codec simple-core" +jpackage.jars="commons-lang commons-logging redstone-xmlrpc redstone-xmlrpc-client quartz tanukiwrapper log4j commons-httpclient oro commons-cli commons-codec simple-core c3p0" diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 621e8ac..5cc0ee8 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch #Requires: apache-ibatis-sqlmap +Requires: c3p0 Requires: cglib Requires: doc-indexes Requires: jakarta-commons-cli @@ -46,6 +47,7 @@ Requires: simple-core Obsoletes: rhn-search < 5.3.0 BuildRequires: ant #BuildRequires: apache-ibatis-sqlmap +BuildRequires: c3p0 BuildRequires: jakarta-commons-cli BuildRequires: jakarta-commons-codec BuildRequires: jakarta-commons-httpclient diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index 86ec44a..5ca090d 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -45,6 +45,7 @@ wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar wrapper.java.classpath.24=/usr/share/java/cglib-nodep.jar wrapper.java.classpath.25=/usr/share/java/objectweb-asm/asm.jar +wrapper.java.classpath.26=/usr/share/java/c3p0.jar # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=/usr/lib commit 1efa3b50930d8d341032266584d90270864a9999 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 10:37:14 2013 +0100 1023669 - require and link cglib-nodep and objectweb-asm diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index ad9e0a3..621e8ac 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch #Requires: apache-ibatis-sqlmap +Requires: cglib Requires: doc-indexes Requires: jakarta-commons-cli Requires: jakarta-commons-codec @@ -35,6 +36,7 @@ Requires: jakarta-oro Requires: oro %endif #Requires: lucene +Requires: objectweb-asm Requires: quartz < 2.0 Conflicts: quartz >= 2.0 Requires: redstone-xmlrpc diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index 61e5ef0..86ec44a 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -43,6 +43,9 @@ wrapper.java.classpath.22=/usr/share/java/slf4j/jcl.jar wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar +wrapper.java.classpath.24=/usr/share/java/cglib-nodep.jar +wrapper.java.classpath.25=/usr/share/java/objectweb-asm/asm.jar + # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=/usr/lib wrapper.java.library.path.2=/usr/lib64 commit c8baa2b0d868f0b027a3a746653b413f4ea2548a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 10:35:29 2013 +0100 1023669 - replace ibatis jar with mybatis diff --git a/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar b/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar deleted file mode 100644 index 72dbe19..0000000 Binary files a/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar and /dev/null differ diff --git a/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar b/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar new file mode 100644 index 0000000..1ac3064 Binary files /dev/null and b/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar differ commit 8556f444b08486e6b983a64c50614c3d47b1ccf5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 16:51:45 2013 +0100 1023669 - adapt code for mybatis diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index f2e193d..61e5ef0 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -15,7 +15,7 @@ wrapper.java.mainclass=com.redhat.satellite.search.Main wrapper.java.classpath.1=/usr/share/rhn/search/classes/ wrapper.java.classpath.2=/usr/share/rhn/search/lib/commons-lang.jar wrapper.java.classpath.3=/usr/share/rhn/search/lib/commons-logging.jar -wrapper.java.classpath.4=/usr/share/rhn/search/lib/ibatis-2.3.0.677.jar +wrapper.java.classpath.4=/usr/share/rhn/search/lib/mybatis-3.2.3.jar wrapper.java.classpath.5=/usr/share/rhn/search/lib/log4j.jar wrapper.java.classpath.6=/usr/share/rhn/search/lib/lucene-core-2.3.2.jar wrapper.java.classpath.7=/usr/share/java/ojdbc14.jar diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java deleted file mode 100644 index e874623..0000000 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Copyright (c) 2008--2010 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ - -package com.redhat.satellite.search.db; - -import com.ibatis.sqlmap.client.SqlMapSession; - -import org.apache.log4j.Logger; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -/** - * Simplified connection class for executing arbitrary SQL - * - * @version $Rev$ - */ -public class Connection { - private static Logger log = Logger.getLogger(Connection.class); - - private SqlMapSession session; - - /** - * Constructor - * @param sess iBatis session to use - */ - public Connection(SqlMapSession sess) { - session = sess; - } - - /** - * Close down all resources - * @throws SQLException something bad happened - */ - public void close() throws SQLException { - session.close(); - } - - /** - * Executes a query - * @param statement string of valid SQL - * @param handler called on each row - * @throws SQLException something bad happened - */ - public void executeQuery(String statement, ResultHandler handler) throws SQLException { - java.sql.Connection cn = null; - Statement stmt = null; - ResultSet rs = null; - try { - log.warn("start transaction"); - session.startTransaction(); - log.warn("get current connection"); - cn = session.getCurrentConnection(); - log.warn("creating statement"); - stmt = cn.createStatement(); - log.warn("execute query"); - rs = stmt.executeQuery(statement); - log.warn("process resultset"); - while (rs.next()) { - handler.handleRow(rs); - } - } - finally { - try { - log.warn("commit transaction"); - session.commitTransaction(); - } - finally { - try { - if (rs != null) { - log.warn("close RS"); - rs.close(); - } - } - finally { - if (stmt != null) { - log.warn("close STMT"); - stmt.close(); - } - } - } - } - } -} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index 7991436..d62c0c7 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -22,11 +22,12 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.Properties; -import com.ibatis.sqlmap.client.SqlMapClient; -import com.ibatis.sqlmap.client.SqlMapClientBuilder; + import com.redhat.satellite.search.config.Configuration; import com.redhat.satellite.search.config.ConfigException; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.SqlSessionFactoryBuilder; import org.apache.log4j.Logger; /** @@ -35,7 +36,7 @@ import org.apache.log4j.Logger; */ public class DatabaseManager { - private SqlMapClient client = null; + private SqlSessionFactory sessionFactory = null; private boolean isOracle; private static Logger log = Logger.getLogger(DatabaseManager.class); @@ -95,7 +96,7 @@ public class DatabaseManager { } } - client = SqlMapClientBuilder.buildSqlMapClient(reader, overrides); + sessionFactory = new SqlSessionFactoryBuilder(). build(reader, overrides); } /** @@ -105,7 +106,7 @@ public class DatabaseManager { * @return query object */ public <T> Query<T> getQuery(String name) { - return new Query<T>(client.openSession(), name); + return new Query<T>(sessionFactory.openSession(), name); } /** @@ -114,14 +115,6 @@ public class DatabaseManager { * @return query object */ public WriteQuery getWriterQuery(String name) { - return new WriteQuery(client.openSession(), name); - } - - /** - * Opens a direct DB connection - * @return connection object - */ - public Connection getConnection() { - return new Connection(client.openSession()); + return new WriteQuery(sessionFactory.openSession(), name); } } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java index d83e744..090aee8 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java @@ -15,7 +15,7 @@ package com.redhat.satellite.search.db; -import com.ibatis.sqlmap.client.SqlMapSession; +import org.apache.ibatis.session.SqlSession; import java.sql.SQLException; import java.util.ArrayList; @@ -29,10 +29,10 @@ import java.util.List; */ public class Query<T> { - private SqlMapSession session; + private SqlSession session; private String queryName; - Query(SqlMapSession sessionIn, String queryNameIn) { + Query(SqlSession sessionIn, String queryNameIn) { session = sessionIn; queryName = queryNameIn; } @@ -43,12 +43,7 @@ public class Query<T> { */ public void close() throws SQLException { try { - try { - session.commitTransaction(); - } - catch (SQLException e) { - session.endTransaction(); - } + session.commit(); } finally { session.close(); @@ -63,7 +58,7 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public List<T> loadList(Object param) throws SQLException { - List r = session.queryForList(queryName, param); + List r = session.selectList(queryName, param); List<Object> results = r; List<T> retval = new ArrayList<T>(results.size()); for (Object item : results) { @@ -80,7 +75,7 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public T load(Object param) throws SQLException { - return (T)session.queryForObject(queryName, param); + return (T)session.selectOne(queryName, param); } /** @@ -90,6 +85,6 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public T load() throws SQLException { - return (T)session.queryForObject(queryName); + return (T)session.selectOne(queryName); } } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java index 9cc76a5..acaa483 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java @@ -15,43 +15,38 @@ package com.redhat.satellite.search.db; -import com.ibatis.sqlmap.client.SqlMapSession; +import org.apache.ibatis.session.SqlSession; import java.sql.SQLException; /** * Query for writing (insert, update, delete) to a database - * + * * @version $Rev$ */ public class WriteQuery { - - private SqlMapSession session; + + private SqlSession session; private String queryName; - WriteQuery(SqlMapSession sessionIn, String queryNameIn) { + WriteQuery(SqlSession sessionIn, String queryNameIn) { session = sessionIn; queryName = queryNameIn; } - + /** * Close query and all associated resources * @throws SQLException something bad happened */ public void close() throws SQLException { try { - try { - session.commitTransaction(); - } - catch (SQLException e) { - session.endTransaction(); - } + session.commit(); } finally { session.close(); } - } - + } + /** * Execute update query * @param param query param @@ -61,22 +56,22 @@ public class WriteQuery { public int update(Object param) throws SQLException { return session.update(queryName, param); } - + /** * Execute delete query * @param param query param * @return number of rows updated * @throws SQLException something bad happened - */ + */ public int delete(Object param) throws SQLException { return session.delete(queryName, param); } - + /** * Execute insert query * @param param query param * @throws SQLException something bad happened - */ + */ public void insert(Object param) throws SQLException { session.insert(queryName, param); } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java index 376de7f..c8bd93b 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java @@ -22,8 +22,6 @@ import com.redhat.satellite.search.index.Result; import com.redhat.satellite.search.index.QueryParseException; import com.redhat.satellite.search.scheduler.ScheduleManager; -import com.ibatis.sqlmap.client.SqlMapException; - import org.apache.log4j.Logger; import redstone.xmlrpc.XmlRpcFault; @@ -93,11 +91,6 @@ public class DatabaseHandler { log.info("Returned " + hits.size() + " records"); return hits; } - catch (SqlMapException e) { - log.warn("Caught SqlMapException: " + e.getMessage()); - e.printStackTrace(); - throw new XmlRpcFault(IndexHandler.DB_ERROR, e.getMessage()); - } catch (SQLException e) { log.warn("Caught SQLException: " + e.getMessage()); e.printStackTrace(); @@ -161,7 +154,7 @@ public class DatabaseHandler { */ private List<Result> runQuery(Long sessionId, String namespace, String queryName, Map<String, Object> args) - throws SQLException, SqlMapException { + throws SQLException { // Look up Query in DB args.put("sessionId", sessionId); Query<Result> query = databaseManager.getQuery(queryName); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java index 9b575bf..df3bf55 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java @@ -14,7 +14,6 @@ */ package com.redhat.satellite.search.scheduler.tasks; -import com.ibatis.sqlmap.client.SqlMapException; import com.redhat.satellite.search.db.DatabaseManager; import com.redhat.satellite.search.db.Query; import com.redhat.satellite.search.db.WriteQuery; @@ -224,13 +223,6 @@ public abstract class GenericIndexTask implements Job { uniqField = getUniqueFieldId(); indexName = getIndexName(); } - catch (SqlMapException e) { - e.printStackTrace(); - log.info("Error with 'getQueryAllIds()' on " + - super.getClass().toString()); - //just print the warning so we know and skip this method. - return 0; - } finally { if (query != null) { query.close(); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java index a755a06..c9b9ea0 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java @@ -14,7 +14,6 @@ */ package com.redhat.satellite.search.scheduler.tasks; -import com.ibatis.sqlmap.client.SqlMapException; import com.redhat.satellite.search.db.DatabaseManager; import com.redhat.satellite.search.db.Query; import com.redhat.satellite.search.db.models.GenericRecord; @@ -67,13 +66,6 @@ public class IndexServerCustomInfoTask extends GenericIndexTask { uniqField = getUniqueFieldId(); indexName = getIndexName(); } - catch (SqlMapException e) { - e.printStackTrace(); - log.info("Error with 'getQueryAllIds()' on " + - super.getClass().toString()); - //just print the warning so we know and skip this method. - return 0; - } finally { if (query != null) { query.close(); commit 611fbe71f2d77497679a3969744d44971ac6a7a0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Dec 4 11:30:11 2013 +0100 1023669 - migrate to mybatis diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index 655d953..a9ebaa8 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -1,39 +1,38 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMapConfig - PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-config-2.dtd"> - -<sqlMapConfig> -  - <settings - cacheModelsEnabled="true" - statementCachingEnabled="false" - enhancementEnabled="true" - lazyLoadingEnabled="true" - maxRequests="100" - maxSessions="10" - maxTransactions="10" - useStatementNamespaces="false" - /> -  - <transactionManager type="JDBC" > - <dataSource type="SIMPLE"> - <property name="JDBC.Driver" value="${search.connection.driver_class}"/> - <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> - <property name="JDBC.Username" value="${db_user}"/> - <property name="JDBC.Password" value="${db_password}"/> - </dataSource> - </transactionManager> -  - <sqlMap resource="com/redhat/satellite/search/db/package.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/errata.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/server.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/errata_handler.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/hwdevice.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/snapshot_tag.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/server_custom_info.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/xccdf_ident.xml" /> -</sqlMapConfig> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD SQL Map Config 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-config.dtd"> +<configuration><settings> + <setting name="cacheEnabled" value="true"/> + <setting name="lazyLoadingEnabled" value="true"/> + </settings> + <typeAliases> + </typeAliases> + + <typeHandlers> + </typeHandlers> + + <environments default="default"> + <environment id="default"> + <transactionManager type="JDBC"> + </transactionManager> + + <dataSource type="SIMPLE"> + <property name="JDBC.Driver" value="${search.connection.driver_class}"/> + <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> + <property name="JDBC.Username" value="${db_user}"/> + <property name="JDBC.Password" value="${db_password}"/> + </dataSource> + </environment> + </environments> + + <mappers> + <mapper resource="com/redhat/satellite/search/db/package.xml"/> + <mapper resource="com/redhat/satellite/search/db/errata.xml"/> + <mapper resource="com/redhat/satellite/search/db/server.xml"/> + <mapper resource="com/redhat/satellite/search/db/errata_handler.xml"/> + <mapper resource="com/redhat/satellite/search/db/hwdevice.xml"/> + <mapper resource="com/redhat/satellite/search/db/snapshot_tag.xml"/> + <mapper resource="com/redhat/satellite/search/db/server_custom_info.xml"/> + <mapper resource="com/redhat/satellite/search/db/xccdf_ident.xml"/> + </mappers> + </configuration> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index d9f9d80..3f6b9e7 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="errata"> - <select id="listErrataFromId" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.Errata"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="errata"> + <select id="listErrataFromId" parameterType="long" resultType="com.redhat.satellite.search.db.models.Errata"> SELECT e.id, e.advisory, @@ -25,29 +22,26 @@ e.modified, e.last_modified as lastModified FROM rhnErrata e - WHERE e.id > #id# + WHERE e.id > #{id} ORDER by e.id ASC </select> <delete id="deleteLastErrata"> DELETE FROM rhnIndexerWork where object_type = 'errata' </delete> - <insert id="createLastErrata" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('errata', #id#, #last_modified#) + <insert id="createLastErrata" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('errata', #{id}, #{last_modified}) </insert> - <update id="updateLastErrata" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'errata' + <update id="updateLastErrata" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'errata' </update> - <select id="getLastErrataId" - resultClass="java.lang.Long"> + <select id="getLastErrataId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='errata' </select> - <select id="maxErrataId" resultClass="java.lang.Long"> + <select id="maxErrataId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnErrata </select> - <select id="verifyErrataVisibility" resultClass="string"> + <select id="verifyErrataVisibility" resultType="string"> select distinct e.id from rhnErrata e, rhnChannelErrata ce, @@ -58,10 +52,10 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# + ps.id = #{sessionId} and e.id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml index 4fa590d..850468d 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="errataHandler"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="errataHandler"> - <select id="listErrataByCVE" - parameterClass="Map" - resultClass="com.redhat.satellite.search.index.Result"> + <select id="listErrataByCVE" parameterType="Map" resultType="com.redhat.satellite.search.index.Result"> SELECT DISTINCT ecve.errata_id as id from rhnErrataCVE ecve, @@ -22,13 +19,11 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# and - LOWER(cve.name) like #param0# + ps.id = #{sessionId} and + LOWER(cve.name) like #{param0} </select> - <select id="listErrataByIssueDateRange" - parameterClass="Map" - resultClass="com.redhat.satellite.search.index.Result" > + <select id="listErrataByIssueDateRange" parameterType="Map" resultType="com.redhat.satellite.search.index.Result"> SELECT E.id as id FROM rhnErrata E, @@ -41,9 +36,9 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# and - E.issue_date >= TO_TIMESTAMP(#param0#, 'YYYY-MM-DD HH24:MI:SS') - AND E.issue_date <= TO_TIMESTAMP(#param1#, 'YYYY-MM-DD HH24:MI:SS') + ps.id = #{sessionId} and + E.issue_date >= TO_TIMESTAMP(#{param0}, 'YYYY-MM-DD HH24:MI:SS') + AND E.issue_date <= TO_TIMESTAMP(#{param1}, 'YYYY-MM-DD HH24:MI:SS') ORDER BY E.issue_date ASC </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml index de205c5..d8326d3 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="hwdevice"> -<sqlMap namespace="hwdevice"> - - <select id="getHardwareDeviceById" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.HardwareDevice"> + <select id="getHardwareDeviceById" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.HardwareDevice"> SELECT rd.id as id, rd.server_id as serverId, @@ -22,7 +19,7 @@ rd.prop4 as subDeviceId, rd.pcitype as pciType FROM rhnDevice rd - WHERE rd.id > #id# + WHERE rd.id > #{id} ORDER by rd.id ASC </select> @@ -30,24 +27,20 @@ <delete id="deleteLastHardwareDevice"> DELETE FROM rhnIndexerWork where object_type = 'hwdevice' </delete> - <insert id="createLastHardwareDevice" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('hwdevice', #id#, #last_modified#) + <insert id="createLastHardwareDevice" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('hwdevice', #{id}, #{last_modified}) </insert> - <update id="updateLastHardwareDevice" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'hwdevice' + <update id="updateLastHardwareDevice" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'hwdevice' </update> - <select id="getLastHardwareDeviceId" - resultClass="java.lang.Long"> + <select id="getLastHardwareDeviceId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='hwdevice' </select> - <select id="getLastHardwareDeviceIndexRun" - resultClass="java.util.Date"> + <select id="getLastHardwareDeviceIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='hwdevice' </select> - <select id="queryAllHwDeviceIds" resultClass="Long"> + <select id="queryAllHwDeviceIds" resultType="Long"> SELECT id from rhnDevice </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml index 1972292..61ecd4b 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="package"> - <select id="getPackageById" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.RhnPackage"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="package"> + <select id="getPackageById" parameterType="long" resultType="com.redhat.satellite.search.db.models.RhnPackage"> SELECT p.id as id, pn.name as name, @@ -22,11 +19,9 @@ WHERE p.evr_id = pe.id and p.name_id = pn.id and p.package_arch_id = pa.id - and p.id = #id# + and p.id = #{id} </select> - <select id="listPackagesFromId" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.RhnPackage"> + <select id="listPackagesFromId" parameterType="long" resultType="com.redhat.satellite.search.db.models.RhnPackage"> SELECT p.id as id, pn.name as name, @@ -43,29 +38,26 @@ WHERE p.evr_id = pe.id and p.name_id = pn.id and p.package_arch_id = pa.id - and p.id > #id# + and p.id > #{id} ORDER by p.id ASC </select> <delete id="deleteLastPackage"> DELETE FROM rhnIndexerWork where object_type = 'package' </delete> - <insert id="createLastPackage" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('package', #id#, #last_modified#) + <insert id="createLastPackage" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('package', #{id}, #{last_modified}) </insert> - <update id="updateLastPackage" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'package' + <update id="updateLastPackage" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'package' </update> - <select id="getLastPackageId" - resultClass="java.lang.Long"> + <select id="getLastPackageId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='package' </select> - <select id="maxPackageId" resultClass="java.lang.Long"> + <select id="maxPackageId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnPackage </select> - <select id="verifyPackageVisibility" resultClass="string"> + <select id="verifyPackageVisibility" resultType="string"> select distinct p.id from rhnPackage p, rhnAvailableChannels ac, @@ -76,10 +68,10 @@ and ac.channel_id = cp.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id - and ps.id = #session_id# + and ps.id = #{session_id} and p.id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml index 535bcbb..9f761f5 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml @@ -1,10 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="server"> - <select id="getServerByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.Server"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="server"> + <select id="getServerByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.Server"> SELECT s.id as id, s.name as name, @@ -58,51 +56,47 @@ LEFT OUTER JOIN rhnServerDmi dmi ON s.id = dmi.server_id LEFT OUTER JOIN rhnCPU cpu on s.id = cpu.server_id LEFT OUTER JOIN rhnVirtualInstance vi on s.id = vi.virtual_system_id - WHERE s.modified >= #last_modified# - or rsn.modified >= #last_modified# - or si.checkin >= #last_modified# - or rr.modified >= #last_modified# - or sl.modified >= #last_modified# - or dmi.modified >= #last_modified# - or cpu.modified >= #last_modified# - or s.id > #id# + WHERE s.modified >= #{last_modified} + or rsn.modified >= #{last_modified} + or si.checkin >= #{last_modified} + or rr.modified >= #{last_modified} + or sl.modified >= #{last_modified} + or dmi.modified >= #{last_modified} + or cpu.modified >= #{last_modified} + or s.id > #{id} ORDER by s.id ASC </select> <delete id="deleteLastServer"> DELETE FROM rhnIndexerWork where object_type = 'server' </delete> - <insert id="createLastServer" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('server', #id#, #last_modified#) + <insert id="createLastServer" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('server', #{id}, #{last_modified}) </insert> - <update id="updateLastServer" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'server' + <update id="updateLastServer" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'server' </update> - <select id="getLastServerId" - resultClass="java.lang.Long"> + <select id="getLastServerId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='server' </select> - <select id="getLastServerIndexRun" - resultClass="java.util.Date"> + <select id="getLastServerIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='server' </select> - <select id="verifyServerVisibility" resultClass="string"> + <select id="verifyServerVisibility" resultType="string"> SELECT object_id FROM rhnVisibleObjects - WHERE pxt_session_id = #session_id# - AND object_type = #object_type# + WHERE pxt_session_id = #{session_id} + AND object_type = #{object_type} AND object_id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> - <select id="maxServerId" resultClass="java.lang.Long"> + <select id="maxServerId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnServer </select> - <select id="queryAllServerIds" resultClass="Long"> + <select id="queryAllServerIds" resultType="Long"> SELECT id from rhnServer </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml index 5e29554..90680d7 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="serverCustomInfo"> -<sqlMap namespace="serverCustomInfo"> - - <select id="getServerCustomInfoByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.ServerCustomInfo"> + <select id="getServerCustomInfoByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.ServerCustomInfo"> SELECT rscdv.key_id as keyId, @@ -19,30 +16,26 @@ TO_CHAR(rscdv.modified, 'YYYY-MM-DD HH24-MI-SS') as modified FROM rhnServerCustomDataValue rscdv INNER JOIN rhnCustomDataKey rcdk on rcdk.id = rscdv.key_id - WHERE rscdv.modified > #last_modified# + WHERE rscdv.modified > #{last_modified} ORDER by rscdv.key_id ASC </select> <delete id="deleteLastServerCustomInfo"> DELETE FROM rhnIndexerWork where object_type = 'server_custom_info' </delete> - <insert id="createLastServerCustomInfo" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('server_custom_info', #id#, #last_modified#) + <insert id="createLastServerCustomInfo" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('server_custom_info', #{id}, #{last_modified}) </insert> - <update id="updateLastServerCustomInfo" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'server_custom_info' + <update id="updateLastServerCustomInfo" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'server_custom_info' </update> - <select id="getLastServerCustomInfoId" - resultClass="java.lang.Long"> + <select id="getLastServerCustomInfoId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='server_custom_info' </select> - <select id="getLastServerCustomInfoIndexRun" - resultClass="java.util.Date"> + <select id="getLastServerCustomInfoIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='server_custom_info' </select> - <select id="queryAllServerCustomInfoIds" resultClass="com.redhat.satellite.search.db.models.ServerCustomInfo"> + <select id="queryAllServerCustomInfoIds" resultType="com.redhat.satellite.search.db.models.ServerCustomInfo"> SELECT server_id as serverId, key_id as keyId from rhnServerCustomDataValue </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml index 6266583..21c376d 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="snapshotTag"> -<sqlMap namespace="snapshotTag"> - - <select id="getSnapshotTagByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.SnapshotTag"> + <select id="getSnapshotTagByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.SnapshotTag"> SELECT rt.id as id, @@ -20,7 +17,7 @@ FROM rhnSnapshotTag rst INNER JOIN rhnTag rt on rst.tag_id = rt.id INNER JOIN rhnTagName rtn on rt.name_id = rtn.id - WHERE rst.tag_id > #id# OR rst.modified > #last_modified# + WHERE rst.tag_id > #{id} OR rst.modified > #{last_modified} ORDER by rst.snapshot_id ASC </select> @@ -28,26 +25,22 @@ <delete id="deleteLastSnapshotTag"> DELETE FROM rhnIndexerWork where object_type = 'snapshot_tag' </delete> - <insert id="createLastSnapshotTag" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('snapshot_tag', #id#, #last_modified#) + <insert id="createLastSnapshotTag" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('snapshot_tag', #{id}, #{last_modified}) </insert> - <update id="updateLastSnapshotTag" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'snapshot_tag' + <update id="updateLastSnapshotTag" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'snapshot_tag' </update> - <select id="getLastSnapshotTagId" - resultClass="java.lang.Long"> + <select id="getLastSnapshotTagId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='snapshot_tag' </select> - <select id="getLastSnapshotTagIndexRun" - resultClass="java.util.Date"> + <select id="getLastSnapshotTagIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='snapshot_tag' </select> - <select id="queryAllSnapshotTagIds" resultClass="Long"> + <select id="queryAllSnapshotTagIds" resultType="Long"> SELECT snapshot_id from rhnSnapshotTag </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml index ab060a6..7f111cc 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml @@ -1,42 +1,39 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> - -<sqlMap namespace="xccdfIdent"> - <select id="getXccdfIdentById" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.XccdfIdent"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="xccdfIdent"> + <select id="getXccdfIdentById" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.XccdfIdent"> SELECT id, identifier FROM rhnXccdfIdent - WHERE id > #id# + WHERE id > #{id} ORDER BY id ASC </select> - <select id="queryAllXccdfIdentIds" resultClass="Long"> + <select id="queryAllXccdfIdentIds" resultType="Long"> SELECT id FROM rhnXccdfIdent </select> - <insert id="createLastXccdfIdent" parameterClass="java.util.Map"> + <insert id="createLastXccdfIdent" parameterType="java.util.Map"> INSERT INTO rhnIndexerWork - VALUES ('xccdf_ident', #id#, #last_modified#) + VALUES ('xccdf_ident', #{id}, #{last_modified}) </insert> - <select id="getLastXccdfIdentId" resultClass="java.lang.Long"> + <select id="getLastXccdfIdentId" resultType="java.lang.Long"> SELECT last_id FROM rhnIndexerWork WHERE object_type='xccdf_ident' </select> - <select id="getLastXccdfIdentIndexRun" resultClass="java.util.Date"> + <select id="getLastXccdfIdentIndexRun" resultType="java.util.Date"> SELECT last_modified FROM rhnIndexerWork WHERE object_type='xccdf_ident' </select> - <update id="updateLastXccdfIdent" parameterClass="java.util.Map"> + <update id="updateLastXccdfIdent" parameterType="java.util.Map"> UPDATE rhnIndexerWork - SET last_id = #id#, last_modified = #last_modified# + SET last_id = #{id}, last_modified = #{last_modified} WHERE object_type = 'xccdf_ident' </update> <delete id="deleteLastXccdfIdent"> DELETE FROM rhnIndexerWork WHERE object_type = 'xccdf_ident' </delete> -</sqlMap> +</mapper> \ No newline at end of file commit fa685be37666426aba108a7f2e39759f8ba6459a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 16:38:24 2013 +0100 1023669 - remove original setSessionTimeZone diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index 3cfe695..7991436 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -21,13 +21,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.lang.reflect.Method; import java.util.Properties; -import java.util.TimeZone; - import com.ibatis.sqlmap.client.SqlMapClient; import com.ibatis.sqlmap.client.SqlMapClientBuilder; -import com.ibatis.sqlmap.client.SqlMapSession; import com.redhat.satellite.search.config.Configuration; import com.redhat.satellite.search.config.ConfigException; @@ -109,7 +105,7 @@ public class DatabaseManager { * @return query object */ public <T> Query<T> getQuery(String name) { - return new Query<T>(openSession(), name); + return new Query<T>(client.openSession(), name); } /** @@ -118,8 +114,7 @@ public class DatabaseManager { * @return query object */ public WriteQuery getWriterQuery(String name) { - SqlMapSession session = openSession(); - return new WriteQuery(session, name); + return new WriteQuery(client.openSession(), name); } /** @@ -127,32 +122,6 @@ public class DatabaseManager { * @return connection object */ public Connection getConnection() { - return new Connection(openSession()); - } - - private SqlMapSession openSession() { - SqlMapSession session = client.openSession(); - setSessionTimeZone(); - return session; - } - - public void setSessionTimeZone() { - if (isOracle) { - try { - java.sql.Connection proxyConn = client.getDataSource().getConnection(); - // this is a trick, how to get OracleConnection from the Proxy object - java.sql.Connection oraConn = proxyConn.createStatement().getConnection(); - Method setSessionTimeZoneMethod = Class.forName( - "oracle.jdbc.driver.OracleConnection").getMethod( - "setSessionTimeZone", String.class); - if (setSessionTimeZoneMethod != null) { - setSessionTimeZoneMethod.invoke(oraConn, TimeZone.getDefault().getID()); - } - } - catch (Exception e) { - log.warn("Unable to set session timezone."); - e.printStackTrace(); - } - } + return new Connection(client.openSession()); } } commit 6ad56853deb81ddee6b0424b5f2245cddb10a380 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Dec 6 14:28:13 2013 +0100 Fixing -lg- style with -md- diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp index 60083a3..04ae9fa 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -16,10 +16,10 @@ <html:hidden property="ksid" value="${ksdata.id}"/> <html:hidden property="submitted" value="true"/> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <bean:message key="kickstart.locale.jsp.timezone" /> </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:select property="timezone" styleClass="form-control"> <html:options collection="timezones" property="value" @@ -28,7 +28,7 @@ </div> </div> <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> + <div class="col-md-offset-3 col-md-6"> <div class="checkbox"> <label> <html:checkbox property="use_utc"/> @@ -38,7 +38,7 @@ </div> </div> <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> + <div class="col-md-offset-3 col-md-6"> <html:submit styleClass="btn btn-success"> <bean:message key="kickstart.locale.jsp.updatekickstart"/> </html:submit> commit 6bab6fdc017177bb4ae4f07393875751c02f9f78 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Dec 6 14:23:54 2013 +0100 Fixing the -lg- to -md- diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp index f7f5a0c..5dba6c9 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp @@ -15,15 +15,15 @@ <html:form method="post" styleClass="form-horizontal" action="/kickstart/KickstartPartitionEdit.do"> <rhn:csrf /> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="kickstart.partition.jsp.partitiondetails"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:textarea styleClass="form-control" rows="6" cols="80" property="partitions"/> </div> </div> <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> + <div class="col-md-offset-3 col-md-6"> <html:submit styleClass="btn btn-success"> <bean:message key="kickstart.partition.jsp.update"/> </html:submit> commit 5c24778492e33590c874ee617e531a55db4f839b Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Dec 6 14:16:21 2013 +0100 Fixing the -lg- to -md- diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp index 60083a3..04ae9fa 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -16,10 +16,10 @@ <html:hidden property="ksid" value="${ksdata.id}"/> <html:hidden property="submitted" value="true"/> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <bean:message key="kickstart.locale.jsp.timezone" /> </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:select property="timezone" styleClass="form-control"> <html:options collection="timezones" property="value" @@ -28,7 +28,7 @@ </div> </div> <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> + <div class="col-md-offset-3 col-md-6"> <div class="checkbox"> <label> <html:checkbox property="use_utc"/> @@ -38,7 +38,7 @@ </div> </div> <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> + <div class="col-md-offset-3 col-md-6"> <html:submit styleClass="btn btn-success"> <bean:message key="kickstart.locale.jsp.updatekickstart"/> </html:submit> commit f7738151cec1976055821cfd3b79ad6e0c9da7b2 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Dec 5 16:35:35 2013 +0100 TB3: kickstart system details partitioning 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 d5e9872..ef32327 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 @@ -9383,7 +9383,7 @@ Please note that some manual configuration of these scripts may still be require </context-group> </trans-unit> <trans-unit id="kickstart.partition.jsp.partitiondetails"> - <source>Partition <br/>Details</source> + <source>Partition Details</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartPartitionEdit.do</context> </context-group> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp index 49acd49..f7f5a0c 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp @@ -4,40 +4,34 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html:html > -<body> -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/kickstart_details.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="kickstart.partition.jsp.header"/></h2> + <p><bean:message key="kickstart.partition.jsp.summary"/></p> -<h2><bean:message key="kickstart.partition.jsp.header"/></h2> - -<%-- -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> ---%> -<div> - <p> - <bean:message key="kickstart.partition.jsp.summary"/> - </p> - <html:form method="post" action="/kickstart/KickstartPartitionEdit.do"> - <rhn:csrf /> - <table class="details"> - <tr> - <th> - <rhn:required-field key="kickstart.partition.jsp.partitiondetails"/>: - </th> - <td> - <html:textarea rows="6" cols="80" property="partitions"/> - </td> - </tr> - <tr> - <td align="right" colspan="2"><html:submit><bean:message key="kickstart.partition.jsp.update"/></html:submit></td> - </tr> - </table> - <html:hidden property="ksid" value="${ksdata.id}"/> - <html:hidden property="submitted" value="true"/> + <html:form method="post" styleClass="form-horizontal" action="/kickstart/KickstartPartitionEdit.do"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key="kickstart.partition.jsp.partitiondetails"/>: + </label> + <div class="col-lg-6"> + <html:textarea styleClass="form-control" rows="6" cols="80" property="partitions"/> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="kickstart.partition.jsp.update"/> + </html:submit> + </div> + </div> + <html:hidden property="ksid" value="${ksdata.id}"/> + <html:hidden property="submitted" value="true"/> </html:form> -</div> </body> </html:html> commit 47d1a1a754c66e04f0eec3ccb78fded5a0a3e171 Author: Bo Maryniuk <bo(a)suse.de> Date: Thu Dec 5 14:06:41 2013 +0100 TB3: Locale form in autoinstallation diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp index 90b52f6..60083a3 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -4,45 +4,47 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html:html > -<body> -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> - -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - -<h2><bean:message key="kickstart.locale.jsp.header1"/></h2> - -<div> - <p> - <bean:message key="kickstart.locale.jsp.summary1"/> - </p> - <html:form method="post" action="/kickstart/LocaleEdit.do"> - <rhn:csrf /> - <html:hidden property="ksid" value="${ksdata.id}"/> - <html:hidden property="submitted" value="true"/> - <table class="details"> - - <tr> - <th><bean:message key="kickstart.locale.jsp.timezone" /></th> - <td> - <html:select property="timezone"> - <html:options collection="timezones" - property="value" - labelProperty="display" /> - </html:select> - <bean:message key="kickstart.locale.jsp.hardwareclock" />: <html:checkbox property="use_utc"/> - <br/> - </td> - </tr> - - <tr> - <td align="right" colspan="2"><html:submit><bean:message key="kickstart.locale.jsp.updatekickstart"/></html:submit></td> - </tr> - </table> - </html:form> -</div> - -</body> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/kickstart_details.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="kickstart.locale.jsp.header1"/></h2> + <p><bean:message key="kickstart.locale.jsp.summary1"/></p> + <html:form method="post" action="/kickstart/LocaleEdit.do" styleClass="form-horizontal"> + <rhn:csrf /> + <html:hidden property="ksid" value="${ksdata.id}"/> + <html:hidden property="submitted" value="true"/> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstart.locale.jsp.timezone" /> + </label> + <div class="col-lg-6"> + <html:select property="timezone" styleClass="form-control"> + <html:options collection="timezones" + property="value" + labelProperty="display" /> + </html:select> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="use_utc"/> + <bean:message key="kickstart.locale.jsp.hardwareclock" /> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="kickstart.locale.jsp.updatekickstart"/> + </html:submit> + </div> + </div> + </html:form> + </body> </html:html>

1 0

Branch 'master-pxe-default-image' - java/code
by Silvio Moioli 09 Dec '13

09 Dec '13

java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0e43bd20c5b675ddeb5faee21caf265148787a84 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 9 17:34:26 2013 +0100 Bare-metal systems: disabled button style fixed diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp b/java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp index 08eb46f..f5d6696 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrapsystems.jsp @@ -45,8 +45,8 @@ /> </c:when> <c:when test="${enabledForOtherOrg}"> - <input type="submit" disabled="disabled" value="${rhn:localize('disable')}" - class="btn btn-default" + <input type="submit" disabled value="${rhn:localize('disable')}" + class="btn" /> </c:when> </c:choose>

1 0

Changes to 'refs/tags/rhn-client-tools-2.1.12-1'
by Milan Zazrivec 09 Dec '13

09 Dec '13

Tag 'rhn-client-tools-2.1.12-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-12-09 13:55 +0000 Tagging package [rhn-client-tools] version [2.1.12-1] in directory [client/rhel/rhn-client-tools/]. Changes since spacewalk-search-2.1.7-1: Milan Zazrivec (2): 1037778 - new registration icons Automatic commit of package [rhn-client-tools] release [2.1.12-1]. Silvio Moioli (3): LoginExpiredSatTestCase: rename to respect test convention VirtualizationEntitlementTestCase: dead code removed LoginExpiredTest fixed --- client/rhel/rhn-client-tools/data/Makefile | 33 ++++++- client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png |binary client/rhel/rhn-client-tools/rhn-client-tools.spec | 9 +- java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java | 42 ---------- java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java | 36 -------- java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java | 39 +++++++++ rel-eng/packages/rhn-client-tools | 2 12 files changed, 75 insertions(+), 86 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Milan Zazrivec 09 Dec '13

09 Dec '13

client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++- rel-eng/packages/rhn-client-tools | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit ce51787cb3952d4c1153b01199ec7700045a0f21 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Dec 9 14:55:27 2013 +0100 Automatic commit of package [rhn-client-tools] release [2.1.12-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 11f2ea0..3e239fd 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 2.1.11 +Version: 2.1.12 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -361,6 +361,9 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Mon Dec 09 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.12-1 +- 1037778 - new registration icons + * Wed Nov 27 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.11-1 - 1035330 - run TUI registration when executed from setuptool diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index 3ad5abc..b1b0107 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -2.1.11-1 client/rhel/rhn-client-tools/ +2.1.12-1 client/rhel/rhn-client-tools/

1 0

client/rhel
by Milan Zazrivec 09 Dec '13

09 Dec '13

client/rhel/rhn-client-tools/data/Makefile | 33 ++++++++-- client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png |binary client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png |binary client/rhel/rhn-client-tools/rhn-client-tools.spec | 4 + 8 files changed, 31 insertions(+), 6 deletions(-) New commits: commit 48280bff0c61e90db416372dd756c319b6c262d6 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Dec 9 14:28:01 2013 +0100 1037778 - new registration icons diff --git a/client/rhel/rhn-client-tools/data/Makefile b/client/rhel/rhn-client-tools/data/Makefile index 534c93f..4b833a4 100644 --- a/client/rhel/rhn-client-tools/data/Makefile +++ b/client/rhel/rhn-client-tools/data/Makefile @@ -7,17 +7,29 @@ GLADES = gui.glade progress.glade rh_register.glade PUPLET_SS = puplet-screenshot.png KEYS = RHNS-CA-CERT +# Distro +RHEL = $(shell rpm --eval 0%{?rhel}) +FEDORA = $(shell rpm --eval 0%{?fedora}) + # Directories for installation RHNSHARE_DIR = $(PREFIX)/usr/share/rhn PIXMAP_DIR = $(PREFIX)/usr/share/pixmaps PNG16_DIR = $(PREFIX)/usr/share/icons/hicolor/16x16/apps +PNG22_DIR = $(PREFIX)/usr/share/icons/hicolor/22x22/apps PNG24_DIR = $(PREFIX)/usr/share/icons/hicolor/24x24/apps PNG32_DIR = $(PREFIX)/usr/share/icons/hicolor/32x32/apps PNG48_DIR = $(PREFIX)/usr/share/icons/hicolor/48x48/apps +PNG256_DIR = $(PREFIX)/usr/share/icons/hicolor/256x256/apps # all dirs +ifeq ($(shell test $(RHEL) -ge 7 -o $(FEDORA) -ge 18 && echo "newicons"), newicons) +DIRS = $(PIXMAP_DIR) \ + $(PNG16_DIR) $(PNG22_DIR) $(PNG24_DIR) $(PNG32_DIR) $(PNG48_DIR) $(PNG256_DIR) \ + $(RHNSHARE_DIR) $(RHNSHARE_DIR)/up2date_client +else DIRS = $(PIXMAP_DIR) \ $(PNG16_DIR) $(PNG24_DIR) $(PNG32_DIR) $(PNG48_DIR) \ - $(RHNSHARE_DIR) $(RHNSHARE_DIR)/up2date_client \ + $(RHNSHARE_DIR) $(RHNSHARE_DIR)/up2date_client +endif # INSTALL scripts INSTALL = install -p --verbose @@ -56,11 +68,20 @@ install:: $(DIRS) $(INSTALL_DATA) $(GLADES) $(RHNSHARE_DIR)/up2date_client - # install the hicolor theme icons for up2date - $(INSTALL_DATA) up2date-icons/16x16/up2date.png $(PNG16_DIR)/ - $(INSTALL_DATA) up2date-icons/24x24/up2date.png $(PNG24_DIR)/ - $(INSTALL_DATA) up2date-icons/32x32/up2date.png $(PNG32_DIR)/ - $(INSTALL_DATA) up2date-icons/48x48/up2date.png $(PNG48_DIR)/ +# install the hicolor theme icons for up2date +ifeq ($(shell test $(RHEL) -ge 7 -o $(FEDORA) -ge 18 && echo "newicons"), newicons) + $(INSTALL_DATA) up2date-icons-new/16x16/up2date.png $(PNG16_DIR)/ + $(INSTALL_DATA) up2date-icons-new/22x22/up2date.png $(PNG22_DIR)/ + $(INSTALL_DATA) up2date-icons-new/24x24/up2date.png $(PNG24_DIR)/ + $(INSTALL_DATA) up2date-icons-new/32x32/up2date.png $(PNG32_DIR)/ + $(INSTALL_DATA) up2date-icons-new/48x48/up2date.png $(PNG48_DIR)/ + $(INSTALL_DATA) up2date-icons-new/256x256/up2date.png $(PNG256_DIR)/ +else + $(INSTALL_DATA) up2date-icons/16x16/up2date.png $(PNG16_DIR)/ + $(INSTALL_DATA) up2date-icons/24x24/up2date.png $(PNG24_DIR)/ + $(INSTALL_DATA) up2date-icons/32x32/up2date.png $(PNG32_DIR)/ + $(INSTALL_DATA) up2date-icons/48x48/up2date.png $(PNG48_DIR)/ +endif # this is lame and should be dealt with in the code sed -i -e "s|@@logo@@|$(LOGO)|g" \ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png new file mode 100644 index 0000000..b96c682 Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/16x16/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png new file mode 100644 index 0000000..ddbd1ea Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/22x22/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png new file mode 100644 index 0000000..549c13d Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/24x24/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png new file mode 100644 index 0000000..fab66a4 Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/256x256/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png new file mode 100644 index 0000000..627b1c4 Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/32x32/up2date.png differ diff --git a/client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png b/client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png new file mode 100644 index 0000000..5beb1f0 Binary files /dev/null and b/client/rhel/rhn-client-tools/data/up2date-icons-new/48x48/up2date.png differ diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index d73f5b6..11f2ea0 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -313,6 +313,10 @@ make -f Makefile.rhn-client-tools test %{_datadir}/icons/hicolor/24x24/apps/up2date.png %{_datadir}/icons/hicolor/32x32/apps/up2date.png %{_datadir}/icons/hicolor/48x48/apps/up2date.png +%if 0%{?rhel} > 6 || 0%{?fedora} > 17 +%{_datadir}/icons/hicolor/22x22/apps/up2date.png +%{_datadir}/icons/hicolor/256x256/apps/up2date.png +%endif %{_datadir}/applications/rhn_register.desktop %if 0%{?rhel} > 0 && 0%{?rhel} < 6

1 0

java/code
by Silvio Moioli 09 Dec '13

09 Dec '13

java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 52e506429670fcd93b4a09d502ff9d9baf4a5f8a Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 9 11:57:11 2013 +0100 LoginExpiredTest fixed diff --git a/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java b/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java index 511ddac..97b1d53 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java @@ -17,6 +17,8 @@ package com.redhat.rhn.frontend.action.test; import com.redhat.rhn.manager.satellite.test.CertificateManagerTest; import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import servletunit.HttpServletRequestSimulator; + /** * LoginExpiredTest @@ -28,9 +30,10 @@ public class LoginExpiredTest extends RhnMockStrutsTestCase { CertificateManagerTest.expireSatelliteCertificate(); setRequestPathInfo("/LoginSubmit"); + request.setMethod(HttpServletRequestSimulator.POST); actionPerform(); verifyActionMessage("satellite.expired"); - assertEquals("/WEB-INF/pages/common/login.jsp", getActualForward()); + assertEquals("/WEB-INF/pages/common/relogin.jsp", getActualForward()); } }

1 0

2 commits - java/code
by Silvio Moioli 09 Dec '13

09 Dec '13

java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java | 42 ---------- java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java | 36 -------- java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java | 36 ++++++++ 3 files changed, 36 insertions(+), 78 deletions(-) New commits: commit a353adcabc1bb8ef3b6a42ff23ac2b11e5a517b0 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 9 08:17:56 2013 +0100 VirtualizationEntitlementTestCase: dead code removed diff --git a/java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java b/java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java deleted file mode 100644 index 551cc93..0000000 --- a/java/code/src/com/redhat/rhn/domain/entitlement/test/VirtualizationEntitlementTestCase.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (c) 2009--2010 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.domain.entitlement.test; - -import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement; -import com.redhat.rhn.manager.entitlement.EntitlementManager; - - -/** - * VirtualizationEntitlementTestCase - * @version $Rev$ - */ -public class VirtualizationEntitlementTestCase extends BaseEntitlementTestCase { - - /** - * {@inheritDoc} - */ - protected void createEntitlement() { - ent = new VirtualizationEntitlement(); - - } - - /** - * {@inheritDoc} - */ - protected String getLabel() { - return EntitlementManager.VIRTUALIZATION_ENTITLED; - } - -} commit fc30335cca665d96f38f6ce5d4754e052f80b26b Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 9 08:18:41 2013 +0100 LoginExpiredSatTestCase: rename to respect test convention diff --git a/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java deleted file mode 100644 index 6396469..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredSatTestCase.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2009--2010 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.frontend.action.test; - -import com.redhat.rhn.manager.satellite.test.CertificateManagerTest; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; - - -/** - * LoginExpiredSatTestCase - * @version $Rev$ - */ -public class LoginExpiredSatTestCase extends RhnMockStrutsTestCase { - - public void testExpiredSatCert() throws Exception { - CertificateManagerTest.expireSatelliteCertificate(); - - setRequestPathInfo("/LoginSubmit"); - actionPerform(); - verifyActionMessage("satellite.expired"); - assertEquals("/WEB-INF/pages/common/login.jsp", getActualForward()); - } - -} diff --git a/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java b/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java new file mode 100644 index 0000000..511ddac --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/test/LoginExpiredTest.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2009--2010 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.test; + +import com.redhat.rhn.manager.satellite.test.CertificateManagerTest; +import com.redhat.rhn.testing.RhnMockStrutsTestCase; + + +/** + * LoginExpiredTest + * @version $Rev$ + */ +public class LoginExpiredTest extends RhnMockStrutsTestCase { + + public void testExpiredSatCert() throws Exception { + CertificateManagerTest.expireSatelliteCertificate(); + + setRequestPathInfo("/LoginSubmit"); + actionPerform(); + verifyActionMessage("satellite.expired"); + assertEquals("/WEB-INF/pages/common/login.jsp", getActualForward()); + } + +}

1 0

Changes to 'master-pxe-default-image'
by Silvio Moioli 06 Dec '13

06 Dec '13

New branch 'master-pxe-default-image' available with the following commits: commit ca079567dfbfd910682f7a61315088ef0fc87592 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 29 15:11:43 2013 +0100 Page to enable/disable bare-metal system management tests commit 84f21bf8008afccc0bc5d68f9b0374a1441a620c Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 29 11:30:59 2013 +0100 Page to enable/disable bare-metal system management added commit 9875e8f9290ddd813c862f6fa47cfd3791ed951c Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 29 10:45:02 2013 +0100 ActivationKeyManager: find method refactored commit 9f56052852babbc579d87f6ff3769bbfff44cbf5 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Oct 24 17:30:11 2013 +0200 Avoid showing bootstrap entitlement as selectable for unentitled servers commit 91f1c0549af9cc57ede8ed386667f13d2d722e79 Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 23 09:34:30 2013 +0200 System set manager: disable irrelevant actions if bare metal systems are in the set commit 04f2d3ebb95b27419c18f7d9a5836dbc9aea3547 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Nov 26 11:11:59 2013 +0100 Bare-metal system search added in Systems list commit b39d91781f9aa309ed018748a6d21ffc8fbf2612 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Dec 5 17:41:34 2013 +0100 ssm/provisioning/PowerManagement: allow bare-metal systems commit edf8674c54e1b00cb116bb78d2a13aee82cb2b1c Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 22 13:55:17 2013 +0200 legends/system-legend.jsp: add icon for bare-metal system commit dcd1d698add0964b67a5250bc4d53bc53eef9426 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 22 10:07:05 2013 +0200 kickstart/ScheduleWizard: avoid ISE with bare-metal systems commit 5f7b1de2672e01373f4dfb49879be0e476539b14 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Nov 4 11:55:54 2013 +0100 kickstart/ScheduleWizard: avoid references to 'koan' for bare metal systems commit 0ed4e4db732f71959c380f24877302f2914b48e4 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 22 10:05:49 2013 +0200 kickstart/ScheduleWizard: avoid references to 'scheduling' for bare metal systems commit c241950f86a65439b2da2c44fda3fce2ef83de08 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 17:33:18 2013 +0200 systems/details/SystemHardware: unnecessary elements hidden commit 7845aa2db41f59c238e2427349520f71af5fb9f7 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 17:16:34 2013 +0200 systems/details/Edit: unnecessary elements hidden commit 58a9608bc34579cf76e1f6007ad7df05338cdba3 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 16:42:00 2013 +0200 fragments/systems/system-header: add bare-metal icon commit 4c3ecea4046b11ab462a5ae13e9343747717f7a0 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 16:25:04 2013 +0200 systems/details/Overview: unnecessary elements hidden commit 921aa8c7aa7f61630685106103dac6db0e56511e Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 12:25:02 2013 +0200 systems/Overview page icon and strings added commit 44d2815c2368ee163d74848c2ce7557abb336a1b Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Oct 24 17:18:52 2013 +0200 Bugfix: system migration between orgs commit 4a216c4e45a18553ecea47fa627d59a0ee12beec Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 15:59:39 2013 +0100 Refactoring: Bootstrap entitlement check commit 32fc1dded3e7dfa982a44f229e5a4fb98a96d2a2 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 15:44:27 2013 +0200 Allow bare-metal systems to be added to SSM commit 0f53b19592f5f52d9d0764745c740ce57ffe8d30 Author: Michael Calmer <mc(a)suse.de> Date: Mon Oct 21 14:51:12 2013 +0200 add system_grouping feature to bootstrap entitlement to be able to use SSM commit 18644dd0f81932d2b5197ecda5aed5ffc1e19f53 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 12:56:31 2013 +0200 Don't show bare metal servers as unentitled commit 3fabee0bbf2cc161e85ddf0c7e132874e46feec8 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 11:36:55 2013 +0100 Cobbler commands to enable/disable bare-metal system booting tests commit 7457b2ce4401401f8b30e3c5272c36f7a71660ce Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 11:33:09 2013 +0100 Cobbler commands to enable/disable bare-metal system booting added commit 2de7c0c13f25fd01b6c2dc7bcddad25c9d1f3be3 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Oct 31 10:48:10 2013 +0100 Configuration options added commit 4c4f45e1652e2f72f7d94bc4c4deed1397eaf660 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 10:57:05 2013 +0100 Check to ignore bootstrap autoinstallation profile in GUI and API tests commit bf44e5fbb406937c5af90ba4b5b1f1b6f62c19c9 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Oct 17 17:00:12 2013 +0200 Check to ignore bootstrap autoinstallation profile in GUI and API added commit 38965e83e83ec68c0cc7dfc3dc6f8a32f35b9443 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 11:28:00 2013 +0100 Add constant names to distinguish bootstrap Cobbler objects commit c2a7f7e51eb2ca903747e8368d833e24217f2435 Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 16 16:13:26 2013 +0200 Check to ignore bootstrap activation keys in API and GUI tests commit e337caf51a64afa67c2d09058046803ce4f77a2e Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 16 16:09:45 2013 +0200 Check to ignore bootstrap activation keys in API and GUI added commit 09fec068395c27e21c4a2c175170c053b78f645d Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 16 16:02:40 2013 +0200 Add a flag to distinguish bootstrap activation keys commit 32637a6eaec83a0a55bbe57dd1ba0eb846b40d23 Author: Michael Calmer <mc(a)suse.de> Date: Thu Oct 17 16:49:57 2013 +0200 create rhnServerGroup with bootstrap entitlements for all orgs commit 52db286401b55afb6468d06db00e7b9e4241d795 Author: Michael Calmer <mc(a)suse.de> Date: Thu Oct 17 13:57:35 2013 +0200 schema upgrade for pxe-default-image commit d2c403e67f33c2d8882c3f550e20ae6c543096a0 Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 17:40:13 2013 +0200 limit webpage access in case of bootstrap entitled server commit c0dc2b9b05288976415d1b7ff1a022c3ae264f78 Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 14:24:46 2013 +0200 if bootstrap_entitled, unentitle first before assign new entitlements commit f1326dc9b5781e0676bcbf83fc99bb7aea64fa91 Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 13:37:26 2013 +0200 check for None value commit 683e7df75c2bbe32658a642d78ca860143d76ffe Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 13:08:13 2013 +0200 Set usage_limit of a reactivation key to 1 commit 3b50603c7184a6aa9d58549b5441811060a0a9ca Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 13:07:16 2013 +0200 reactivation keys for a bootstrap entitled system should get enterprise entitlement commit a9c06ba1f7a6a336316a8e1b755f7cdc7cfb76df Author: Michael Calmer <mc(a)suse.de> Date: Tue Sep 17 15:45:09 2013 +0200 find arch without base channel commit 2df0a416ea2ed92d95cb55e5cd24fbe4cf08794b Author: Uwe Gansert <ug(a)suse.de> Date: Fri Jul 27 15:30:19 2012 +0200 reduce number of options when kickstarting a bootstrap systems commit 417d11b384fe79431a26b20e5889728af7677d97 Author: Uwe Gansert <ug(a)suse.de> Date: Fri Jul 27 12:47:27 2012 +0200 reduce number of options in system overview for bootstrap systems commit ff2f617e36fef9b9d1d510dec0a775234b92a49c Author: Uwe Gansert <ug(a)suse.de> Date: Tue Jul 24 15:09:27 2012 +0200 translation for bootstrap_entitled added commit 644ec9c059f352c576383ee176f89cb2850bfcd1 Author: Uwe Gansert <ug(a)suse.de> Date: Tue Apr 3 13:05:09 2012 +0200 bootstrap image patches commit b7f3f06d57f7f29d9baf4635c47f6bed11f6c8ea Author: Uwe Gansert <ug(a)suse.de> Date: Fri Mar 30 11:58:33 2012 +0200 added BootstrapEntitlement

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits December 2013