java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
| 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
| 17 ----
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
| 39 ----------
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
| 2
4 files changed, 3 insertions(+), 62 deletions(-)
New commits:
commit 3d3626e2bb9073f53b3fabc15fbc52d8bdf2aac5
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Sep 20 10:44:29 2010 +0200
634884 - managing repositories within channels through XMLRPC API disabled
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 294b41e..0c93062 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -338,10 +338,6 @@ public class EditChannelAction extends RhnAction implements Listable
{
ucc.setMaintainerPhone((String)form.get("maintainer_phone"));
ucc.setSupportPolicy((String)form.get("support_policy"));
ucc.setAccess((String)form.get("org_sharing"));
- ucc.setRepoLabel((String) form.getString("repo_label"));
- if (form.get("sync_repo") != null) {
- ucc.setSyncRepo((Boolean)form.get("sync_repo"));
- }
String parent = (String)form.get("parent");
if (parent == null || parent.equals("")) {
@@ -413,9 +409,6 @@ public class EditChannelAction extends RhnAction implements Listable
{
ccc.setMaintainerPhone((String)form.get("maintainer_phone"));
ccc.setSupportPolicy((String)form.get("support_policy"));
ccc.setAccess((String)form.get("org_sharing"));
- if (form.get("sync_repo") != null) {
- ccc.setSyncRepo((Boolean)form.get("sync_repo"));
- }
String parent = (String)form.get("parent");
if (parent == null || parent.equals("")) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 030ec78..11e2b77 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -529,10 +529,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
* <li>string url</li>
* <li>string id</li>
* <li>string fingerprint</li>
- * @param yumRepo a map consisting of
- * <li>string url</li>
- * <li>string label</li>
- * <li>boolean sync</li>
* @return 1 if creation of channel succeeds.
* @since 10.9
* @throws PermissionCheckFailureException thrown if user does not have
@@ -583,17 +579,11 @@ public class ChannelSoftwareHandler extends BaseHandler {
* #prop_desc("string", "id", "GPG key ID")
* #prop_desc("string", "fingerprint", "GPG key
Fingerprint")
* #struct_end()
- * @xmlrpc.param
- * #struct("yumRepo")
- * #prop_desc("string", "url", "Associated Yum
Repository URL")
- * #prop_desc("string", "label", "Associated Yum
Repository Label")
- * #prop_desc("boolean", "sync", "Sync Yum
Repository")
- * #struct_end()
* @xmlrpc.returntype int - 1 if the creation operation succeeded, 0 otherwise
*/
public int create(String sessionKey, String label, String name,
String summary, String archLabel, String parentLabel, String checksumType,
- Map gpgKey, Map yumRepo)
+ Map gpgKey)
throws PermissionCheckFailureException, InvalidChannelLabelException,
InvalidChannelNameException, InvalidParentChannelException {
@@ -612,9 +602,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
ccc.setGpgKeyUrl((String)gpgKey.get("url"));
ccc.setGpgKeyId((String)gpgKey.get("id"));
ccc.setGpgKeyFp((String)gpgKey.get("fingerprint"));
- ccc.setYumUrl((String)yumRepo.get("url"));
- ccc.setRepoLabel((String)yumRepo.get("label"));
- ccc.setSyncRepo(BooleanUtils.toBoolean((Boolean)
yumRepo.get("sync")));
return (ccc.create() != null) ? 1 : 0;
}
@@ -682,7 +669,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
return create(sessionKey, label, name,
summary, archLabel, parentLabel, checksumType,
- new HashMap(), new HashMap());
+ new HashMap());
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
index b8146a9..a6607e0 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
@@ -73,12 +73,6 @@ public class CreateChannelCommand {
protected String maintainerPhone;
protected String supportPolicy;
protected String access = Channel.PRIVATE;
- protected String yumUrl;
- protected String repoLabel;
- protected boolean syncRepo = false;
-
-
-
/**
@@ -292,11 +286,6 @@ public class CreateChannelCommand {
ChannelManager.queueChannelChange(c.getLabel(), "createchannel",
"createchannel");
ChannelFactory.refreshNewestPackageCache(c, WEB_CHANNEL_CREATED);
- if (syncRepo && !c.getSources().isEmpty()) {
- TaskFactory.createTask(user.getOrg(), RepoSyncTask.DISPLAY_NAME,
- c.getSources().iterator().next().getId());
- }
-
return c;
}
@@ -350,12 +339,6 @@ public class CreateChannelCommand {
throw new IllegalArgumentException(
"edit.channel.invalidchannelsummary");
}
-
- if (!StringUtils.isEmpty(yumUrl) && StringUtils.isEmpty(repoLabel)) {
- throw new IllegalArgumentException(
- "edit.channel.invalidrepolabel.missing");
- }
-
}
protected void verifyChannelName(String cname) throws InvalidChannelNameException {
@@ -458,26 +441,4 @@ public class CreateChannelCommand {
}
}
- /**
- * @param yumUrlIn The yumUrl to set.
- */
- public void setYumUrl(String yumUrlIn) {
- this.yumUrl = yumUrlIn;
- }
-
- /**
- * @param repoLabelIn The repoLabel to set.
- */
- public void setRepoLabel(String repoLabelIn) {
- this.repoLabel = repoLabelIn;
- }
-
-
- /**
- * @param syncRepoIn The syncRepo to set.
- */
- public void setSyncRepo(boolean syncRepoIn) {
- this.syncRepo = syncRepoIn;
- }
-
}
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index 70d3a20..bb1874b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -96,7 +96,7 @@
<label for="checksum"><bean:message
key="channel.edit.jsp.checksum"/>:</label>
</th>
<td class="small-form">
- <html:select property="checksum">
+ <html:select property="checksum"
styleId="checksum">
<html:options collection="checksums"
property="value"
labelProperty="label" />