java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java | 27
+---------
java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java | 1
java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java | 1
3 files changed, 6 insertions(+), 23 deletions(-)
New commits:
commit 71a4da00136ccbbbf60c5fe6cef4ffe702a233c5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Dec 21 12:10:44 2010 +0100
664717 - removing unused ks install type translations
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
index 9bb97a7..c7d4381 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
@@ -14,8 +14,6 @@
*/
package com.redhat.rhn.domain.channel;
-import com.redhat.rhn.domain.kickstart.KickstartInstallType;
-
import java.util.HashMap;
import java.util.Map;
@@ -91,17 +89,6 @@ public class ChannelVersion {
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("2.1WS",
ChannelVersion.RHEL21);
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("2.1AW",
ChannelVersion.RHEL21);
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("2.1ASDE",
ChannelVersion.RHEL21);
-
- KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION.put(KickstartInstallType.RHEL_21,
- ChannelVersion.RHEL21);
- KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION.put(KickstartInstallType.RHEL_3,
- ChannelVersion.RHEL3);
- KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION.put(KickstartInstallType.RHEL_4,
- ChannelVersion.RHEL4);
- KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION.put(KickstartInstallType.RHEL_5,
- ChannelVersion.RHEL5);
- KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION.put(KickstartInstallType.RHEL_6,
- ChannelVersion.RHEL6);
}
/**
@@ -114,18 +101,6 @@ public class ChannelVersion {
}
/**
- * Returns the channel version constant for the given kickstart install
- * type, based on it's label and the contents of a static mapping.
- * @param type KickstartInstallType to lookup channel version for.
- * @return ChannelVersion for this KickstartInstallType.
- */
- public static ChannelVersion getChannelVersionForKickstartInstallType(
- KickstartInstallType type) {
- return (ChannelVersion)KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION.get(
- type.getLabel());
- }
-
- /**
* Returns the channel version constant for the given DistChannelMap,
* based on the map's release and a static mapping.
* @param dcm DistChannel map to lookup channel version for.
commit 7a805f04794aff3f63fe12b3608c33b317497ec0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Dec 21 10:47:25 2010 +0100
664717 - adding RHEL6 dist channel map translations
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
index 1a30436..9bb97a7 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java
@@ -50,6 +50,10 @@ public class ChannelVersion {
public static final Map DIST_CHANNEL_MAP_TO_CHANNEL_VERSION = new HashMap();
static {
+ DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("6Client",
ChannelVersion.RHEL6);
+ DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("6Server",
ChannelVersion.RHEL6);
+ DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("6Workstation",
ChannelVersion.RHEL6);
+
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("5Client",
ChannelVersion.RHEL5);
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("5Server",
ChannelVersion.RHEL5);
DIST_CHANNEL_MAP_TO_CHANNEL_VERSION.put("4.92Client",
ChannelVersion.RHEL5);
@@ -96,6 +100,8 @@ public class ChannelVersion {
ChannelVersion.RHEL4);
KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION.put(KickstartInstallType.RHEL_5,
ChannelVersion.RHEL5);
+ KICKSTART_INSTALL_TYPE_TO_CHANNEL_VERSION.put(KickstartInstallType.RHEL_6,
+ ChannelVersion.RHEL6);
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java
b/java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java
index 5b44e0f..9714a77 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java
@@ -102,6 +102,7 @@ public class SelectableChannelVersion implements Selectable {
*/
public static List<SelectableChannelVersion> getCurrentChannelVersionList() {
List currentList = new ArrayList<ChannelVersion>();
+ currentList.add(new SelectableChannelVersion(ChannelVersion.RHEL6));
currentList.add(new SelectableChannelVersion(ChannelVersion.RHEL5));
currentList.add(new SelectableChannelVersion(ChannelVersion.RHEL4));
currentList.add(new SelectableChannelVersion(ChannelVersion.RHEL3));
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java
b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java
index 947c9f5..a3f613a 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java
@@ -28,6 +28,7 @@ public class KickstartInstallType extends BaseDomainHelper {
public static final String RHEL_3 = "rhel_3";
public static final String RHEL_4 = "rhel_4";
public static final String RHEL_5 = "rhel_5";
+ public static final String RHEL_6 = "rhel_6";
public static final String FEDORA = "fedora";
public static final String GENERIC = "generic";
Show replies by date