java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 52f03b3f2aa65780c51c1bf4f89397494b050be9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 6 10:58:30 2011 +0100
removing unused import
diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
index dc4bd27..2f4f782 100644
--- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
@@ -28,7 +28,6 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.ServerHistoryEvent;
import com.redhat.rhn.domain.server.ServerSnapshot;
-import com.redhat.rhn.domain.server.VirtualInstance;
import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.token.TokenFactory;
import com.redhat.rhn.domain.user.User;
13 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.3.35-1'
by Tomas Lestach
Tag 'spacewalk-java-1.3.35-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-01-05 18:21 +0000
Tagging package [spacewalk-java] version [1.3.35-1] in directory [java/].
Changes since rhn-client-tools-1.3.6-1:
Milan Zazrivec (1):
667432 - don't untie host from guests during host migration
Miroslav Suchý (2):
replace tabs with spacew to fix indentation
add build.py.props to allow building using tito
Tomas Lestach (3):
temporary allow 2010 and 2011 headers
663490 - identify, when package is too large to download via API
Automatic commit of package [spacewalk-java] release [1.3.35-1].
---
java/buildconf/LICENSE.txt | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java | 40 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java | 10 +-
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 5 -
java/spacewalk-java.spec | 11 ++
proxy/proxy/apacheHandler.py | 4 -
rel-eng/packages/spacewalk-java | 2
spacewalk/package/build.py.props | 2
8 files changed, 61 insertions(+), 15 deletions(-)
---
13 years, 4 months
3 commits - java/buildconf java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/buildconf/LICENSE.txt | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java | 40 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java | 10 +-
java/spacewalk-java.spec | 11 ++
rel-eng/packages/spacewalk-java | 2
5 files changed, 57 insertions(+), 8 deletions(-)
New commits:
commit 86d610bc2fe57feae08facbaa7d18e03b50a2a93
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 5 19:21:18 2011 +0100
Automatic commit of package [spacewalk-java] release [1.3.35-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b175bb4..d03bc3c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.34
+Version: 1.3.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 05 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.35-1
+- 663490 - identify, when package is too large to download via API
+ (tlestach(a)redhat.com)
+- temporary allow 2010 and 2011 headers (tlestach(a)redhat.com)
+- 667432 - don't untie host from guests during host migration
+ (mzazrivec(a)redhat.com)
+- 661212 - setting probe suite name for ProbeSuiteListProbes.do
+ (tlestach(a)redhat.com)
+
* Mon Jan 03 2011 Jan Pazdziora 1.3.34-1
- display also error parameters when throwing InvalidKickstartTreeException
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 42388d2..e9444be 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.34-1 java/
+1.3.35-1 java/
commit 01a9849819ac3afc8039f166dbbfc6d6d7e65edc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 5 18:22:00 2011 +0100
663490 - identify, when package is too large to download via API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java
new file mode 100644
index 0000000..4e51c5a
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2011 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
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.xmlrpc;
+
+import com.redhat.rhn.FaultException;
+import com.redhat.rhn.common.localization.LocalizationService;
+
+
+/**
+ * PackageDownloadException
+ * @version $Rev$
+ */
+public class PackageDownloadException extends FaultException {
+
+ /**
+ * Comment for <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 3263555157532178035L;
+
+ /**
+ *
+ * @param label message label
+ */
+ public PackageDownloadException(String label) {
+ super(2302, "packageDownload", LocalizationService.getInstance().getMessage(
+ label));
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
index 7349dda..51cc185 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
@@ -18,7 +18,6 @@ import com.redhat.rhn.FaultException;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.rhnpackage.PackageArch;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
@@ -28,6 +27,7 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.InvalidPackageArchException;
import com.redhat.rhn.frontend.xmlrpc.NoSuchPackageException;
import com.redhat.rhn.frontend.xmlrpc.NoSuchUserException;
+import com.redhat.rhn.frontend.xmlrpc.PackageDownloadException;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
import com.redhat.rhn.frontend.xmlrpc.RhnXmlRpcServer;
import com.redhat.rhn.manager.download.DownloadManager;
@@ -56,6 +56,7 @@ import java.util.Map;
public class PackagesHandler extends BaseHandler {
private static Logger logger = Logger.getLogger(PackagesHandler.class);
+ private static float freeMemCoeff = 0.9f;
/**
* Get Details - Retrieves the details for a given package
@@ -554,15 +555,14 @@ public class PackagesHandler extends BaseHandler {
pkg.getPath();
File file = new File(path);
- if (file.length() > Integer.MAX_VALUE) {
- throw new IOException(LocalizationService.getInstance().getMessage(
- "api.package.download.toolarge"));
+ if (file.length() > freeMemCoeff * Runtime.getRuntime().freeMemory()) {
+ throw new PackageDownloadException("api.package.download.toolarge");
}
byte[] toReturn = new byte[(int) file.length()];
BufferedInputStream br = new BufferedInputStream(new FileInputStream(file));
if (br.read(toReturn) != file.length()) {
- throw new IOException("api.package.download.ioerror");
+ throw new PackageDownloadException("api.package.download.ioerror");
}
return toReturn;
}
commit ee69779dc9fc80066594283e8cc27e06117b9690
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 5 18:48:41 2011 +0100
temporary allow 2010 and 2011 headers
diff --git a/java/buildconf/LICENSE.txt b/java/buildconf/LICENSE.txt
index 42c95db..db0c51f 100644
--- a/java/buildconf/LICENSE.txt
+++ b/java/buildconf/LICENSE.txt
@@ -1,5 +1,5 @@
^/\*\*$
-^ \* Copyright \(c\) (200\d--)?2010 Red Hat, Inc.$
+^ \* Copyright \(c\) (200\d--)?201[01] 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$
13 years, 4 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 5 -----
1 file changed, 5 deletions(-)
New commits:
commit 11008f331eee08c7999008d4e76345e7dfeefdc0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 5 16:39:07 2011 +0100
667432 - don't untie host from guests during host migration
It's perfectly acceptable to have host and its guests in different
organizations.
diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
index 27d1ad1..dc4bd27 100644
--- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
@@ -136,11 +136,6 @@ public class MigrationManager extends BaseManager {
// Remove custom data values (aka System->CustomInfo)
ServerFactory.removeCustomDataValues(server);
- // Server relationships with guests:
- for (VirtualInstance guest : server.getGuests()) {
- server.removeGuest(guest);
- }
-
// Remove existing channels
server.getChannels().clear();
13 years, 4 months
spacewalk/package
by Miroslav Suchý
spacewalk/package/build.py.props | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 981c71f5521c967f3a0f100a5ef4009724750e87
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 5 15:44:45 2011 +0100
add build.py.props to allow building using tito
diff --git a/spacewalk/package/build.py.props b/spacewalk/package/build.py.props
new file mode 100644
index 0000000..8e8cebb
--- /dev/null
+++ b/spacewalk/package/build.py.props
@@ -0,0 +1,2 @@
+[buildconfig]
+builder = spacewalk.releng.builder.NoTgzBuilder
13 years, 4 months
proxy/proxy
by Miroslav Suchý
proxy/proxy/apacheHandler.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7049b79c6c9ea2f5102e12f031a45f7ff66b2580
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 5 14:52:33 2011 +0100
replace tabs with spacew to fix indentation
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 9d204a0..ffe0117 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -206,8 +206,8 @@ class apacheHandler(rhnApache):
# we're just making a connection to localhost, it's not the end of the
# world if we get it wrong.
- scheme = SCHEME_HTTP
- if req.server.is_virtual and req.server.port == 443:
+ scheme = SCHEME_HTTP
+ if req.server.is_virtual and req.server.port == 443:
scheme = SCHEME_HTTPS
log_debug(6, "Using scheme: %s" % scheme)
13 years, 4 months
Changes to 'refs/tags/spacewalk-backend-1.3.38-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.3.38-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-01-05 12:59 +0000
Tagging package [spacewalk-backend] version [1.3.38-1] in directory [backend/].
Changes since rhn-client-tools-1.3.5-1:
Justin Sherrill (2):
667232 - fixing issue where balancing of guests between flex an regular entitlements did would not work correctly, making certificates very difficult to activate
667232 - adding upgrade for 091e18bc8ab86835904f72e530cec58c5230ec0e
Miroslav Suchý (3):
656241 - require libvirt
665013 - do not send None for ipaddr in IPv6 only system
Automatic commit of package [spacewalk-backend] release [1.3.38-1].
Tomas Lestach (1):
661212 - setting probe suite name for ProbeSuiteListProbes.do
---
backend/spacewalk-backend.spec | 6
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2
client/tools/rhn-virtualization/rhn-virtualization.spec | 7
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java | 1
rel-eng/packages/spacewalk-backend | 2
schema/spacewalk/oracle/packages/rhn_entitlements.pkb | 13
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/014-rhn_entitlement_pkb.sql | 1857 ++++++++++
7 files changed, 1883 insertions(+), 5 deletions(-)
---
13 years, 4 months
Changes to 'refs/tags/rhn-virtualization-5.4.19-1'
by Miroslav Suchý
Tag 'rhn-virtualization-5.4.19-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-01-05 12:59 +0000
Tagging package [rhn-virtualization] version [5.4.19-1] in directory [client/tools/rhn-virtualization/].
Changes since rhn-client-tools-1.3.5-1:
Justin Sherrill (2):
667232 - fixing issue where balancing of guests between flex an regular entitlements did would not work correctly, making certificates very difficult to activate
667232 - adding upgrade for 091e18bc8ab86835904f72e530cec58c5230ec0e
Miroslav Suchý (4):
656241 - require libvirt
665013 - do not send None for ipaddr in IPv6 only system
Automatic commit of package [spacewalk-backend] release [1.3.38-1].
Automatic commit of package [rhn-virtualization] release [5.4.19-1].
Tomas Lestach (1):
661212 - setting probe suite name for ProbeSuiteListProbes.do
---
backend/spacewalk-backend.spec | 6
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2
client/tools/rhn-virtualization/rhn-virtualization.spec | 13
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java | 1
rel-eng/packages/rhn-virtualization | 2
rel-eng/packages/spacewalk-backend | 2
schema/spacewalk/oracle/packages/rhn_entitlements.pkb | 13
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/014-rhn_entitlement_pkb.sql | 1857 ++++++++++
8 files changed, 1889 insertions(+), 7 deletions(-)
---
13 years, 4 months
Changes to 'refs/tags/rhn-client-tools-1.3.6-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.3.6-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-01-05 13:00 +0000
Tagging package [rhn-client-tools] version [1.3.6-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-1.3.5-1:
Justin Sherrill (2):
667232 - fixing issue where balancing of guests between flex an regular entitlements did would not work correctly, making certificates very difficult to activate
667232 - adding upgrade for 091e18bc8ab86835904f72e530cec58c5230ec0e
Miroslav Suchý (5):
656241 - require libvirt
665013 - do not send None for ipaddr in IPv6 only system
Automatic commit of package [spacewalk-backend] release [1.3.38-1].
Automatic commit of package [rhn-virtualization] release [5.4.19-1].
Automatic commit of package [rhn-client-tools] release [1.3.6-1].
Tomas Lestach (1):
661212 - setting probe suite name for ProbeSuiteListProbes.do
---
backend/spacewalk-backend.spec | 6
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2
client/tools/rhn-virtualization/rhn-virtualization.spec | 13
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java | 1
rel-eng/packages/rhn-client-tools | 2
rel-eng/packages/rhn-virtualization | 2
rel-eng/packages/spacewalk-backend | 2
schema/spacewalk/oracle/packages/rhn_entitlements.pkb | 13
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/014-rhn_entitlement_pkb.sql | 1857 ++++++++++
10 files changed, 1894 insertions(+), 9 deletions(-)
---
13 years, 4 months
2 commits - client/rhel client/tools rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/tools/rhn-virtualization/rhn-virtualization.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
rel-eng/packages/rhn-virtualization | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 0288b8df794c5f6a57d0468abee2bf3ad5fc3537
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 5 14:00:19 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.3.6-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 48a5672..2309289 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.3.5
+Version: 1.3.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -290,6 +290,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Jan 05 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.6-1
+- 665013 - do not send None for ipaddr in IPv6 only system
+
* Tue Jan 04 2011 Jan Pazdziora 1.3.5-1
- 666860 - Add support for subscription-manager in firstboot.
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 894480b..4e96d33 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.3.5-1 client/rhel/rhn-client-tools/
+1.3.6-1 client/rhel/rhn-client-tools/
commit 18b25203c81eb93fe7abc52d93bcdb8e6544935a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 5 13:59:47 2011 +0100
Automatic commit of package [rhn-virtualization] release [5.4.19-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index d4a8835..6155fb5 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -10,7 +10,7 @@ License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.4.18
+Version: 5.4.19
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -147,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Jan 05 2011 Miroslav Suchý <msuchy(a)redhat.com> 5.4.19-1
+- 656241 - require libvirt
+- Updating the copyright years to include 2010. (jpazdziora(a)redhat.com)
+
* Mon Dec 20 2010 Miroslav Suchý <msuchy(a)redhat.com> 5.4.18-1
- 657516 - print nice warning if libvirtd is not running
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index 665b248..644a0fb 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.18-1 client/tools/rhn-virtualization/
+5.4.19-1 client/tools/rhn-virtualization/
13 years, 4 months