Changes to 'refs/tags/spacewalk-proxy-1.2.1-1'
by Justin Sherrill
Tag 'spacewalk-proxy-1.2.1-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-08-31 23:06 +0000
Tagging package [spacewalk-proxy] version [1.2.1-1] in directory [proxy/proxy/].
Changes since spacewalk-java-1.2.21-1:
Justin Sherrill (2):
629102 - Adding range to the allowed header list for proxy
Automatic commit of package [spacewalk-proxy] release [1.2.1-1].
---
proxy/proxy/rhnShared.py | 2 +-
proxy/proxy/spacewalk-proxy.spec | 7 ++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
12 years, 9 months
proxy/proxy rel-eng/packages
by Justin Sherrill
proxy/proxy/spacewalk-proxy.spec | 7 ++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 16cce7cb66508ab41a7a4095cb5da418512f3e34
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Aug 31 19:06:40 2010 -0400
Automatic commit of package [spacewalk-proxy] release [1.2.1-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index cc05de8..8c45659 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.2.0
+Version: 1.2.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -318,6 +318,11 @@ fi
%changelog
+* Tue Aug 31 2010 Justin Sherrill <jsherril(a)redhat.com> 1.2.1-1
+- 629102 - Adding range to the allowed header list for proxy
+ (jsherril(a)redhat.com)
+- bumping package versions for 1.2 (mzazrivec(a)redhat.com)
+
* Fri Jul 16 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.1.3-1
- oracle client has been removed from /opt/oracle ages ago
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index cf730ff..16f1a93 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.1.3-1 proxy/proxy/
+1.2.1-1 proxy/proxy/
12 years, 9 months
proxy/proxy
by Justin Sherrill
proxy/proxy/rhnShared.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c9d989a6ff3439d66da7b348f0809716f740bdeb
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Aug 31 19:03:51 2010 -0400
629102 - Adding range to the allowed header list for proxy
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index a65837e..05a10da 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -329,7 +329,7 @@ class SharedHandler:
# mod_wsgi modifies incoming headers so we have to transform them back
k = k.replace('_','-')
if not (string.lower(k)[:2] == 'x-' or
- string.lower(k) in ['content-length', 'user-agent', 'content-type']):
+ string.lower(k) in ['range', 'content-length', 'user-agent', 'content-type']):
# filter out header we don't want to send
continue
if type(vals) not in (ListType, TupleType):
12 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.2.21-1'
by Partha Aji
Tag 'spacewalk-java-1.2.21-1' created by Partha Aji <paji(a)redhat.com> at 2010-08-31 22:28 +0000
Tagging package [spacewalk-java] version [1.2.21-1] in directory [java/].
Changes since spacewalk-java-1.2.20-1:
Partha Aji (2):
577921 - Removed references to redhat-release package
Automatic commit of package [spacewalk-java] release [1.2.21-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 13 ++
java/code/src/com/redhat/rhn/domain/server/Server.java | 10 -
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 57 +++++-----
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 24 ++--
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
6 files changed, 64 insertions(+), 47 deletions(-)
---
12 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Partha Aji
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 48c0238bfec8e248c8536776ea4536259aa72b95
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 31 18:28:35 2010 -0400
Automatic commit of package [spacewalk-java] release [1.2.21-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6848fbf..f6bf346 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.20
+Version: 1.2.21
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -335,6 +335,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Aug 31 2010 Partha Aji <paji(a)redhat.com> 1.2.21-1
+- 577921 - Removed references to redhat-release package (paji(a)redhat.com)
+
* Tue Aug 31 2010 Partha Aji <paji(a)redhat.com> 1.2.20-1
- 628097 - Removed kickstart partition validation logic (paji(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e9bae27..614baa7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.20-1 java/
+1.2.21-1 java/
12 years, 9 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 13 ++
java/code/src/com/redhat/rhn/domain/server/Server.java | 10 -
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 57 +++++-----
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 24 ++--
4 files changed, 59 insertions(+), 45 deletions(-)
New commits:
commit 34029786a88b37bb71dc64a133dfab937abc6d82
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 31 18:23:14 2010 -0400
577921 - Removed references to redhat-release package
Had it instead looking at the package provides for redhat-release info
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 cb1c321..698f0a8 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
@@ -1918,4 +1918,17 @@ SELECT
</query>
</mode>
+<mode name="lookup_release_package_evr_id">
+ <query params="sid">
+select distinct p.evr_id as id
+ from
+ rhnPackageProvides pp
+ inner join rhnPackageCapability pc on pc.id= pp.CAPABILITY_ID
+ inner join rhnPackage p on p.id = pp.package_id
+ inner join rhnServerPackage sp on sp.name_id = p.name_id and sp.evr_id = p.evr_id
+ where pc.name='redhat-release' and sp.server_id= :sid
+ </query>
+</mode>
+
+
</datasource_modes>
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index f03dbf7..5ef348e 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -33,7 +33,6 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
-import com.redhat.rhn.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.system.SystemManager;
import org.apache.commons.lang.StringUtils;
@@ -1709,15 +1708,6 @@ public class Server extends BaseDomainHelper implements Identifiable {
}
/**
- * Returns the "Release" package associated to this server
- * This has useful information like the Rhel release, and evr
- * @return the Redhat release Installed Package
- */
- public InstalledPackage getReleasePackage() {
- return PackageManager.lookupReleasePackageFor(this);
- }
-
- /**
* @return Returns the cobblerId.
*/
public String getCobblerId() {
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 329a513..397a8e2 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -14,26 +14,6 @@
*/
package com.redhat.rhn.manager.channel;
-import java.io.File;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.CallableMode;
@@ -65,6 +45,7 @@ import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
+import com.redhat.rhn.domain.rhnpackage.PackageEvr;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
@@ -87,11 +68,32 @@ import com.redhat.rhn.manager.BaseManager;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.errata.cache.ErrataCacheManager;
import com.redhat.rhn.manager.org.OrgManager;
+import com.redhat.rhn.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.user.UserManager;
import com.redhat.rhn.taskomatic.task.TaskConstants;
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
* ChannelManager
* @version $Rev$
@@ -1236,6 +1238,7 @@ public class ChannelManager extends BaseManager {
* @param end end date
* @return the errata applicable to a channel
*/
+ @Deprecated
public static DataResult listErrataForDates(Channel channel, String start, String end) {
String mode = "relevant_to_channel_deprecated";
Map params = new HashMap();
@@ -2041,10 +2044,10 @@ public class ChannelManager extends BaseManager {
log.debug("listBaseChannelsForSystem()");
List<EssentialChannelDto> channelDtos = new LinkedList<EssentialChannelDto>();
-
- if (s.getReleasePackage() != null && s.getReleasePackage().getEvr() != null) {
- String rhelVersion = s.getReleasePackage().getEvr().getVersion();
- String rhelRelease = s.getReleasePackage().getEvr().getRelease();
+ PackageEvr releaseEvr = PackageManager.lookupReleasePackageEvrFor(s);
+ if (releaseEvr != null) {
+ String rhelVersion = releaseEvr.getVersion();
+ String rhelRelease = releaseEvr.getRelease();
String serverArch = s.getServerArch().getLabel();
// If the system has the default base channel, that channel will not have
@@ -2379,7 +2382,7 @@ public class ChannelManager extends BaseManager {
return null;
}
Collections.sort(dr, new EusReleaseComparator(rhelVersion));
- return (EssentialChannelDto) dr.get(dr.size() - 1);
+ return dr.get(dr.size() - 1);
}
/**
@@ -2696,7 +2699,7 @@ public class ChannelManager extends BaseManager {
SelectMode mode = ModeFactory.getMode(
"Channel_queries", "channel_errata_packages");
- return (List<PackageDto>) mode.execute(params);
+ return mode.execute(params);
}
/**
@@ -2710,7 +2713,7 @@ public class ChannelManager extends BaseManager {
SelectMode mode = ModeFactory.getMode(
"Channel_queries", "cloned_original_id");
- List<Map> list = (List) mode.execute(params);
+ List<Map> list = mode.execute(params);
if (!list.isEmpty()) {
Map map = list.get(0);
return (Long) map.get("id");
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
index dc3c32c..5654470 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -28,11 +28,12 @@ import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
import com.redhat.rhn.domain.rhnpackage.Package;
+import com.redhat.rhn.domain.rhnpackage.PackageEvr;
+import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.role.RoleFactory;
-import com.redhat.rhn.domain.server.InstalledPackage;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PackageComparison;
@@ -64,8 +65,6 @@ import java.util.Set;
* @version $Rev$
*/
public class PackageManager extends BaseManager {
-
- private static final String REDHAT_RELEASE_PACKAGE = "redhat-release";
private static Logger log = Logger.getLogger(PackageManager.class);
public static final String RHNCFG = "rhncfg";
public static final String RHNCFG_CLIENT = "rhncfg-client";
@@ -863,14 +862,23 @@ public class PackageManager extends BaseManager {
}
/**
- * Given a server this method returns the redhat-release package.
+ * Given a server this method returns the redhat-release package evr info.
* This package is a marker package and holds information like
- * the rhel release and can be futher queried to get the evr information.
* @param server the server object who has to be queried
- * @return the redhat release package or null if the package can't be found..
+ * @return the redhat release package evr or null if the package can't be found..
*/
- public static InstalledPackage lookupReleasePackageFor(Server server) {
- return PackageFactory.lookupByNameAndServer(REDHAT_RELEASE_PACKAGE, server);
+ public static PackageEvr lookupReleasePackageEvrFor(Server server) {
+ Map params = new HashMap();
+ params.put("sid", server.getId());
+ SelectMode m = ModeFactory.getMode("Package_queries",
+ "lookup_release_package_evr_id");
+ DataResult<Map<String, Long>> ret = m.execute(params);
+ if (ret.isEmpty()) {
+ return null;
+ }
+
+ Long evrId = ret.get(0).get("id");
+ return PackageEvrFactory.lookupPackageEvrById(evrId);
}
/**
12 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.2.20-1'
by Partha Aji
Tag 'spacewalk-java-1.2.20-1' created by Partha Aji <paji(a)redhat.com> at 2010-08-31 21:04 +0000
Tagging package [spacewalk-java] version [1.2.20-1] in directory [java/].
Changes since spacewalk-java-1.2.19-1:
Partha Aji (2):
628097 - Removed kickstart partition validation logic
Automatic commit of package [spacewalk-java] release [1.2.20-1].
---
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPartitionEditAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java | 20 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java | 157 ----------
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java | 4
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
7 files changed, 10 insertions(+), 182 deletions(-)
---
12 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Partha Aji
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 47edafa6102de782830d3e8fd9492158ba58fa8d
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 31 17:04:17 2010 -0400
Automatic commit of package [spacewalk-java] release [1.2.20-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 321ddbb..6848fbf 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.19
+Version: 1.2.20
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -335,6 +335,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Aug 31 2010 Partha Aji <paji(a)redhat.com> 1.2.20-1
+- 628097 - Removed kickstart partition validation logic (paji(a)redhat.com)
+
* Tue Aug 31 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.19-1
- 626741 - do not allow two repos with same label or repository url
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7b5053b..e9bae27 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.19-1 java/
+1.2.20-1 java/
12 years, 9 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPartitionEditAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java | 20 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java | 157 ----------
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java | 4
5 files changed, 5 insertions(+), 180 deletions(-)
New commits:
commit 29e66d7da550556ef8de7e3be77e8f563d263d9a
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Aug 31 17:04:01 2010 -0400
628097 - Removed kickstart partition validation logic
To account for snippets and reworked kickstart partition stuff.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPartitionEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPartitionEditAction.java
index c793f37..eaf6ba2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPartitionEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPartitionEditAction.java
@@ -40,7 +40,7 @@ public class KickstartPartitionEditAction extends BaseKickstartEditAction {
DynaActionForm form,
BaseKickstartCommand cmdIn) {
KickstartPartitionCommand cmd = (KickstartPartitionCommand) cmdIn;
- return cmd.parsePartitions(form.getString(PARTITIONS));
+ return cmd.setPartitionData(form.getString(PARTITIONS));
}
@Override
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java
index c345d91..104507c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java
@@ -71,26 +71,6 @@ public class KickstartPartitionActionTest extends RhnMockStrutsTestCase {
}
- public void testDuplicateMountPoint() throws Exception {
-
- String data = "part /boot --size=1000 --grow --maxsize=3000\n" +
- "part /boot --size=2000 --grow --maxsize=3000\n" +
- "volgroup myvg pv.01\n" +
- "raid swap --fstype swap --level 0 --device 1 raid.05 raid.06 raid.07 raid.08";
- setRequestPathInfo("/kickstart/KickstartPartitionEdit");
- addRequestParameter(KickstartPartitionEditAction.SUBMITTED,
- Boolean.TRUE.toString());
- addRequestParameter(KickstartPartitionEditAction.PARTITIONS, data);
- actionPerform();
- DynaActionForm form = (DynaActionForm) getActionForm();
- String formval = (String)form.get(KickstartPartitionEditAction.PARTITIONS);
-
- assertTrue(formval.length() > 0);
-
- String[] keys = {"kickstart.partition.duplicate"};
- verifyActionErrors(keys);
- }
-
public void testMultipleSwapsSubmit() throws Exception {
String data = "part swap --size=1000 --grow --maxsize=3000\n" +
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
index 94facae..127b3f9 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
@@ -353,7 +353,7 @@ public class SystemDetailsHandler extends BaseHandler {
sb.append(s);
sb.append('\n');
}
- ValidatorError err = command.parsePartitions(sb.toString());
+ ValidatorError err = command.setPartitionData(sb.toString());
if (err != null) {
throw new FaultException(-4, "PartitioningSchemeInvalid", err
.toString());
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java
index aa0022f..821197b 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartPartitionCommand.java
@@ -17,42 +17,15 @@ package com.redhat.rhn.manager.kickstart;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.user.User;
-import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import java.text.ParseException;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.StringTokenizer;
-
/**
* KickstartPrePostCommand - for editing the pre and post steps
* in a kickstart.
* @version $Rev$
*/
public class KickstartPartitionCommand extends BaseKickstartCommand {
-
private static Logger log = Logger.getLogger(KickstartPartitionCommand.class);
-
- private static final String SWAP = "swap";
- private static final String SPACE = " ";
- private static final String NEWLINE = "\n";
- private static final String WHITESPACE = "\\s";
- private static final String RAID = "raid";
- private static final String LOGVOL = "logvol";
- private static final String INCLUDE = "include";
- private static final String VOLGROUP = "volgroup";
- private static final String EMPTY_STRING = "";
-
-
- private LinkedHashMap partitions = new LinkedHashMap(Collections.EMPTY_MAP);
- private LinkedHashMap includes = new LinkedHashMap(Collections.EMPTY_MAP);
- private LinkedHashMap logvols = new LinkedHashMap(Collections.EMPTY_MAP);
- private LinkedHashMap volgroups = new LinkedHashMap(Collections.EMPTY_MAP);
- private LinkedHashMap raids = new LinkedHashMap(Collections.EMPTY_MAP);
-
- private int partSwaps = 0;
- private int raidSwaps = 0;
/**
* Constructor
* @param ksidIn id of the Kickstart to lookup
@@ -67,136 +40,8 @@ public class KickstartPartitionCommand extends BaseKickstartCommand {
* @param partitionsIn String from dynaform
* @return ValidatorError if validation error exists
*/
- public ValidatorError parsePartitions(String partitionsIn) {
- if (log.isDebugEnabled()) {
- log.debug("parsePartitions() : partitionsIn: " + partitionsIn);
- }
- for (StringTokenizer strtok = new StringTokenizer(partitionsIn, NEWLINE); strtok
- .hasMoreTokens();) {
- String token = strtok.nextToken();
- if (token == null || token.length() == 0) {
- continue;
- }
- String[] tokens = token.split(WHITESPACE);
- if (tokens == null || tokens.length == 0) {
- continue;
- }
-
- String key = "";
- if (tokens.length > 1) {
- key = tokens[1]; // mount point is the key
- }
- String stripped = StringUtils.trim(token.replaceFirst(tokens[0],
- EMPTY_STRING));
- if (log.isDebugEnabled()) {
- log.debug("Token: " + token);
- }
- try {
- if (token.startsWith("part")) {
- handlePartitions(key, stripped);
- }
- else if (token.startsWith(RAID)) {
- handleRaids(key, stripped);
- }
- else if (token.startsWith(VOLGROUP)) {
- handleVolGroups(key, stripped);
- }
- else if (token.startsWith("%" + INCLUDE) || token.startsWith(INCLUDE)) {
- handleIncludes(key, stripped);
- }
- else if (token.startsWith(LOGVOL)) {
- handleLogVols(key, stripped);
- }
- }
- catch (ParseException e) {
- return new ValidatorError("kickstart.partition.duplicate", key);
- }
- }
+ public ValidatorError setPartitionData(String partitionsIn) {
ksdata.setPartitionData(partitionsIn);
-
return null;
}
-
-
- /**
- *
- * @param keyIn mount point coming in
- * @param partIn partition string coming in
- * @throws ParseException if we have duplicate mount points in the set
- */
- private void handlePartitions(String keyIn, String partIn) throws ParseException {
- // we can have multiple swaps...follow perl pattern of storing swap, swap1..swapN
-
- if (keyIn.startsWith(SWAP)) {
- if (partSwaps > 0) {
- partIn.replaceFirst(SWAP, SWAP + partSwaps);
- keyIn = SWAP + partSwaps;
- }
- partSwaps++;
- }
- else if (partitions.containsKey(keyIn)) {
- throw new ParseException(keyIn, 0);
- }
- partitions.put(keyIn, partIn);
- }
-
- /**
- *
- * @param keyIn mount point coming in
- * @param includeIn include string coming in
- * @throws ParseException if we have duplicate mount points in the set
- */
- private void handleIncludes(String keyIn, String includeIn) throws ParseException {
- if (includes.containsKey(keyIn)) {
- throw new ParseException(keyIn, 0);
- }
- includes.put(keyIn, includeIn);
- }
-
- /**
- *
- * @param keyIn mount point coming in
- * @param logvolIn string coming in
- * @throws ParseException if we have duplicate mount points in the set
- */
- private void handleLogVols(String keyIn, String logvolIn) throws ParseException {
- if (logvols.containsKey(keyIn)) {
- throw new ParseException(keyIn, 0);
- }
- logvols.put(keyIn, logvolIn);
- }
-
- /**
- *
- * @param keyIn mount point coming in
- * @param raidIn raid string coming in
- * @throws ParseException if we have duplicate mount points in the set
- */
- private void handleRaids(String keyIn, String raidIn) throws ParseException {
- // we can have multiple swaps...follow perl pattern of storing swap, swap1..swapN
- if (raidIn.startsWith(SWAP + SPACE)) {
- if (raidSwaps > 0) {
- raidIn.replaceFirst(SWAP, SWAP + raidSwaps);
- keyIn = SWAP + raidSwaps;
- }
- raidSwaps++;
- }
- else if (raids.containsKey(keyIn)) {
- throw new ParseException(keyIn, 0);
- }
- raids.put(keyIn, raidIn);
- }
-
- /**
- *
- * @param keyIn mount point coming in
- * @param volgroupIn volgroup coming in
- * @throws ParseException if we have duplicate mount points in the set
- */
- private void handleVolGroups(String keyIn, String volgroupIn) throws ParseException {
- if (volgroups.containsKey(keyIn)) {
- throw new ParseException(keyIn, 0);
- }
- volgroups.put(keyIn, volgroupIn);
- }
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
index b110d85..3ef6235 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
@@ -40,7 +40,7 @@ public class KickstartPartitionCommandTest extends BaseTestCaseWithUser {
"volgroup myvg pv.01\n" +
"logvol / --vgname=myvg --name=rootvol --size=1000 --grow\n";
- assertNull(cmd.parsePartitions(partitions));
+ assertNull(cmd.setPartitionData(partitions));
assertNotNull(k.getPartitionData());
assertNotNull(cmd);
@@ -61,7 +61,7 @@ public class KickstartPartitionCommandTest extends BaseTestCaseWithUser {
"volgroup myvg pv.01\n" +
"logvol / --vgname=myvg --name=rootvol --size=2112 --grow\n";
- assertNull(cmd.parsePartitions(partitions));
+ assertNull(cmd.setPartitionData(partitions));
assertNull(cmd.store());
k = (KickstartData) reload(k);
assertNotNull(k.getPartitionData());
12 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.2.19-1'
by Tomas Lestach
Tag 'spacewalk-java-1.2.19-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-08-31 15:23 +0000
Tagging package [spacewalk-java] version [1.2.19-1] in directory [java/].
Changes since rhn-client-tools-1.2.6-1:
Colin Coe (1):
567885 - "Spacewalk release 0.9" leads to 404
Jan Pazdziora (3):
The 00-spacewalk-mod_jk.conf is no more needed as all Spacewalks are now on Apache 2.2+.
As 00-spacewalk-mod_jk.conf which referenced workers.properties is gone, remove it now as well.
594513 - only listen on localhost (connectors at 8080 and 8009).
Tomas Lestach (2):
626741 - do not allow two repos with same label or repository url
Automatic commit of package [spacewalk-java] release [1.2.19-1].
---
branding/templates/footer.pxt | 2
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 31 +++++
java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml | 11 +
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java | 4
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java | 58 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/repo/InvalidRepoLabelException.java | 40 ++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/repo/InvalidRepoUrlException.java | 39 ++++++
java/code/src/com/redhat/rhn/manager/channel/repo/BaseRepoCommand.java | 52 ++++----
java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java | 9 -
java/code/src/com/redhat/rhn/manager/channel/repo/EditRepoCommand.java | 20 +--
java/conf/workers.properties | 8 -
java/spacewalk-java.spec | 8 +
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/tables/rhnContentSource.sql | 11 +
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/053-rhnContectSource.sql | 52 ++++++++
spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 19 ---
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 4
spacewalk/config/etc/rhn/satellite-httpd/conf/workers.properties | 8 -
spacewalk/config/spacewalk-config.spec | 2
spacewalk/setup/share/server.xml.xsl | 1
21 files changed, 283 insertions(+), 104 deletions(-)
---
12 years, 9 months