schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql | 4 ++--
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/022-rhnPackageUpgradeArchCompat-unique.sql | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 7f6c38cb972a723c597b11aeceded9e846eb7571
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 20 11:26:09 2012 +0200
Make the records in rhnPackageUpgradeArchCompat -- no need to have duplicates.
diff --git a/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql
index 1dd9a38..549994c 100644
--- a/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql
+++ b/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2010 Red Hat, Inc.
+-- Copyright (c) 2010--2012 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
@@ -30,6 +30,6 @@ CREATE TABLE rhnPackageUpgradeArchCompat
ENABLE ROW MOVEMENT
;
-CREATE INDEX rhn_puac_pa_pua
+CREATE UNIQUE INDEX rhn_puac_pa_pua_uq
ON rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id)
TABLESPACE [[64k_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/022-rhnPackageUpgradeArchCompat-unique.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/022-rhnPackageUpgradeArchCompat-unique.sql
new file mode 100644
index 0000000..dd3bf55
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/022-rhnPackageUpgradeArchCompat-unique.sql
@@ -0,0 +1,5 @@
+
+drop index rhn_puac_pa_pua;
+create unique index rhn_puac_pa_pua_uq
+ on rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id);
+
12 years
Changes to 'refs/tags/spacewalk-java-1.8.52-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.52-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-20 05:51 +0000
Tagging package [spacewalk-java] version [1.8.52-1] in directory [java/].
Changes since spacewalk-java-1.8.51-1:
Jan Pazdziora (2):
Fixing checkstyle.
Automatic commit of package [spacewalk-java] release [1.8.52-1].
---
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 ++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
12 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 30101534fc6a934f0f61b33450cc8f11134897eb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 20 07:51:44 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.52-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b7ee7f6..328d913 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.51
+Version: 1.8.52
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Apr 20 2012 Jan Pazdziora 1.8.52-1
+- Fixing checkstyle.
+
* Thu Apr 19 2012 Stephen Herr <sherr(a)redhat.com> 1.8.51-1
- 814365 - When displaying errata available for adding to channel, make sure a
clone is not already in the channel.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5229969..c0917fe 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.51-1 java/
+1.8.52-1 java/
12 years
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1f5cb0f606376ae695febde7992c80ca2da0143e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 20 07:51:07 2012 +0200
Fixing checkstyle.
Addressing
Starting audit...
./code/src/com/redhat/rhn/manager/channel/ChannelManager.java:2445:21: Name 'channel_errata' must match pattern '^[a-z][a-zA-Z0-9]*$'.
Audit done.
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index b2bfdb0..181c866 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -2442,7 +2442,7 @@ public class ChannelManager extends BaseManager {
SelectMode m = ModeFactory.getMode("Errata_queries", mode);
- Set<Errata> channel_errata = ChannelFactory.lookupById(cid)
+ Set<Errata> channelErrata = ChannelFactory.lookupById(cid)
.getErratas();
DataResult<ErrataOverview> errata = m.execute(params);
@@ -2453,7 +2453,7 @@ public class ChannelManager extends BaseManager {
Set<ErrataOverview> clones = getClones(erratum);
for (ErrataOverview clone : clones) {
Errata tmp = ErrataFactory.lookupById(clone.getId());
- if (channel_errata.contains(tmp)) {
+ if (channelErrata.contains(tmp)) {
iterator.remove();
break; // don't bother checking the rest of the clones of
// this erratum
12 years
Changes to 'refs/tags/spacewalk-java-1.8.51-1'
by StephenHerr
Tag 'spacewalk-java-1.8.51-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-19 17:31 +0000
Tagging package [spacewalk-java] version [1.8.51-1] in directory [java/].
Changes since perl-NOCpulse-Probe-1.184.16-1:
Stephen Herr (2):
814365 - When displaying errata available for adding to channel, make sure a clone is not already in the channel.
Automatic commit of package [spacewalk-java] release [1.8.51-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 34 -
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 244 +++++-----
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
4 files changed, 164 insertions(+), 122 deletions(-)
---
12 years
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 34 -
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 244 +++++-----
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
4 files changed, 164 insertions(+), 122 deletions(-)
New commits:
commit 1490a54d80636fd8266884d8da3b80afe423b07e
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Apr 19 13:31:05 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.51-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f1b9e16..b7ee7f6 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.50
+Version: 1.8.51
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Apr 19 2012 Stephen Herr <sherr(a)redhat.com> 1.8.51-1
+- 814365 - When displaying errata available for adding to channel, make sure a
+ clone is not already in the channel.
+
* Thu Apr 19 2012 Jan Pazdziora 1.8.50-1
- Removed double-dash from WebUI copyright notice.
- fix has_errata_with_keyword_applied_since_last_reboot query (mc(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7412ceb..5229969 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.50-1 java/
+1.8.51-1 java/
commit c4d9952ab3adfa5e98bd7ef81d932254b8c3ebe5
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Apr 19 13:27:25 2012 -0400
814365 - When displaying errata available for adding to channel, make sure a clone is not already in the channel.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index e3d892c..5be404f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -407,22 +407,17 @@ ORDER BY issue_date DESC
<mode name="in_sources_for_target" class="com.redhat.rhn.frontend.dto.ErrataOverview">
- <query params="custom_cid, user_id">
+ <query params="user_id">
SELECT DISTINCT E.id , E.advisory_name AS advisory,
E.update_date AS UPDATE_DATE,
E.synopsis as ADVISORY_SYNOPSIS,
E.advisory_type as ADVISORY_TYPE,
E.advisory_name AS advisory
FROM rhnErrata E inner join
- rhnChannelErrata CE on E.id = CE.errata_id left join
- ( select Cloned.original_id as clonedId from rhnChannelErrata CE2 inner join
- rhnErrataCloned Cloned on CE2.errata_id = cloned.id
- where CE2.channel_id = :custom_cid
- ) temp on E.id = temp.clonedId,
+ rhnChannelErrata CE on E.id = CE.errata_id,
rhnSet S
WHERE CE.channel_id = S.element
AND S.label = 'channels_for_errata'
- and temp.clonedId is null
and S.user_id = :user_id
</query>
</mode>
@@ -442,13 +437,27 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
</query>
</mode>
+<mode name="get_cloned_errata" class="com.redhat.rhn.frontend.dto.ErrataOverview">
+ <query params="erratum_id">
+ select E.id, E.advisory_name as advisory,
+ E.update_date as UPDATE_DATE,
+ E.synopsis as ADVISORY_SYNOPSIS,
+ E.advisory_type as ADVISORY_TYPE,
+ E.advisory_name AS advisory
+ from rhnErrataCloned EC,
+ rhnErrata E
+ where EC.original_id = :erratum_id
+ and E.id = EC.id
+ </query>
+</mode>
+
<mode name="in_sources_for_target_package_assoc" class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="custom_cid, user_id">
Select DISTINCT Errata1.id , Errata1.advisory_name AS advisory,
Errata1.update_date AS UPDATE_DATE,
Errata1.synopsis as ADVISORY_SYNOPSIS,
Errata1.advisory_type as ADVISORY_TYPE,
- Errata1.advisory_name AS advisory
+ Errata1.advisory_name AS advisory
from
( Select E.*
FROM rhnErrata E inner join
@@ -465,15 +474,8 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
( SELECT CE2.errata_id as Id, CE2.channel_id
from rhnChannelErrata CE2
- where CE2.channel_id = :custom_cid ) Errata2 on Errata1.id = Errata2.id left join
-
- ( select Cloned.original_id as clonedId
- from rhnChannelErrata CE2 inner join
- rhnErrataCloned Cloned on CE2.errata_id = cloned.id
- where CE2.channel_id = :custom_cid
- ) temp on temp.clonedId = Errata1.id
+ where CE2.channel_id = :custom_cid ) Errata2 on Errata1.id = Errata2.id
where channel_id is null
- and temp.clonedId is null
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 69f91dd..b2bfdb0 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -42,6 +42,7 @@ import com.redhat.rhn.domain.channel.ReleaseChannelMap;
import com.redhat.rhn.domain.common.CommonConstants;
import com.redhat.rhn.domain.common.VirtSubscriptionLevel;
import com.redhat.rhn.domain.errata.Errata;
+import com.redhat.rhn.domain.errata.ErrataFactory;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
@@ -126,7 +127,7 @@ public class ChannelManager extends BaseManager {
* Key used to identify the rhn-tools channel. Used in searches to find the channel
*/
public static final String TOOLS_CHANNEL_PACKAGE_NAME =
- Config.get().getString("tools_channel.package_name", "rhncfg");
+ Config.get().getString("tools_channel.package_name", "rhncfg");
/**
@@ -134,20 +135,20 @@ public class ChannelManager extends BaseManager {
* Used in searches to find the channel
*/
public static final String VIRT_CHANNEL_PACKAGE_NAME =
- Config.get().getString("virt_channel.package_name", "libvirt");
+ Config.get().getString("virt_channel.package_name", "libvirt");
/**
* Package name of rhn-virtualization-host
*/
public static final String RHN_VIRT_HOST_PACKAGE_NAME =
- Config.get().getString("tools_channel.virt_package_name",
- "rhn-virtualization-host");
+ Config.get().getString("tools_channel.virt_package_name",
+ "rhn-virtualization-host");
/**
* OS name for the virt child channel. rhnDistChannelMap.OS field.
*/
public static final String VT_OS_PRODUCT =
- Config.get().getString("web.virt_product_os_name", "VT");
+ Config.get().getString("web.virt_product_os_name", "VT");
private ChannelManager() {
@@ -176,10 +177,10 @@ public class ChannelManager extends BaseManager {
*/
public static void refreshWithNewestPackages(Long channelId, String label) {
Channel chan = ChannelFactory.lookupById(channelId);
- ChannelFactory.refreshNewestPackageCache(channelId, label);
- if (chan != null) {
- ChannelManager.queueChannelChange(chan.getLabel(), label, label);
- }
+ ChannelFactory.refreshNewestPackageCache(channelId, label);
+ if (chan != null) {
+ ChannelManager.queueChannelChange(chan.getLabel(), label, label);
+ }
}
/**
@@ -193,7 +194,7 @@ public class ChannelManager extends BaseManager {
* @param label label for taskomatic repo_regen request
*/
public static void cloneNewestPackages(Long fromChannelId, Channel toChannel,
- String label) {
+ String label) {
ChannelFactory.cloneNewestPackageCache(fromChannelId, toChannel.getId());
ChannelManager.queueChannelChange(
toChannel.getLabel(), label, "clone channel");
@@ -258,7 +259,7 @@ public class ChannelManager extends BaseManager {
ocf.setCurrentFlex(orgo.getCurrentFlex());
}
if (ocf.getSatelliteMaxMembers() != null) {
- ret.add(ocf);
+ ret.add(ocf);
}
}
return ret;
@@ -302,9 +303,9 @@ public class ChannelManager extends BaseManager {
* family.</strong>
*/
public static List<OrgSoftwareEntitlementDto>
- listEntitlementsForAllOrgs(ChannelFamily cf, User user) {
+ listEntitlementsForAllOrgs(ChannelFamily cf, User user) {
List <OrgSoftwareEntitlementDto> ret =
- new LinkedList<OrgSoftwareEntitlementDto>();
+ new LinkedList<OrgSoftwareEntitlementDto>();
List<ChannelOverview> entitlementUsage = ChannelManager.getEntitlementForAllOrgs(
cf.getId());
@@ -312,18 +313,18 @@ public class ChannelManager extends BaseManager {
// Create a mapping of org ID's to the channel overview returned, we'll need this
// when iterating the list of all orgs shortly:
Map<Long, ChannelOverview> orgEntitlementUsage = new
- HashMap<Long, ChannelOverview>();
+ HashMap<Long, ChannelOverview>();
for (ChannelOverview o : entitlementUsage) {
orgEntitlementUsage.put(o.getOrgId(), o);
}
Org satelliteOrg = OrgFactory.getSatelliteOrg();
ChannelOverview satelliteOrgOverview = ChannelManager.getEntitlement(
- satelliteOrg.getId(),
- cf.getId());
+ satelliteOrg.getId(),
+ cf.getId());
if (satelliteOrgOverview == null) {
throw new RuntimeException("Satellite org does not" +
- "appear to have been allocated entitlement:" +
- cf.getId());
+ "appear to have been allocated entitlement:" +
+ cf.getId());
}
List<Org> allOrgs = OrgManager.allOrgs(user);
@@ -342,9 +343,9 @@ public class ChannelManager extends BaseManager {
private static OrgSoftwareEntitlementDto makeOrgSoftwareEntitlement(
- ChannelOverview co,
- Org org,
- ChannelOverview satelliteOrgOverview) {
+ ChannelOverview co,
+ Org org,
+ ChannelOverview satelliteOrgOverview) {
OrgSoftwareEntitlementDto seDto = new OrgSoftwareEntitlementDto();
seDto.setOrg(org);
seDto.setCurrentMembers(co.getCurrentMembers());
@@ -352,7 +353,7 @@ public class ChannelManager extends BaseManager {
if (co.getMaxMembers() != null &&
satelliteOrgOverview.getFreeMembers() != null) {
seDto.setMaxPossibleAllocation(co.getMaxMembers() +
- satelliteOrgOverview.getFreeMembers());
+ satelliteOrgOverview.getFreeMembers());
}
seDto.setCurrentFlex(co.getCurrentFlex());
@@ -361,7 +362,7 @@ public class ChannelManager extends BaseManager {
if (co.getMaxFlex() != null &&
satelliteOrgOverview.getFreeFlex() != null) {
seDto.setMaxPossibleFlexAllocation(co.getMaxFlex() +
- satelliteOrgOverview.getFreeFlex());
+ satelliteOrgOverview.getFreeFlex());
}
return seDto;
}
@@ -377,9 +378,9 @@ public class ChannelManager extends BaseManager {
* all orgs.
*/
public static List<OrgSoftwareEntitlementDto>
- listEntitlementsForAllOrgsWithEmptyOrgs(ChannelFamily cf, User user) {
+ listEntitlementsForAllOrgsWithEmptyOrgs(ChannelFamily cf, User user) {
List <OrgSoftwareEntitlementDto> ret =
- new LinkedList<OrgSoftwareEntitlementDto>();
+ new LinkedList<OrgSoftwareEntitlementDto>();
List<ChannelOverview> entitlementUsage = ChannelManager.getEntitlementForAllOrgs(
cf.getId());
@@ -387,18 +388,18 @@ public class ChannelManager extends BaseManager {
// Create a mapping of org ID's to the channel overview returned, we'll need this
// when iterating the list of all orgs shortly:
Map<Long, ChannelOverview> orgEntitlementUsage =
- new HashMap<Long, ChannelOverview>();
+ new HashMap<Long, ChannelOverview>();
for (ChannelOverview o : entitlementUsage) {
orgEntitlementUsage.put(o.getOrgId(), o);
}
Org satelliteOrg = OrgFactory.getSatelliteOrg();
ChannelOverview satelliteOrgOverview = ChannelManager.getEntitlement(
- satelliteOrg.getId(),
- cf.getId());
+ satelliteOrg.getId(),
+ cf.getId());
if (satelliteOrgOverview == null) {
throw new RuntimeException("Satellite org does not" +
- "appear to have been allocated entitlement:" +
- cf.getId());
+ "appear to have been allocated entitlement:" +
+ cf.getId());
}
List<Org> allOrgs = OrgManager.allOrgs(user);
@@ -451,7 +452,7 @@ public class ChannelManager extends BaseManager {
* @return list of ChannelTreeNode's
*/
public static DataResult vendorChannelTree(User user,
- ListControl lc) {
+ ListControl lc) {
SelectMode m = ModeFactory.getMode("Channel_queries", "vendor_channel_tree");
@@ -475,7 +476,7 @@ public class ChannelManager extends BaseManager {
* @return list of ChannelTreeNode's
*/
public static DataResult popularChannelTree(User user, Long serverCount,
- ListControl lc) {
+ ListControl lc) {
SelectMode m = ModeFactory.getMode("Channel_queries", "popular_channel_tree");
Map params = new HashMap();
@@ -497,7 +498,7 @@ public class ChannelManager extends BaseManager {
* @return list of ChannelTreeNode's
*/
public static DataResult myChannelTree(User user,
- ListControl lc) {
+ ListControl lc) {
SelectMode m = ModeFactory.getMode("Channel_queries", "my_channel_tree");
@@ -520,7 +521,7 @@ public class ChannelManager extends BaseManager {
* @return list of ChannelTreeNode's
*/
public static DataResult trustChannelConsume(Org org, Org trustOrg, User user,
- ListControl lc) {
+ ListControl lc) {
SelectMode m = ModeFactory.getMode("Channel_queries", "trust_channel_consume");
Map params = new HashMap();
@@ -539,7 +540,7 @@ public class ChannelManager extends BaseManager {
* @return list of ChannelTreeNode's
*/
public static DataResult allChannelTree(User user,
- ListControl lc) {
+ ListControl lc) {
SelectMode m = ModeFactory.getMode("Channel_queries", "all_channel_tree");
Map params = new HashMap();
@@ -574,7 +575,7 @@ public class ChannelManager extends BaseManager {
* @return list of ChannelTreeNode's
*/
public static DataResult sharedChannelTree(User user,
- ListControl lc) {
+ ListControl lc) {
SelectMode m = ModeFactory.getMode("Channel_queries", "shared_channel_tree");
Map params = new HashMap();
@@ -593,7 +594,7 @@ public class ChannelManager extends BaseManager {
* @return list of ChannelTreeNode's
*/
public static DataResult retiredChannelTree(User user,
- ListControl lc) {
+ ListControl lc) {
SelectMode m = ModeFactory.getMode("Channel_queries", "retired_channel_tree");
Map params = new HashMap();
@@ -613,8 +614,8 @@ public class ChannelManager extends BaseManager {
* @return list of ChannelTreeNode's representing the channel family
*/
public static DataResult channelFamilyTree(User user,
- Long familyId,
- ListControl lc) {
+ Long familyId,
+ ListControl lc) {
SelectMode m = ModeFactory.getMode("Channel_queries", "channel_family_tree");
Map params = new HashMap();
@@ -655,7 +656,7 @@ public class ChannelManager extends BaseManager {
*/
public static DataResult channelsOwnedByOrg(Long orgId, PageControl pc) {
SelectMode m = ModeFactory.getMode("Channel_queries",
- "channels_owned_by_org");
+ "channels_owned_by_org");
Map params = new HashMap();
params.put("org_id", orgId);
return makeDataResult(params, null, pc, m);
@@ -672,11 +673,11 @@ public class ChannelManager extends BaseManager {
if (e.isPublished()) {
m = ModeFactory.getMode("Channel_queries",
- "relevant_packages_for_channel_published");
+ "relevant_packages_for_channel_published");
}
else {
m = ModeFactory.getMode("Channel_queries",
- "relevant_packages_for_channel_unpublished");
+ "relevant_packages_for_channel_unpublished");
}
Map params = new HashMap();
@@ -742,7 +743,7 @@ public class ChannelManager extends BaseManager {
//Setup items for the query
SelectMode m = ModeFactory.getMode("Channel_queries",
- "user_subscribe_perms");
+ "user_subscribe_perms");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -805,13 +806,13 @@ public class ChannelManager extends BaseManager {
public static Channel getProxyChannelByVersion(String version, Server server) {
ChannelFamily proxyFamily = ChannelFamilyFactory
- .lookupByLabel(ChannelFamilyFactory
- .PROXY_CHANNEL_FAMILY_LABEL,
- null);
+ .lookupByLabel(ChannelFamilyFactory
+ .PROXY_CHANNEL_FAMILY_LABEL,
+ null);
if (proxyFamily == null ||
- proxyFamily.getChannels() == null ||
- proxyFamily.getChannels().isEmpty()) {
+ proxyFamily.getChannels() == null ||
+ proxyFamily.getChannels().isEmpty()) {
if (!ConfigDefaults.get().isSpacewalk()) {
throw new ProxyChannelNotFoundException();
}
@@ -824,8 +825,8 @@ public class ChannelManager extends BaseManager {
*/
for (Channel proxyChan : proxyFamily.getChannels()) {
if (proxyChan.getProduct() != null &&
- proxyChan.getProduct().getVersion().equals(version) &&
- proxyChan.getParentChannel().equals(server.getBaseChannel())) {
+ proxyChan.getProduct().getVersion().equals(version) &&
+ proxyChan.getParentChannel().equals(server.getBaseChannel())) {
return proxyChan;
}
}
@@ -845,7 +846,7 @@ public class ChannelManager extends BaseManager {
*/
public static List<DataResult> allChannelsTree(User user) {
SelectMode m = ModeFactory.getMode("Channel_queries",
- "all_channels_tree");
+ "all_channels_tree");
Map params = new HashMap();
params.put("user_id", user.getId());
@@ -871,7 +872,7 @@ public class ChannelManager extends BaseManager {
* given label
*/
public static void deleteChannel(User user, String label)
- throws InvalidChannelRoleException, NoSuchChannelException {
+ throws InvalidChannelRoleException, NoSuchChannelException {
Channel toRemove = ChannelFactory.lookupByLabel(user.getOrg(), label);
@@ -929,7 +930,7 @@ public class ChannelManager extends BaseManager {
* @throws InvalidChannelRoleException if the user does not have perms
*/
public static boolean verifyChannelAdmin(User user, Long cid)
- throws InvalidChannelRoleException {
+ throws InvalidChannelRoleException {
if (user.hasRole(RoleFactory.RHN_SUPERUSER) ||
user.hasRole(RoleFactory.CHANNEL_ADMIN)) {
@@ -950,7 +951,7 @@ public class ChannelManager extends BaseManager {
}
//Insert row into rhnChannelPermission
WriteMode m = ModeFactory.getWriteMode("Channel_queries",
- "grant_channel_permission");
+ "grant_channel_permission");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("cid", channel.getId());
@@ -969,7 +970,7 @@ public class ChannelManager extends BaseManager {
}
//Delete row from rhnChannelPermission
WriteMode m = ModeFactory.getWriteMode("Channel_queries",
- "revoke_channel_permission");
+ "revoke_channel_permission");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("cid", channel.getId());
@@ -988,7 +989,7 @@ public class ChannelManager extends BaseManager {
}
//Insert row into rhnChannelPermission
WriteMode m = ModeFactory.getWriteMode("Channel_queries",
- "grant_channel_permission");
+ "grant_channel_permission");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("cid", channel.getId());
@@ -1007,7 +1008,7 @@ public class ChannelManager extends BaseManager {
}
//Delete row from rhnChannelPermission
WriteMode m = ModeFactory.getWriteMode("Channel_queries",
- "revoke_channel_permission");
+ "revoke_channel_permission");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("cid", channel.getId());
@@ -1149,7 +1150,7 @@ public class ChannelManager extends BaseManager {
}
private static boolean verifyChannelRole(User user, Long cid, String role)
- throws InvalidChannelRoleException {
+ throws InvalidChannelRoleException {
CallableMode m = ModeFactory.getCallableMode(
"Channel_queries", "verify_channel_role");
@@ -1203,8 +1204,8 @@ public class ChannelManager extends BaseManager {
*/
public static Long getAvailableEntitlements(Org org, Channel c) {
ChannelEntitlementCounter counter =
- (ChannelEntitlementCounter) MethodUtil.getClassFromConfig(
- ChannelEntitlementCounter.class.getName());
+ (ChannelEntitlementCounter) MethodUtil.getClassFromConfig(
+ ChannelEntitlementCounter.class.getName());
Long retval = counter.getAvailableEntitlements(org, c);
log.debug("getAvailableEntitlements: " + c.getLabel() + " got: " + retval);
@@ -1220,8 +1221,8 @@ public class ChannelManager extends BaseManager {
*/
public static Long getAvailableFveEntitlements(Org org, Channel c) {
ChannelEntitlementCounter counter =
- (ChannelEntitlementCounter) MethodUtil.getClassFromConfig(
- ChannelEntitlementCounter.class.getName());
+ (ChannelEntitlementCounter) MethodUtil.getClassFromConfig(
+ ChannelEntitlementCounter.class.getName());
Long retval = counter.getAvailableFveEntitlements(org, c);
log.debug("getAvailableFveEntitlements: " + c.getLabel() + " got: " + retval);
@@ -1272,7 +1273,7 @@ public class ChannelManager extends BaseManager {
* @return the errata applicable to a channel
*/
public static DataResult<ErrataOverview> listErrata(Channel channel, Date start,
- Date end, User user) {
+ Date end, User user) {
String mode = "in_channel";
Map params = new HashMap();
params.put("cid", channel.getId());
@@ -1423,7 +1424,7 @@ public class ChannelManager extends BaseManager {
* @return list of packages in channel
*/
public static List listAllPackagesByDate(Channel channel, String startDate,
- String endDate) {
+ String endDate) {
String mode = "all_packages_in_channel_by_date";
Map params = new HashMap();
@@ -1454,7 +1455,7 @@ public class ChannelManager extends BaseManager {
*/
public static Long getLatestPackageEqual(Long channelId, String packageName) {
SelectMode m = ModeFactory.getMode("Channel_queries",
- "latest_package_equal");
+ "latest_package_equal");
Map params = new HashMap();
params.put("cid", channelId);
params.put("name", packageName);
@@ -1502,7 +1503,7 @@ public class ChannelManager extends BaseManager {
channelId + " pn: " + packageName);
}
SelectMode m = ModeFactory.getMode("Channel_queries",
- "latest_package_equal");
+ "latest_package_equal");
Map params = new HashMap();
params.put("cid", channelId);
params.put("name", packageName);
@@ -1523,7 +1524,7 @@ public class ChannelManager extends BaseManager {
channelId + " packageName : " + packageName);
}
SelectMode m = ModeFactory.getMode("Channel_queries",
- "latest_package_like");
+ "latest_package_like");
StringBuffer pname = new StringBuffer();
pname.append("%");
pname.append(packageName);
@@ -1596,7 +1597,7 @@ public class ChannelManager extends BaseManager {
*/
public static List<Long> findChildChannelsWithPackage(String packageName, Org org) {
SelectMode m = ModeFactory.getMode("Channel_queries",
- "child_channels_with_package");
+ "child_channels_with_package");
Map params = new HashMap();
params.put("package", packageName);
params.put("org_id", org.getId());
@@ -1619,7 +1620,7 @@ public class ChannelManager extends BaseManager {
* @return Channel we subscribed to, null if not.
*/
public static Channel subscribeToChildChannelWithPackageName(User user, Server current,
- String packageName) {
+ String packageName) {
log.debug("subscribeToChildChannelWithPackageName: " + current.getId() +
" name: " + packageName);
@@ -1706,7 +1707,7 @@ public class ChannelManager extends BaseManager {
* @return Channel we subscribed to, null if not.
*/
public static Channel subscribeToChildChannelByOSProduct(User user, Server current,
- String osProductName) {
+ String osProductName) {
/*
* First make sure that we have a base channel.
@@ -1748,14 +1749,14 @@ public class ChannelManager extends BaseManager {
}
if (foundChannel != null) {
- log.debug("we found a channel, now lets see if we should sub");
- if (!current.isSubscribed(foundChannel)) {
+ log.debug("we found a channel, now lets see if we should sub");
+ if (!current.isSubscribed(foundChannel)) {
if (log.isDebugEnabled()) {
log.debug("subChildChannelByOSProduct " +
"Subscribing server to channel: " + foundChannel);
}
SystemManager.subscribeServerToChannel(user, current, foundChannel);
- }
+ }
}
log.debug("subscribeToChildChannelByOSProduct returning: " + foundChannel);
return foundChannel;
@@ -1857,8 +1858,8 @@ public class ChannelManager extends BaseManager {
}
// First search for legacy kickstart package names:
List kspackages = ChannelManager.
- listLatestPackagesLike(child.getId(),
- KickstartData.LEGACY_KICKSTART_PACKAGE_NAME);
+ listLatestPackagesLike(child.getId(),
+ KickstartData.LEGACY_KICKSTART_PACKAGE_NAME);
if (kspackages.size() > 0) {
return child;
}
@@ -1942,7 +1943,7 @@ public class ChannelManager extends BaseManager {
}
Channel defaultBaseChan = getDefaultBaseChannel(version,
- baseChan.getChannelArch());
+ baseChan.getChannelArch());
if (defaultBaseChan == null) {
return false;
}
@@ -2008,7 +2009,7 @@ public class ChannelManager extends BaseManager {
log.debug("System does not have default base channel.");
log.debug("Looking up all available EUS channels.");
baseEusChans = listBaseEusChannelsByVersionReleaseAndServerArch(usr,
- rhelVersion, rhelRelease, serverArch);
+ rhelVersion, rhelRelease, serverArch);
}
channelDtos.addAll(baseEusChans);
@@ -2085,9 +2086,9 @@ public class ChannelManager extends BaseManager {
}
if (c != null &&
- (c.getOrg() != null ||
- inChan.getChannelArch().equals(c.getChannelArch())) &&
- !retval.contains(ecd)) {
+ (c.getOrg() != null ||
+ inChan.getChannelArch().equals(c.getChannelArch())) &&
+ !retval.contains(ecd)) {
retval.add(ecd);
}
}
@@ -2162,7 +2163,7 @@ public class ChannelManager extends BaseManager {
}
}
- return retval;
+ return retval;
}
private static EssentialChannelDto channelToEssentialChannelDto(Channel channel,
@@ -2217,7 +2218,7 @@ public class ChannelManager extends BaseManager {
* @return List of EssentialChannelDto's.
*/
public static List<EssentialChannelDto>
- listBaseEusChannelsByVersionReleaseAndServerArch(User user,
+ listBaseEusChannelsByVersionReleaseAndServerArch(User user,
String version, String release, String serverArch) {
log.debug("listBaseEusChannelsByVersionReleaseAndServerArch()");
@@ -2225,7 +2226,7 @@ public class ChannelManager extends BaseManager {
log.debug(" release = " + release);
log.debug(" serverArch = " + serverArch);
SelectMode m = ModeFactory.getMode("Channel_queries",
- "base_eus_channels_by_version_release_server_arch");
+ "base_eus_channels_by_version_release_server_arch");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -2262,12 +2263,12 @@ public class ChannelManager extends BaseManager {
* @return List of EssentialChannelDto's.
*/
public static List<EssentialChannelDto>
- listBaseEusChannelsByVersionReleaseAndChannelArch(User user,
+ listBaseEusChannelsByVersionReleaseAndChannelArch(User user,
String version, String release, Long channelArchId) {
log.debug("listBaseEusChannelsByVersionReleaseAndChannelArch()");
SelectMode m = ModeFactory.getMode("Channel_queries",
- "base_eus_channels_by_version_channel_arch");
+ "base_eus_channels_by_version_channel_arch");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -2306,7 +2307,7 @@ public class ChannelManager extends BaseManager {
log.debug("listBaseEusChannelsByVersionAndChannelArch");
SelectMode m = ModeFactory.getMode("Channel_queries",
- "base_eus_channels_by_version_channel_arch");
+ "base_eus_channels_by_version_channel_arch");
Map params = new HashMap();
params.put("user_id", user.getId());
@@ -2332,7 +2333,7 @@ public class ChannelManager extends BaseManager {
*/
public static DataResult listBaseChannelsForOrg(Org o) {
SelectMode m =
- ModeFactory.getMode("Channel_queries", "base_channels_for_org");
+ ModeFactory.getMode("Channel_queries", "base_channels_for_org");
Map params = new HashMap();
params.put("org_id", o.getId());
DataResult dr = makeDataResult(params, new HashMap(), null, m);
@@ -2369,7 +2370,7 @@ public class ChannelManager extends BaseManager {
}
Map <ProductName, Channel> prodChannels =
- new HashMap<ProductName, Channel>();
+ new HashMap<ProductName, Channel>();
for (Channel channel : newBaseChannel.getAccessibleChildrenFor(user)) {
if (channel.getProductName() != null) {
@@ -2398,10 +2399,10 @@ public class ChannelManager extends BaseManager {
Channel targetChannel, boolean packageAssoc) {
String mode;
if (packageAssoc) {
- mode = "for_target_package_assoc";
+ mode = "for_target_package_assoc";
}
else {
- mode = "for_target";
+ mode = "for_target";
}
Map params = new HashMap();
@@ -2413,7 +2414,6 @@ public class ChannelManager extends BaseManager {
return m.execute(params);
}
-
/**
* Finds errata associated with channels in the "channels_for_errata" rhnSet that
* apply to a custom channel
@@ -2427,22 +2427,58 @@ public class ChannelManager extends BaseManager {
Channel targetChannel, boolean packageAssoc, User user) {
String mode;
+ Org org = user.getOrg();
+ Map params = new HashMap();
+ Long cid = targetChannel.getId();
if (packageAssoc) {
- mode = "in_sources_for_target_package_assoc";
+ mode = "in_sources_for_target_package_assoc";
+ params.put("custom_cid", cid);
}
else {
- mode = "in_sources_for_target";
+ mode = "in_sources_for_target";
}
- Map params = new HashMap();
- params.put("custom_cid", targetChannel.getId());
params.put("user_id", user.getId());
+ SelectMode m = ModeFactory.getMode("Errata_queries", mode);
- SelectMode m = ModeFactory.getMode(
- "Errata_queries", mode);
+ Set<Errata> channel_errata = ChannelFactory.lookupById(cid)
+ .getErratas();
- return m.execute(params);
+ DataResult<ErrataOverview> errata = m.execute(params);
+
+ Iterator<ErrataOverview> iterator = errata.iterator();
+ while (iterator.hasNext()) {
+ ErrataOverview erratum = iterator.next();
+ Set<ErrataOverview> clones = getClones(erratum);
+ for (ErrataOverview clone : clones) {
+ Errata tmp = ErrataFactory.lookupById(clone.getId());
+ if (channel_errata.contains(tmp)) {
+ iterator.remove();
+ break; // don't bother checking the rest of the clones of
+ // this erratum
+ }
+ }
+ }
+
+ return errata;
+ }
+
+ /*
+ * recursive method to find all the clones of an erratum
+ */
+ private static Set<ErrataOverview> getClones(ErrataOverview erratum) {
+ Set<ErrataOverview> errata = new HashSet<ErrataOverview>();
+ Map params = new HashMap();
+ params.put("erratum_id", erratum.getId());
+ errata.addAll(ModeFactory
+ .getMode("Errata_queries", "get_cloned_errata").execute(params));
+ Set<ErrataOverview> tmp = new HashSet<ErrataOverview>();
+ for (ErrataOverview clone : errata) {
+ tmp.addAll(getClones(clone));
+ }
+ errata.addAll(tmp);
+ return errata;
}
/**
@@ -2458,10 +2494,10 @@ public class ChannelManager extends BaseManager {
Channel targetChannel, boolean packageAssoc) {
String mode;
if (packageAssoc) {
- mode = "custom_for_target_package_assoc";
+ mode = "custom_for_target_package_assoc";
}
else {
- mode = "custom_for_target";
+ mode = "custom_for_target";
}
Map params = new HashMap();
@@ -2681,7 +2717,7 @@ public class ChannelManager extends BaseManager {
ClonedChannel cc = (ClonedChannel) c;
params.put("ocid", cc.getOriginal().getId());
SelectMode m = ModeFactory.getMode("Errata_queries",
- "list_errata_needing_sync");
+ "list_errata_needing_sync");
return m.execute(params);
}
return Collections.EMPTY_LIST;
@@ -2732,7 +2768,7 @@ public class ChannelManager extends BaseManager {
*/
public static String getRepoLastBuild(Channel channel) {
String pathPrefix = Config.get().getString(ConfigDefaults.REPOMD_PATH_PREFIX,
- "rhn/repodata");
+ "rhn/repodata");
String mountPoint = Config.get().getString(ConfigDefaults.REPOMD_CACHE_MOUNT_POINT,
"/pub");
File theFile = new File(mountPoint + File.separator + pathPrefix +
@@ -2818,8 +2854,8 @@ public class ChannelManager extends BaseManager {
}
if (!unsubChans.isEmpty()) {
m = ModeFactory.getMode("Channel_queries",
- "ssm_systems_for_child_unsubscription");
- unsubDr = m.execute(params, unsubCids);
+ "ssm_systems_for_child_unsubscription");
+ unsubDr = m.execute(params, unsubCids);
}
12 years
Changes to 'refs/tags/spacewalk-web-1.8.11-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.8.11-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-19 15:15 +0000
Tagging package [spacewalk-web] version [1.8.11-1] in directory [web/].
Changes since spacewalk-proxy-1.8.3-1:
Duncan Mac-Vicar P (1):
Show systems that need reboot because of an errata.
Jan Pazdziora (5):
Removed double-dash from WebUI copyright notice.
Update the copyright year info on .pxt pages.
Removed double-dash from copyright notice on error pages.
Removed double-dash from copyright notice on error pages, fixing typo.
Automatic commit of package [spacewalk-web] release [1.8.11-1].
Michael Calmer (1):
fix has_errata_with_keyword_applied_since_last_reboot query
Miroslav Suchý (1):
808118 - ignore fuse.gvfs-fuse-daemon in df
Tomas Lestach (3):
803353 - fixing another two broken documentation links
increase taskomatic memory
fix PackageEvr handling III
---
branding/templates/footer.pxt | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 53 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 ++++----
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 -
java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5
java/code/webapp/WEB-INF/struts-config.xml | 10 +
java/conf/default/rhn_taskomatic_daemon.conf | 2
monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4
rel-eng/packages/spacewalk-web | 2
web/html/errors/403.html | 2
web/html/errors/404.html | 2
web/html/errors/413.html | 2
web/html/errors/500.html | 2
web/spacewalk-web.spec | 5
42 files changed, 283 insertions(+), 71 deletions(-)
---
12 years
Changes to 'refs/tags/spacewalk-java-1.8.50-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.50-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-19 15:15 +0000
Tagging package [spacewalk-java] version [1.8.50-1] in directory [java/].
Changes since spacewalk-proxy-1.8.3-1:
Duncan Mac-Vicar P (1):
Show systems that need reboot because of an errata.
Jan Pazdziora (6):
Removed double-dash from WebUI copyright notice.
Update the copyright year info on .pxt pages.
Removed double-dash from copyright notice on error pages.
Removed double-dash from copyright notice on error pages, fixing typo.
Automatic commit of package [spacewalk-web] release [1.8.11-1].
Automatic commit of package [spacewalk-java] release [1.8.50-1].
Michael Calmer (1):
fix has_errata_with_keyword_applied_since_last_reboot query
Miroslav Suchý (1):
808118 - ignore fuse.gvfs-fuse-daemon in df
Tomas Lestach (3):
803353 - fixing another two broken documentation links
increase taskomatic memory
fix PackageEvr handling III
---
branding/templates/footer.pxt | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 53 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 ++++----
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 -
java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5
java/code/webapp/WEB-INF/struts-config.xml | 10 +
java/conf/default/rhn_taskomatic_daemon.conf | 2
java/spacewalk-java.spec | 11 +-
monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-web | 2
web/html/errors/403.html | 2
web/html/errors/404.html | 2
web/html/errors/413.html | 2
web/html/errors/500.html | 2
web/spacewalk-web.spec | 5
44 files changed, 294 insertions(+), 73 deletions(-)
---
12 years
Changes to 'refs/tags/spacewalk-branding-1.8.1-1'
by Jan Pazdziora
Tag 'spacewalk-branding-1.8.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-19 15:15 +0000
Tagging package [spacewalk-branding] version [1.8.1-1] in directory [branding/].
Changes since spacewalk-proxy-1.8.3-1:
Duncan Mac-Vicar P (1):
Show systems that need reboot because of an errata.
Jan Pazdziora (7):
Removed double-dash from WebUI copyright notice.
Update the copyright year info on .pxt pages.
Removed double-dash from copyright notice on error pages.
Removed double-dash from copyright notice on error pages, fixing typo.
Automatic commit of package [spacewalk-web] release [1.8.11-1].
Automatic commit of package [spacewalk-java] release [1.8.50-1].
Automatic commit of package [spacewalk-branding] release [1.8.1-1].
Michael Calmer (1):
fix has_errata_with_keyword_applied_since_last_reboot query
Miroslav Suchý (1):
808118 - ignore fuse.gvfs-fuse-daemon in df
Tomas Lestach (3):
803353 - fixing another two broken documentation links
increase taskomatic memory
fix PackageEvr handling III
---
branding/spacewalk-branding.spec | 5
branding/templates/footer.pxt | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 53 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 ++++----
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 -
java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5
java/code/webapp/WEB-INF/struts-config.xml | 10 +
java/conf/default/rhn_taskomatic_daemon.conf | 2
java/spacewalk-java.spec | 11 +-
monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4
rel-eng/packages/spacewalk-branding | 2
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-web | 2
web/html/errors/403.html | 2
web/html/errors/404.html | 2
web/html/errors/413.html | 2
web/html/errors/500.html | 2
web/spacewalk-web.spec | 5
46 files changed, 299 insertions(+), 75 deletions(-)
---
12 years
Changes to 'refs/tags/perl-NOCpulse-Probe-1.184.16-1'
by Jan Pazdziora
Tag 'perl-NOCpulse-Probe-1.184.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-19 15:16 +0000
Tagging package [perl-NOCpulse-Probe] version [1.184.16-1] in directory [monitoring/PerlModules/NP/Probe/].
Changes since spacewalk-proxy-1.8.3-1:
Duncan Mac-Vicar P (1):
Show systems that need reboot because of an errata.
Jan Pazdziora (8):
Removed double-dash from WebUI copyright notice.
Update the copyright year info on .pxt pages.
Removed double-dash from copyright notice on error pages.
Removed double-dash from copyright notice on error pages, fixing typo.
Automatic commit of package [spacewalk-web] release [1.8.11-1].
Automatic commit of package [spacewalk-java] release [1.8.50-1].
Automatic commit of package [spacewalk-branding] release [1.8.1-1].
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.16-1].
Michael Calmer (1):
fix has_errata_with_keyword_applied_since_last_reboot query
Miroslav Suchý (1):
808118 - ignore fuse.gvfs-fuse-daemon in df
Tomas Lestach (3):
803353 - fixing another two broken documentation links
increase taskomatic memory
fix PackageEvr handling III
---
branding/spacewalk-branding.spec | 5
branding/templates/footer.pxt | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 53 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 ++++----
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 -
java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5
java/code/webapp/WEB-INF/struts-config.xml | 10 +
java/conf/default/rhn_taskomatic_daemon.conf | 2
java/spacewalk-java.spec | 11 +-
monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 5
rel-eng/packages/perl-NOCpulse-Probe | 2
rel-eng/packages/spacewalk-branding | 2
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-web | 2
web/html/errors/403.html | 2
web/html/errors/404.html | 2
web/html/errors/413.html | 2
web/html/errors/500.html | 2
web/spacewalk-web.spec | 5
48 files changed, 304 insertions(+), 77 deletions(-)
---
12 years