3 commits - client/rhel client/solaris rel-eng/packages
by Jan Pazdziora
client/rhel/rhnlib/rhnlib.spec | 6 +++++-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
client/solaris/rhnclient/rhnclient.spec | 6 +++++-
client/solaris/rhnclient/setup.py | 2 +-
rel-eng/packages/rhnclient | 2 +-
rel-eng/packages/rhnlib | 2 +-
rel-eng/packages/yum-rhn-plugin | 2 +-
7 files changed, 19 insertions(+), 7 deletions(-)
New commits:
commit ed77a5b332c17bc07b3f62a53a5bebfda2750289
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jun 21 08:39:00 2012 +0200
Automatic commit of package [rhnclient] release [0.15-1].
diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec
index c494236..f464e5f 100644
--- a/client/solaris/rhnclient/rhnclient.spec
+++ b/client/solaris/rhnclient/rhnclient.spec
@@ -5,7 +5,7 @@
Summary: Red Hat Network Client Utilities and Libraries
Name: rhnclient
Source0: %{name}-%{version}.tar.gz
-Version: 0.14
+Version: 0.15
Release: 1
License: GPLv2
Group: Development/Libraries
@@ -64,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
#%doc ChangeLog COPYING README TODO
%changelog
+* Thu Jun 21 2012 Jan Pazdziora 0.15-1
+- allow linking against openssl
+- %%defattr is not needed since rpm 4.4
+
* Tue Nov 01 2011 Michael Mraka <michael.mraka(a)redhat.com> 0.14-1
- 744287 - fixed path so it isn't substituted in rpm2pkg
diff --git a/client/solaris/rhnclient/setup.py b/client/solaris/rhnclient/setup.py
index 44e392b..97e0563 100644
--- a/client/solaris/rhnclient/setup.py
+++ b/client/solaris/rhnclient/setup.py
@@ -6,7 +6,7 @@
from distutils.core import setup
setup(name = "rhnclient",
- version = "0.14",
+ version = "0.15",
description = "Red Hat Network Client Utilities and Libraries",
long_description = """\
Red Hat Network Client Utilities
diff --git a/rel-eng/packages/rhnclient b/rel-eng/packages/rhnclient
index 5047cdc..3245db7 100644
--- a/rel-eng/packages/rhnclient
+++ b/rel-eng/packages/rhnclient
@@ -1 +1 @@
-0.14-1 client/solaris/rhnclient/
+0.15-1 client/solaris/rhnclient/
commit 07f9e195be887f2ded5075b0f867f3d21f6fa8eb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jun 21 08:38:44 2012 +0200
Automatic commit of package [yum-rhn-plugin] release [1.8.2-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 07abc9b..8fa4101 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -70,6 +70,10 @@ fi
%doc LICENSE
%changelog
+* Thu Jun 21 2012 Jan Pazdziora 1.8.2-1
+- fix files headers. our code is under gplv2 license
+- %%defattr is not needed since rpm 4.4
+
* Wed May 02 2012 Milan Zazrivec <mzazrivec(a)redhat.com> 1.8.1-1
- 817567 - fix reports for auto-errata application already installed
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index fbefb30..902ead9 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.8.1-1 client/rhel/yum-rhn-plugin/
+1.8.2-1 client/rhel/yum-rhn-plugin/
commit 9dffe1443de68a3d9ed61ca6173d9a56c8adc0cf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jun 21 08:38:31 2012 +0200
Automatic commit of package [rhnlib] release [2.5.53-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index c9ee639..a621544 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.52
+Version: 2.5.53
Release: 1%{?dist}
Group: Development/Libraries
@@ -60,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Thu Jun 21 2012 Jan Pazdziora 2.5.53-1
+- allow linking against openssl
+- %%defattr is not needed since rpm 4.4
+
* Thu Mar 29 2012 Jan Pazdziora 2.5.52-1
- 807679 - replace $Revision$ with rhnlib version-release.
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index a0b1e3d..74f4653 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.52-1 client/rhel/rhnlib/
+2.5.53-1 client/rhel/rhnlib/
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.90-1'
by StephenHerr
Tag 'spacewalk-java-1.8.90-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-06-20 12:26 +0000
Tagging package [spacewalk-java] version [1.8.90-1] in directory [java/].
Changes since spacewalk-schema-1.8.52-1:
Stephen Herr (1):
Automatic commit of package [spacewalk-java] release [1.8.90-1].
---
java/spacewalk-java.spec | 13 ++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
---
11 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/spacewalk-java.spec | 13 ++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 50b9a5b1c42d1cf494d782c0bcf30aea0b3351d3
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Jun 20 08:26:45 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.90-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 28a1fd0..7e53639 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.89
+Version: 1.8.90
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -615,6 +615,17 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jun 20 2012 Stephen Herr <sherr(a)redhat.com> 1.8.90-1
+- 823798 - update API documentation
+- 748331 - remove unused import
+- 748331 - do not create multiple default ks sessions
+- removing @Override annotations, methods aren't overriden
+- removing @Override annotation, method isn't overriden
+- remove unnecessary else clause
+- remove unnecessary else clause
+- remove unnecessary casts
+- 833474 - removed the ';' character due the error ORA-00911
+
* Tue Jun 19 2012 Stephen Herr <sherr(a)redhat.com> 1.8.89-1
- 833474 - system.config.listFiles could take > 8 minutes if there were lots of
revisions on lots of config files
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8b565ad..4069522 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.89-1 java/
+1.8.90-1 java/
11 years, 11 months
Changes to 'refs/tags/spacewalk-schema-1.8.52-1'
by Šimon Lukašík
Tag 'spacewalk-schema-1.8.52-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2012-06-20 11:20 +0000
Tagging package [spacewalk-schema] version [1.8.52-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.8.89-1:
Marcelo Moreira de Mello (1):
833474 - removed the ';' character due the error ORA-00911
Nigel Jones (1):
748331 - do not create multiple default ks sessions
Simon Lukasik (3):
Add index on testresult_id for better performance.
Add index on ident_id for better performance
Automatic commit of package [spacewalk-schema] release [1.8.52-1].
Tomas Lestach (7):
remove unnecessary casts
remove unnecessary else clause
remove unnecessary else clause
removing @Override annotation, method isn't overriden
removing @Override annotations, methods aren't overriden
748331 - remove unused import
823798 - update API documentation
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 2 -
java/code/src/com/redhat/rhn/domain/credentials/Credentials.java | 4 ---
java/code/src/com/redhat/rhn/domain/image/Image.java | 1
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java | 13 ----------
java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java | 8 +++---
java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java | 2 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 4 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 6 +---
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 4 +--
rel-eng/packages/spacewalk-schema | 2 -
schema/spacewalk/common/tables/rhnXccdfRuleIdentMap.sql | 5 +++
schema/spacewalk/common/tables/rhnXccdfRuleresult.sql | 5 +++
schema/spacewalk/spacewalk-schema.spec | 7 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.oracle | 4 +++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.postgresql | 4 +++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.oracle | 4 +++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.postgresql | 4 +++
17 files changed, 45 insertions(+), 34 deletions(-)
---
11 years, 11 months
rel-eng/packages schema/spacewalk
by Šimon Lukašík
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 0529798a33af0a5723a188d929071ba0d0682d54
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jun 20 13:20:39 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.52-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index d443a7a..c86edd7 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.51-1 schema/spacewalk/
+1.8.52-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 19d3237..abae9e1 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.51
+Version: 1.8.52
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Jun 20 2012 Simon Lukasik <slukasik(a)redhat.com> 1.8.52-1
+- Add index on ident_id for better performance
+- Add index on testresult_id for better performance.
+- separate schema upgrade script for PostgreSQL
+
* Mon Jun 11 2012 Jan Pazdziora 1.8.51-1
- The upgrade scripts are not processed with oracle2postgresql, making separate
PostgreSQL scripts.
11 years, 11 months
2 commits - schema/spacewalk
by Šimon Lukašík
schema/spacewalk/common/tables/rhnXccdfRuleIdentMap.sql | 5 +++++
schema/spacewalk/common/tables/rhnXccdfRuleresult.sql | 5 +++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.oracle | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.postgresql | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.oracle | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.postgresql | 4 ++++
6 files changed, 26 insertions(+)
New commits:
commit c9144ab9f34dd54870b6ef45abb0ffe8f293740a
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jun 20 11:22:35 2012 +0200
Add index on ident_id for better performance
On my setup, search queries were improved 2 times
(acroding to the cost from explain plans).
diff --git a/schema/spacewalk/common/tables/rhnXccdfRuleIdentMap.sql b/schema/spacewalk/common/tables/rhnXccdfRuleIdentMap.sql
index 912cd14..733bdf2 100644
--- a/schema/spacewalk/common/tables/rhnXccdfRuleIdentMap.sql
+++ b/schema/spacewalk/common/tables/rhnXccdfRuleIdentMap.sql
@@ -30,3 +30,8 @@ CREATE UNIQUE INDEX rhn_xccdf_rim_ri_uq
ON rhnXccdfRuleIdentMap (rresult_id, ident_id)
TABLESPACE [[8m_tbs]]
NOLOGGING;
+
+CREATE INDEX rhn_xccdf_rim_ident_idx
+ ON rhnXccdfRuleIdentMap (ident_id)
+ TABLESPACE [[8m_tbs]]
+ NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.oracle
new file mode 100644
index 0000000..7253910
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.oracle
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_xccdf_rim_ident_idx
+ ON rhnXccdfRuleIdentMap (ident_id)
+ TABLESPACE [[8m_tbs]]
+ NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.postgresql
new file mode 100644
index 0000000..5eb6b26
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/106-rhnXccdfRuleIdentMap-index.sql.postgresql
@@ -0,0 +1,4 @@
+-- oracle equivalent source sha1 fb418952e1dc9f6da8960a60bc25e683e23f873a
+
+CREATE INDEX rhn_xccdf_rim_ident_idx
+ ON rhnXccdfRuleIdentMap (ident_id);
commit 1464c16eee1cd81ea217867143bb7b96fda8addc
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jun 20 09:38:51 2012 +0200
Add index on testresult_id for better performance.
A lot of the scap queries prosper from this.
On my setup, certain queries were improved more
than 28 times (according to the explain plans).
diff --git a/schema/spacewalk/common/tables/rhnXccdfRuleresult.sql b/schema/spacewalk/common/tables/rhnXccdfRuleresult.sql
index 8a97a28..1d169e3 100644
--- a/schema/spacewalk/common/tables/rhnXccdfRuleresult.sql
+++ b/schema/spacewalk/common/tables/rhnXccdfRuleresult.sql
@@ -29,4 +29,9 @@ CREATE TABLE rhnXccdfRuleresult
ENABLE ROW MOVEMENT
;
+CREATE INDEX rhn_xccdf_rresult_tresult_idx
+ ON rhnXccdfRuleresult (testresult_id)
+ TABLESPACE [[4m_tbs]]
+ NOLOGGING;
+
CREATE SEQUENCE rhn_xccdf_rresult_id_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.oracle
new file mode 100644
index 0000000..67b9b78
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.oracle
@@ -0,0 +1,4 @@
+CREATE INDEX rhn_xccdf_rresult_tresult_idx
+ ON rhnXccdfRuleresult (testresult_id)
+ TABLESPACE [[4m_tbs]]
+ NOLOGGING;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.postgresql
new file mode 100644
index 0000000..54e9ea1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/105-rhnXccdfRuleresult-index.sql.postgresql
@@ -0,0 +1,4 @@
+-- oracle equivalent source sha1 4c4dfc5a9e08612c69cd89227c591bd895530377
+
+CREATE INDEX rhn_xccdf_rresult_tresult_idx
+ ON rhnXccdfRuleresult (testresult_id);
11 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 4 ++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 93ba1b23f92a1404635cf6dde5293d30f08e18b0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 20 12:33:09 2012 +0200
823798 - update API documentation
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index 7674fa8..1f04aed 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -395,8 +395,8 @@ public class ConfigChannelHandler extends BaseHandler {
* "Config file macro end delimiter. Use null or
* empty string to accept the default. (only for non-directories)")
* #prop_desc("int", "revision", "next revision number, auto increment for null")
- * #prop_desc("boolean", "binary", "mark the binary content,
- * (only for non-directories)")
+ * #prop_desc("boolean", "binary", "mark the binary content, if True,
+ * base64 encoded content is expected (only for non-directories)")
*
* #struct_end()
* @xmlrpc.returntype
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
index 9d33ca8..83ef279 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
@@ -146,8 +146,8 @@ public class ServerConfigHandler extends BaseHandler {
* #prop_desc("string","selinux_ctx",
* "SeLinux context (optional)")
* #prop_desc("int", "revision", "next revision number, auto increment for null")
- * #prop_desc("boolean", "binary", "mark the binary content,
- * (only for non-directories)")
+ * #prop_desc("boolean", "binary", "mark the binary content, if True,
+ * base64 encoded content is expected (only for non-directories)")
* #struct_end()
* @xmlrpc.param #param("int","commitToLocal")
* #options()
11 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 96773e33695122123f79d1fb1ad4d3a843b83499
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 20 11:36:23 2012 +0200
748331 - remove unused import
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
index a6f218b..f607a4a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
@@ -27,7 +27,6 @@ import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.kickstart.IpAddress;
import com.redhat.rhn.manager.kickstart.KickstartFormatter;
import com.redhat.rhn.manager.kickstart.KickstartManager;
-import com.redhat.rhn.manager.kickstart.KickstartSessionCreateCommand;
import com.redhat.rhn.manager.kickstart.KickstartSessionUpdateCommand;
import org.apache.commons.lang.StringUtils;
11 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java | 12 ----------
1 file changed, 12 deletions(-)
New commits:
commit 3d1efa227cec9e66a74502d3788f74c2a17a19fb
Author: Nigel Jones <nigjones(a)redhat.com>
Date: Wed Jun 20 11:21:36 2012 +0200
748331 - do not create multiple default ks sessions
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
index 714ed6b..a6f218b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java
@@ -187,18 +187,6 @@ public class KickstartHelper {
log.debug("ksdata : " +
ksdata);
}
- // Create and add a KickstartSession if there isn't one already
- if (retval.get(SESSION) == null && !options.containsKey(VIEW_LABEL) &&
- ksdata != null) {
-
-
- log.debug("Creating KickstartSession since there isnt one already.");
- KickstartSessionCreateCommand cmd =
- new KickstartSessionCreateCommand(org, ksdata, remoteAddr);
- cmd.store();
-
- retval.put(SESSION, cmd.getKickstartSession());
- }
}
// Add the host.
retval.put(HOST, getKickstartHost());
11 years, 11 months
5 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/credentials/Credentials.java | 4 +---
java/code/src/com/redhat/rhn/domain/image/Image.java | 1 -
java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java | 8 ++++----
java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java | 2 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 6 ++----
5 files changed, 7 insertions(+), 14 deletions(-)
New commits:
commit 10ffcf319d8f280af3c3bb90eae1c28eae733500
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 20 09:38:55 2012 +0200
removing @Override annotations, methods aren't overriden
diff --git a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
index 71bd777..1dfb908 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
@@ -63,7 +63,6 @@ public class NewCloneErrataEvent implements EventDatabaseMessage {
/**
* {@inheritDoc}
*/
- @Override
public String toText() {
// really a noop
return "";
@@ -73,7 +72,6 @@ public class NewCloneErrataEvent implements EventDatabaseMessage {
*
* {@inheritDoc}
*/
- @Override
public Transaction getTransaction() {
return txn;
}
commit 41840975f5b74cc709e78efb342cc9419f35c5e2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 20 09:38:42 2012 +0200
removing @Override annotation, method isn't overriden
diff --git a/java/code/src/com/redhat/rhn/domain/image/Image.java b/java/code/src/com/redhat/rhn/domain/image/Image.java
index 937f356..a3ad87c 100644
--- a/java/code/src/com/redhat/rhn/domain/image/Image.java
+++ b/java/code/src/com/redhat/rhn/domain/image/Image.java
@@ -224,7 +224,6 @@ public class Image extends BaseDto implements Comparable<Image> {
/**
* {@inheritDoc}
*/
- @Override
public int compareTo(Image image) {
int ret = 0;
if (!this.name.equals(image.getName())) {
commit 226254382f3687ae349b7cb96c3369241f5a3208
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 20 09:37:28 2012 +0200
remove unnecessary else clause
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index a3873c7..bf29289 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -956,10 +956,8 @@ public class ErrataHandler extends BaseHandler {
inheritPackages);
return new ArrayList<Errata>().toArray();
}
- else {
- return ErrataManager.cloneErrataApi(channel, errataToClone,
- loggedInUser, inheritPackages);
- }
+ return ErrataManager.cloneErrataApi(channel, errataToClone,
+ loggedInUser, inheritPackages);
}
commit dd918224edf6d6aa87ae5cd469a918b608dc5680
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 20 09:37:12 2012 +0200
remove unnecessary else clause
diff --git a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java
index 259dbe6..c896337 100644
--- a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java
+++ b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java
@@ -143,9 +143,7 @@ public class Credentials extends BaseDomainHelper {
if (this.encodedPassword != null) {
return new String(Base64.decodeBase64(this.encodedPassword.getBytes()));
}
- else {
- return this.encodedPassword;
- }
+ return this.encodedPassword;
}
/**
commit 953670396c9c87ebf3f86fe8548cc7e74ba325df
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 20 09:35:59 2012 +0200
remove unnecessary casts
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java
index a3a9491..cf1a1e9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/images/ScheduleImageDeploymentAction.java
@@ -68,10 +68,10 @@ public class ScheduleImageDeploymentAction extends RhnAction {
DynaActionForm form = (DynaActionForm) actionForm;
Long vcpus = (Long) form.get("vcpus");
Long memkb = (Long) form.get("mem_mb") * 1024;
- String bridge = (String) form.getString("bridge");
- String proxyServer = (String) form.getString("proxy_server");
- String proxyUser = (String) form.getString("proxy_user");
- String proxyPass = (String) form.getString("proxy_pass");
+ String bridge = form.getString("bridge");
+ String proxyServer = form.getString("proxy_server");
+ String proxyUser = form.getString("proxy_user");
+ String proxyPass = form.getString("proxy_pass");
// Find the requested image
String imageId = request.getParameter("image_id");
11 years, 11 months