java/code
by Mike McCune
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 23 ++++++++--
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 5 ++
2 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit c5dc1eec4fa163d3e6efbebaab799bbec148e39c
Author: Mike McCune <mmccune(a)gibson.pdx.redhat.com>
Date: Thu Jul 2 10:36:59 2009 -0700
509411 - make sure we delete the ks template when we delete a profile
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index f0fe369..b3569d9 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -31,6 +31,7 @@ import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
+import java.io.File;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@@ -376,13 +377,19 @@ public class KickstartFactory extends HibernateFactory {
else {
log.debug("No ks meta for this profile.");
}
- String path = ksdataIn.getCobblerFileName();
- if (p != null && p.getKickstart() != null) {
- path = p.getKickstart();
- }
+ String path = getKickstartTemplatePath(ksdataIn, p);
+ log.debug("writing ks file to : " + path);
FileUtils.writeStringToFile(fileData, path);
}
+ private static String getKickstartTemplatePath(KickstartData ksdata, Profile p) {
+ String path = ksdata.getCobblerFileName();
+ if (p != null && p.getKickstart() != null) {
+ path = p.getKickstart();
+ }
+ return path;
+ }
+
/**
*
* @param ksdataIn Kickstart Data to be stored in db
@@ -396,6 +403,14 @@ public class KickstartFactory extends HibernateFactory {
* @return number of tuples affected by delete
*/
public static int removeKickstartData(KickstartData ksdataIn) {
+ Profile p = Profile.lookupById(CobblerXMLRPCHelper.getAutomatedConnection(),
+ ksdataIn.getCobblerId());
+ String path = getKickstartTemplatePath(ksdataIn, p);
+ File file = new File(path);
+ if (file.exists()) {
+ log.debug("deleting : " + path);
+ file.delete();
+ }
return singleton.removeObject(ksdataIn);
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index 9681c92..bfd8a8d 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -293,6 +293,11 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
.lookupKickstartDataByIdAndOrg(user.getOrg(), ksd.getId()));
assertNull(lookupById(user.getOrg(), ksd.getId()));
assertNull(lookupByLabel(ksd.getLabel()));
+
+ String path = ksd.getCobblerFileName();
+ File f = new File(path);
+ assertFalse(f.exists());
+
}
public void testChildChannels() throws Exception {
14 years, 11 months
Branch 'VADER' - selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux
by Miroslav Suchý
selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux-enable | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 90d94a5da12058d461966441ba5d73ad8aee8f27
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 2 19:36:00 2009 +0200
509369 - run restorecon for /var/www/html/pub since its content is not owned by any package
(cherry picked from commit c9378976ac6eba03e9a3d07ac0a34bb646a06351)
diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable
index e99f36d..562a33f 100644
--- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable
+++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable
@@ -8,5 +8,5 @@ for selinuxvariant in mls strict targeted
/usr/share/selinux/${selinuxvariant}/spacewalk-proxy.pp || :
done
-/sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
+/sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy /var/www/html/pub
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux-enable b/selinux/spacewalk-selinux/spacewalk-selinux-enable
index 05dd951..8100e26 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux-enable
+++ b/selinux/spacewalk-selinux/spacewalk-selinux-enable
@@ -43,7 +43,7 @@ for selinuxvariant in mls strict targeted
done
/sbin/restorecon -rvvi /etc/rhn/satellite-httpd/conf/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
- /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert
+ /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert /var/www/html/pub
/usr/sbin/setsebool -P httpd_enable_cgi 1
/usr/sbin/setsebool -P httpd_can_network_connect 1
14 years, 11 months
selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux
by Miroslav Suchý
selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux-enable | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c9378976ac6eba03e9a3d07ac0a34bb646a06351
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 2 19:36:00 2009 +0200
509369 - run restorecon for /var/www/html/pub since its content is not owned by any package
diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable
index e99f36d..562a33f 100644
--- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable
+++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable
@@ -8,5 +8,5 @@ for selinuxvariant in mls strict targeted
/usr/share/selinux/${selinuxvariant}/spacewalk-proxy.pp || :
done
-/sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
+/sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy /var/www/html/pub
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux-enable b/selinux/spacewalk-selinux/spacewalk-selinux-enable
index 05dd951..8100e26 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux-enable
+++ b/selinux/spacewalk-selinux/spacewalk-selinux-enable
@@ -43,7 +43,7 @@ for selinuxvariant in mls strict targeted
done
/sbin/restorecon -rvvi /etc/rhn/satellite-httpd/conf/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
- /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert
+ /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert /var/www/html/pub
/usr/sbin/setsebool -P httpd_enable_cgi 1
/usr/sbin/setsebool -P httpd_can_network_connect 1
14 years, 11 months
Branch 'VADER' - java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bc46eae023bd7b4f4422acc623ed505767d857a1
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Jul 2 11:41:11 2009 -0400
509364 - fix SSM->Upgrade arch that being listed
The SSM->Upgrade page was listing arch as rhnPackageArch.name vs
rhnPackageArch.label. This is inconsistent as for the 64 bit pkgs. E.g.
name=AMD64
label=x86_64
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 9355c70..8682a4b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -689,7 +689,7 @@ SELECT P.id AS ID,
PE.release AS RELEASE,
PE.epoch AS EPOCH,
PN.name AS NAME,
- PA.name AS ARCH,
+ PA.label AS ARCH,
E.advisory_type,
E.advisory,
E.id AS ADVISORY_ID,
@@ -714,7 +714,7 @@ GROUP BY P.id,
PE.version,
PE.release,
PE.epoch,
- PA.name,
+ PA.label,
PA.id,
PN.id,
PE.id,
14 years, 11 months
java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5736aa9e89ae8f9e5a126d905adfd083b14113a8
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Jul 2 11:41:11 2009 -0400
509364 - fix SSM->Upgrade arch that being listed
The SSM->Upgrade page was listing arch as rhnPackageArch.name vs
rhnPackageArch.label. This is inconsistent as for the 64 bit pkgs. E.g.
name=AMD64
label=x86_64
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 9355c70..8682a4b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -689,7 +689,7 @@ SELECT P.id AS ID,
PE.release AS RELEASE,
PE.epoch AS EPOCH,
PN.name AS NAME,
- PA.name AS ARCH,
+ PA.label AS ARCH,
E.advisory_type,
E.advisory,
E.id AS ADVISORY_ID,
@@ -714,7 +714,7 @@ GROUP BY P.id,
PE.version,
PE.release,
PE.epoch,
- PA.name,
+ PA.label,
PA.id,
PN.id,
PE.id,
14 years, 11 months
Branch 'ssm-kickstart' - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java | 42 ++++++++++
java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java | 23 +++--
2 files changed, 57 insertions(+), 8 deletions(-)
New commits:
commit 4590727bdbfd5ca6dd1b40ee48f484f0beae94ca
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 2 11:31:07 2009 -0400
adding stuff
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
index 688baae..9ba1b52 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
@@ -15,14 +15,21 @@
package com.redhat.rhn.frontend.action.kickstart.ssm;
import com.redhat.rhn.common.util.DatePicker;
+import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.common.DateRangePicker;
+import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults;
import com.redhat.rhn.frontend.action.kickstart.ScheduleKickstartWizardAction;
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.frontend.taglibs.list.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.kickstart.KickstartLister;
+import com.redhat.rhn.manager.kickstart.KickstartManager;
+import com.redhat.rhn.manager.kickstart.SSMScheduleCommand;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -54,6 +61,11 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
RequestContext context = new RequestContext(request);
User user = context.getLoggedInUser();
+
+ if (context.wasDispatched("kickstart.schedule.button2.jsp")) {
+ schedule(request, form, context);
+ }
+
if ("ip".equals(mapping.getParameter())) {
request.setAttribute(SCHEDULE_TYPE_IP, Boolean.TRUE);
}
@@ -67,6 +79,36 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
request, (DynaActionForm)form, "date", DatePicker.YEAR_RANGE_POSITIVE);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
+
+
+ private void schedule(HttpServletRequest request, ActionForm form, RequestContext context) {
+ SSMScheduleCommand com = null;
+ User user = context.getLoggedInUser();
+
+
+ DynaActionForm dynaForm = (DynaActionForm) form;
+ DatePicker picker = getStrutsDelegate().prepopulateDatePicker(context.getRequest(),
+ dynaForm, "date", DatePicker.YEAR_RANGE_POSITIVE);
+
+
+
+ if (isIP(request)) {
+ com = SSMScheduleCommand.initCommandForIPKickstart(user,
+ KickstartManager.getInstance().kickstartableSystemsInSsm(user),
+ picker.getDate(), "");
+ }
+ else {
+ ListHelper helper = new ListHelper(this, request);
+ String cobblerId = ListTagHelper.getRadioSelection(helper.getListName(),
+ request);
+ KickstartData data = KickstartFactory.lookupKickstartDataByCobblerIdAndOrg(
+ user.getOrg(), cobblerId);
+
+ }
+
+ }
+
+
/**
* {@inheritDoc}
*/
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java
index e3a85e8..32760c6 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java
@@ -96,21 +96,28 @@ public class SSMScheduleCommand {
isCobblerOnly = true;
}
+
+ private SSMScheduleCommand() {
+
+ }
+
/**
- * Constructor for SSMScheduleCommand when were using IP ADDRESS
+ * Get a SSMScheduleCommand when were using IP ADDRESS
* base kickstarting
* @param userIn the user
* @param systemsIn List of SystemOverview's to provision
* @param dateIn the date to schedule it for
* @param kickstartHostIn the kickstart hostname (proxy's or satellite's)
*/
- public SSMScheduleCommand(User userIn, List<SystemOverview> systemsIn, Date dateIn,
- String kickstartHostIn) {
- user = userIn;
- systems = systemsIn;
- scheduleDate = dateIn;
- kickstartServerName = kickstartHostIn;
- isIpBasedKs = true;
+ public static SSMScheduleCommand initCommandForIPKickstart(User userIn,
+ List<SystemOverview> systemsIn, Date dateIn, String kickstartHostIn) {
+ SSMScheduleCommand com = new SSMScheduleCommand();
+ com.user = userIn;
+ com.systems = systemsIn;
+ com.scheduleDate = dateIn;
+ com.kickstartServerName = kickstartHostIn;
+ com.isIpBasedKs = true;
+ return com;
}
14 years, 11 months
Branch 'VADER' - java/code web/html
by Brad Buckingham
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 2 +-
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 +
web/html/nav/sitenav-authenticated.xml | 4 +++-
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 70aec0b44e251bd249630870bc449c049dbb81b9
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Jul 2 10:58:02 2009 -0400
509376 - add Shared Channels to side navigation of Channels tab
The Shared Channels was added to the Channels tab; however, we missed
including it in the side nav. This commit adds it. I also updated the
html/nav navigation, although it doesn't appear to get executed.
Also, changed "Retired channels" to "Retired Channels" to be consistent with
the other channel listings available.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 0722a3c..4a3c858 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -260,7 +260,7 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</trans-unit>
<trans-unit id="channel.nav.retired">
-<source>Retired channels</source>
+<source>Retired Channels</source>
<context-group name="ctx">
<context context-type="sourcefile">Channel Navigation Menu</context>
</context-group>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index b5d51c7..0c9ed77 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -115,6 +115,7 @@
<rhn-tab name="channel.nav.redhat" url="/rhn/software/channels/RedHat.do"/>
<rhn-tab name="channel.nav.popular" url="/rhn/software/channels/Popular.do"/>
<rhn-tab name="channel.nav.custom" url="/rhn/software/channels/Custom.do"/>
+ <rhn-tab name="channel.nav.shared" url="/rhn/software/channels/Shared.do"/>
<rhn-tab name="channel.nav.retired" url="/rhn/software/channels/Retired.do"/>
</rhn-tab>
<rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
index ca6ee4c..332601c 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -97,7 +97,9 @@
<rhn-tab-directory>/network/software/channels</rhn-tab-directory>
<rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/>
<rhn-tab name="Red Hat Channels" url="/rhn/software/channels/RedHat.do"/>
- <rhn-tab name="Custom Channels" url="/rhn/software/channels/Custom.do"/>
+ <rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/>
+ <rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/>
+ <rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/>
<rhn-tab name="Retired Channels" url="/rhn/software/channels/Retired.do"/>
</rhn-tab>
<rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
14 years, 11 months
java/code web/html
by Brad Buckingham
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 2 +-
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 +
web/html/nav/sitenav-authenticated.xml | 4 +++-
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit fd9dfa26884c6db06770034380f2d1ee3e8cd7ca
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Jul 2 10:58:02 2009 -0400
509376 - add Shared Channels to side navigation of Channels tab
The Shared Channels was added to the Channels tab; however, we missed
including it in the side nav. This commit adds it. I also updated the
html/nav navigation, although it doesn't appear to get executed.
Also, changed "Retired channels" to "Retired Channels" to be consistent with
the other channel listings available.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 0722a3c..4a3c858 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -260,7 +260,7 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</trans-unit>
<trans-unit id="channel.nav.retired">
-<source>Retired channels</source>
+<source>Retired Channels</source>
<context-group name="ctx">
<context context-type="sourcefile">Channel Navigation Menu</context>
</context-group>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index b5d51c7..0c9ed77 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -115,6 +115,7 @@
<rhn-tab name="channel.nav.redhat" url="/rhn/software/channels/RedHat.do"/>
<rhn-tab name="channel.nav.popular" url="/rhn/software/channels/Popular.do"/>
<rhn-tab name="channel.nav.custom" url="/rhn/software/channels/Custom.do"/>
+ <rhn-tab name="channel.nav.shared" url="/rhn/software/channels/Shared.do"/>
<rhn-tab name="channel.nav.retired" url="/rhn/software/channels/Retired.do"/>
</rhn-tab>
<rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
index ca6ee4c..332601c 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -97,7 +97,9 @@
<rhn-tab-directory>/network/software/channels</rhn-tab-directory>
<rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/>
<rhn-tab name="Red Hat Channels" url="/rhn/software/channels/RedHat.do"/>
- <rhn-tab name="Custom Channels" url="/rhn/software/channels/Custom.do"/>
+ <rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/>
+ <rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/>
+ <rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/>
<rhn-tab name="Retired Channels" url="/rhn/software/channels/Retired.do"/>
</rhn-tab>
<rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
14 years, 11 months
Branch 'VADER' - java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7ee7ed161f2fb463eb6b4510b887cd3be54f97e0
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Jul 2 10:30:45 2009 -0400
509270 - clarify text on Channels -> All Channels page
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 5a884e9..884004d 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
@@ -11550,7 +11550,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
</trans-unit>
<trans-unit id="channels.all.jsp.header1">
- <source>The software channels listed below are <strong>all of the channels</strong> that your organization <a href="/rhn/channels/software/Entitlements.do">is entitled to</a> and are currently supported by Red Hat.</source>
+ <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
</trans-unit>
<trans-unit id="channels.redhat.jsp.header1">
14 years, 11 months
java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 958ee2369ca6e72b9326b30bb3994dbbefbac8b2
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Jul 2 10:30:45 2009 -0400
509270 - clarify text on Channels -> All Channels page
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 d9b9a1f..5e4248e 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
@@ -11550,7 +11550,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
</trans-unit>
<trans-unit id="channels.all.jsp.header1">
- <source>The software channels listed below are <strong>all of the channels</strong> that your organization <a href="/rhn/channels/software/Entitlements.do">is entitled to</a> and are currently supported by Red Hat.</source>
+ <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
</trans-unit>
<trans-unit id="channels.redhat.jsp.header1">
14 years, 11 months