6 commits - backend/server client/rhel java/code schema/spacewalk
by Šimon Lukašík
backend/server/action/scap.py | 24 +++++--
backend/server/handlers/xmlrpc/Makefile | 2
client/rhel/spacewalk-oscap/scap.py | 6 -
java/code/src/com/redhat/rhn/domain/org/OrgConfig.hbm.xml | 2
java/code/src/com/redhat/rhn/domain/org/OrgConfig.java | 32 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java | 18 ++++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 12 +++
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 27 ++++++++
schema/spacewalk/common/tables/rhnOrgConfiguration.sql | 8 ++
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/018-rhnOrgConfiguration-scap.sql | 8 ++
10 files changed, 126 insertions(+), 13 deletions(-)
New commits:
commit e20d499601f15d76826166fee096151621780dc3
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue May 28 19:16:19 2013 +0200
Add scap into list of packaged modules.
diff --git a/backend/server/handlers/xmlrpc/Makefile b/backend/server/handlers/xmlrpc/Makefile
index 1b29cf2..2378238 100644
--- a/backend/server/handlers/xmlrpc/Makefile
+++ b/backend/server/handlers/xmlrpc/Makefile
@@ -6,7 +6,7 @@ TOP = ../../..
SUBDIR = server/handlers/xmlrpc
FILES = __init__ country queue registration states up2date errata \
- getMethod proxy get_handler abrt
+ getMethod proxy get_handler abrt scap
include $(TOP)/Makefile.defs
commit 42429b4ae06260a6d640ae4746796ae2e80bc7ca
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue May 28 15:31:31 2013 +0200
SCAP file size limit shall be configurable through web interface
diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgConfig.hbm.xml b/java/code/src/com/redhat/rhn/domain/org/OrgConfig.hbm.xml
index e026401..84c7ab1 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgConfig.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgConfig.hbm.xml
@@ -14,6 +14,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="crashReportingEnabled" column="crash_reporting_enabled" type="yes_no" not-null="true"/>
<property name="crashfileUploadEnabled" column="crashfile_upload_enabled" type="yes_no" not-null="true"/>
<property name="crashFileSizelimit" column="crash_file_sizelimit" type="long" not-null="true"/>
+ <property name="scapfileUploadEnabled" column="scapfile_upload_enabled" type="yes_no" not-null="true"/>
+ <property name="scapFileSizelimit" column="scap_file_sizelimit" type="long" not-null="true"/>
</class>
</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgConfig.java b/java/code/src/com/redhat/rhn/domain/org/OrgConfig.java
index 8fc40c0..e63181c 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgConfig.java
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgConfig.java
@@ -32,6 +32,8 @@ public class OrgConfig extends BaseDomainHelper {
private boolean crashReportingEnabled;
private boolean crashfileUploadEnabled;
private Long crashFileSizelimit;
+ private boolean scapfileUploadEnabled;
+ private Long scapFileSizelimit;
/**
* Gets the current value of org_id
@@ -106,4 +108,34 @@ public class OrgConfig extends BaseDomainHelper {
public void setCrashFileSizelimit(Long sizeLimitIn) {
crashFileSizelimit = sizeLimitIn;
}
+
+ /**
+ * @return Returns the scapfileUploadEnabled flag.
+ */
+ public boolean isScapfileUploadEnabled() {
+ return scapfileUploadEnabled;
+ }
+
+ /**
+ * @param scapfileUploadEnabledIn The scapfileUploadEnabled to set.
+ */
+ public void setScapfileUploadEnabled(boolean scapfileUploadEnabledIn) {
+ scapfileUploadEnabled = scapfileUploadEnabledIn;
+ }
+
+ /**
+ * Get the org-wide SCAP file size limit.
+ * @return Returns the org-wide scap file size limit.
+ */
+ public Long getScapFileSizelimit() {
+ return scapFileSizelimit;
+ }
+
+ /**
+ * Set the org-wide SCAP file size limit.
+ * @param sizeLimitIn The org-wide SCAP file size limit to set.
+ */
+ public void setScapFileSizelimit(Long sizeLimitIn) {
+ scapFileSizelimit = sizeLimitIn;
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
index ed700b3..cfe7455 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
@@ -60,12 +60,19 @@ public class OrgConfigAction extends RhnAction {
getParameter("crashfile_upload_enabled") != null);
}
+ org.getOrgConfig().setScapfileUploadEnabled(request.
+ getParameter("scapfile_upload_enabled") != null);
+
Long newCrashLimit = null;
+ Long newScapLimit = null;
try {
newCrashLimit = Long.parseLong(
request.getParameter("crashfile_sizelimit").trim());
- if (newCrashLimit < 0) {
+ newScapLimit = Long.parseLong(
+ request.getParameter("scapfile_sizelimit").trim());
+
+ if (newCrashLimit < 0 || newScapLimit < 0) {
throw new IllegalArgumentException();
}
}
@@ -80,6 +87,9 @@ public class OrgConfigAction extends RhnAction {
if (StringUtils.isNotEmpty(request.getParameter("crashfile_sizelimit"))) {
org.getOrgConfig().setCrashFileSizelimit(newCrashLimit);
}
+ if (StringUtils.isNotEmpty(request.getParameter("scapfile_sizelimit"))) {
+ org.getOrgConfig().setScapFileSizelimit(newScapLimit);
+ }
ActionMessages msg = new ActionMessages();
msg.add(ActionMessages.GLOBAL_MESSAGE,
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 7662af1..180ac89 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -3339,6 +3339,18 @@ button below, and <b>will be unable to log back in</b>.</source>
<context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="org-config.scapfile-upload.jsp">
+ <source>Enable Upload Of Detailed SCAP Files</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="org-config.scapfile-sizelimit.jsp">
+ <source>SCAP File Upload Size Limit</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="org.id.jsp">
<source>Organization ID</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
index f398f8e..8ea22aa 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
@@ -111,6 +111,33 @@ function modifyUploadCheckbox(checkbox) {
id="crashfile_sizelimit" />
<td>
</tr>
+ <tr>
+ <th>
+ <label for="scapfile_upload_enabled">
+ <bean:message key="org-config.scapfile-upload.jsp"/>
+ </th>
+ <td>
+ <input type="checkbox"
+ name="scapfile_upload_enabled"
+ value="enabled"
+ id="scapfile_upload_enabled"
+ <c:if test = "${org.orgConfig.scapfileUploadEnabled}">
+ checked="checked"
+ </c:if>
+ />
+ </td>
+ </tr>
+ <tr>
+ <th>
+ <bean:message key="org-config.scapfile-sizelimit.jsp"/>
+ </th>
+ <td>
+ <input type="number"
+ name="scapfile_sizelimit"
+ value="${org.orgConfig.scapFileSizelimit}"
+ id="scapfile_sizelimit" />
+ <td>
+ </tr>
</table>
<div align="right">
commit 82b85cf31c2f01000c6454de3090fe283ae9a718
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue May 28 15:44:19 2013 +0200
Precede internal error messages by xccdf_eval: prefix.
Help user identify where the error comes from.
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index 4caa7cc..0f4cb32 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -133,7 +133,7 @@ def _upload_results(xccdf_result, results_dir, args):
def _upload_file(server, systemid, args, path, filename, f):
if not _assert_xml(f):
log.log_debug('Excluding "%s" file from upload. Not an XML.', path)
- return '\nFile "%s" not uploaded. Not an XML file format.', filename
+ return '\nxccdf_eval: File "%s" not uploaded. Not an XML file format.', filename
stat = os.fstat(f.fileno())
if stat.st_size < args['file_size']:
@@ -148,9 +148,9 @@ def _upload_file(server, systemid, args, path, filename, f):
return ''
except up2dateErrors.Error, e:
log.log_exception(*sys.exc_info())
- return '\nFile "%s" not uploaded. %s' % (filename, e)
+ return '\nxccdf_eval: File "%s" not uploaded. %s' % (filename, e)
else:
- return '\nFile "%s" not uploaded. File size (%d B) exceeds the limit.' \
+ return '\nxccdf_eval: File "%s" not uploaded. File size (%d B) exceeds the limit.' \
% (filename, stat.st_size)
def _cleanup_temp(results_dir):
commit 5f75d3095f907e8a55320b4fc25da4f464344257
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue May 28 15:34:01 2013 +0200
Refactor: Rename variable: newLimit -> newCrashLimit
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
index 9bfc444..ed700b3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
@@ -60,12 +60,12 @@ public class OrgConfigAction extends RhnAction {
getParameter("crashfile_upload_enabled") != null);
}
- Long newLimit = null;
+ Long newCrashLimit = null;
try {
- newLimit = Long.parseLong(
+ newCrashLimit = Long.parseLong(
request.getParameter("crashfile_sizelimit").trim());
- if (newLimit < 0) {
+ if (newCrashLimit < 0) {
throw new IllegalArgumentException();
}
}
@@ -78,7 +78,7 @@ public class OrgConfigAction extends RhnAction {
RequestContext.ORG_ID, org.getId().toString());
}
if (StringUtils.isNotEmpty(request.getParameter("crashfile_sizelimit"))) {
- org.getOrgConfig().setCrashFileSizelimit(newLimit);
+ org.getOrgConfig().setCrashFileSizelimit(newCrashLimit);
}
ActionMessages msg = new ActionMessages();
commit 76f6dcf8ef8b609deb43fc45009220676e0e77d0
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue May 28 14:51:40 2013 +0200
Do not use python key-word as a variable name
diff --git a/backend/server/action/scap.py b/backend/server/action/scap.py
index 81992ac..320aac5 100644
--- a/backend/server/action/scap.py
+++ b/backend/server/action/scap.py
@@ -27,15 +27,15 @@ def xccdf_eval(server_id, action_id, dry_run=0):
where action_id = :action_id"""
h = rhnSQL.prepare(statement)
h.execute(action_id=action_id)
- dict = h.fetchone_dict()
- if not dict:
+ d = h.fetchone_dict()
+ if not d:
raise InvalidAction("scap.xccdf_eval: Unknown action id "
"%s for server %s" % (action_id, server_id))
return ({
- 'path': dict['path'],
+ 'path': d['path'],
'id': action_id,
'file_size': _scap_file_limit(server_id),
- 'params': rhnSQL.read_lob(dict['parameters']) or ''
+ 'params': rhnSQL.read_lob(d['parameters']) or ''
},)
def _scap_file_limit(server_id):
commit 2aac39680bb9c614eb136d3ff3b63201041c6c0e
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue May 28 14:43:08 2013 +0200
Store SCAP-file-limit to the database
instead of hardcoding it in the backend code.
diff --git a/backend/server/action/scap.py b/backend/server/action/scap.py
index c28274b..81992ac 100644
--- a/backend/server/action/scap.py
+++ b/backend/server/action/scap.py
@@ -34,6 +34,20 @@ def xccdf_eval(server_id, action_id, dry_run=0):
return ({
'path': dict['path'],
'id': action_id,
- 'file_size': 2097152,
+ 'file_size': _scap_file_limit(server_id),
'params': rhnSQL.read_lob(dict['parameters']) or ''
},)
+
+def _scap_file_limit(server_id):
+ statement = """
+ select roc.scap_file_sizelimit as limit, roc.scapfile_upload_enabled as enabled
+ from rhnOrgConfiguration roc,
+ rhnServer rs
+ where rs.id = :server_id
+ and rs.org_id = roc.org_id"""
+ h = rhnSQL.prepare(statement)
+ h.execute(server_id=server_id)
+ d = h.fetchone_dict()
+ if not d or d['enabled'] != 'Y':
+ return 0
+ return d['limit']
diff --git a/schema/spacewalk/common/tables/rhnOrgConfiguration.sql b/schema/spacewalk/common/tables/rhnOrgConfiguration.sql
index fc59afb..c004ef0 100644
--- a/schema/spacewalk/common/tables/rhnOrgConfiguration.sql
+++ b/schema/spacewalk/common/tables/rhnOrgConfiguration.sql
@@ -35,6 +35,14 @@ create table rhnOrgConfiguration
default(2048) not null
constraint rhn_org_conf_sizelimit_chk
check (crash_file_sizelimit >= 0),
+ scapfile_upload_enabled char(1)
+ default ('N') not null
+ constraint rhn_org_conf_scap_upload_chk
+ check (scapfile_upload_enabled in ('Y', 'N')),
+ scap_file_sizelimit number
+ default(2097152) not null
+ constraint rhn_org_conf_scap_sizelimit_chk
+ check (scap_file_sizelimit >= 0),
created timestamp with local time zone
default (current_timestamp) not null,
modified timestamp with local time zone
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/018-rhnOrgConfiguration-scap.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/018-rhnOrgConfiguration-scap.sql
new file mode 100644
index 0000000..02d1ae7
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/018-rhnOrgConfiguration-scap.sql
@@ -0,0 +1,8 @@
+alter table rhnOrgConfiguration
+ add scapfile_upload_enabled
+ char(1) default ('N') not null
+ constraint rhn_org_conf_scap_upload_chk check (scapfile_upload_enabled in ('Y', 'N'));
+alter table rhnOrgConfiguration
+ add scap_file_sizelimit
+ number default(2097152) not null
+ constraint rhn_org_conf_scap_szlmt_chk check (scap_file_sizelimit >= 0);
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.85-1'
by Jan Dobes
Tag 'spacewalk-java-1.10.85-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-05-28 15:34 +0000
Tagging package [spacewalk-java] version [1.10.85-1] in directory [java/].
Changes since spacewalk-java-1.10.84-1:
Jan Dobes (2):
checkstyle fix
Automatic commit of package [spacewalk-java] release [1.10.85-1].
---
java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 11 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 8b7741f3b5c152c383436237c3b7659a34cc0192
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue May 28 17:34:44 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.85-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ab6c857..f0d9d12 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.84
+Version: 1.10.85
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 28 2013 Jan Dobes 1.10.85-1
+- checkstyle fix
+
* Tue May 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.84-1
- 855845 - escaping system name for
/rhn/systems/details/virtualization/VirtualGuestsList.do
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e1d62cd..2b6976c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.84-1 java/
+1.10.85-1 java/
commit e297c2e1b671e9378be0d827e51a2d1ada075e2f
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue May 28 17:31:47 2013 +0200
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java
index fd0652e..3527908 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java
@@ -90,7 +90,8 @@ public class KickstartCleanupTest extends RhnBaseTestCase {
KickstartSession ksession, int days) throws Exception {
Connection cn = session.connection();
StringBuffer sql = new StringBuffer();
- sql.append("update rhnkickstartsession set last_action = current_timestamp - interval '");
+ sql.append("update rhnkickstartsession set last_action" +
+ " = current_timestamp - interval '");
sql.append(String.valueOf(days));
sql.append("' day");
sql.append(" where id = ").append(ksession.getId());
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.84-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.84-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-05-28 14:49 +0000
Tagging package [spacewalk-java] version [1.10.84-1] in directory [java/].
Changes since spacewalk-java-1.10.83-1:
Jan Dobes (1):
junit tests postgresql fixes
Tomas Lestach (7):
855845 - escaping system name for /rhn/systems/details/audit/ScheduleXccdf.do
simplify the column message
855845 - escaping system name for /rhn/users/SystemsAdmined.do
userlist.jsp isn't used for /users/SystemsAdmined.do page
855845 - escaping system name for /rhn/systems/entitlements/GuestLimitedHosts.do
855845 - escaping system name for /rhn/systems/details/virtualization/VirtualGuestsList.do
Automatic commit of package [spacewalk-java] release [1.10.84-1].
---
java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java | 70 ++++++----
java/code/src/com/redhat/rhn/common/translation/test/ExceptionsWrapperTest.java | 47 +++++-
java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java | 4
java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java | 3
java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 12 -
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 6
java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp | 4
java/code/webapp/WEB-INF/struts-config.xml | 1
java/spacewalk-java.spec | 13 +
rel-eng/packages/spacewalk-java | 2
11 files changed, 116 insertions(+), 50 deletions(-)
---
10 years, 11 months
7 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java | 4 ++-
java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp | 4 ++-
java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 12 ++-------
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 6 ++--
java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp | 4 ++-
java/code/webapp/WEB-INF/struts-config.xml | 1
java/spacewalk-java.spec | 13 +++++++++-
rel-eng/packages/spacewalk-java | 2 -
8 files changed, 28 insertions(+), 18 deletions(-)
New commits:
commit 1be7e90056cbc3335c430a15aef7b9bd75a65f86
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 16:49:19 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.84-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8b4198e..ab6c857 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.83
+Version: 1.10.84
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,17 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.84-1
+- 855845 - escaping system name for
+ /rhn/systems/details/virtualization/VirtualGuestsList.do
+- 855845 - escaping system name for
+ /rhn/systems/entitlements/GuestLimitedHosts.do
+- userlist.jsp isn't used for /users/SystemsAdmined.do page
+- 855845 - escaping system name for /rhn/users/SystemsAdmined.do
+- simplify the column message
+- 855845 - escaping system name for /rhn/systems/details/audit/ScheduleXccdf.do
+- junit tests postgresql fixes
+
* Tue May 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.83-1
- 967526 - on RHEL5 the (P)SQLException is wrapped into a RuntimeException
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d758c65..e1d62cd 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.83-1 java/
+1.10.84-1 java/
commit 850f27371830b89b61edf84c69d9a039c03e5987
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 16:33:08 2013 +0200
855845 - escaping system name for /rhn/systems/details/virtualization/VirtualGuestsList.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
index 6575e1d..7caa7eb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
@@ -40,7 +40,7 @@
</rhn:require>
<rhn:column header="virtualguestslist.jsp.guestname">
- ${current.name}
+ <c:out value="${current.name}" escapeXml="true" />
</rhn:column>
<rhn:column header="systemlist.jsp.system">
@@ -50,11 +50,11 @@
</c:when>
<c:when test="${current.accessible}">
<a href="/rhn/systems/details/Overview.do?sid=${current.virtualSystemId}">
- ${current.serverName}
+ <c:out value="${current.serverName}" escapeXml="true" />
</a>
</c:when>
<c:otherwise>
-${current.serverName}
+ <c:out value="${current.serverName}" escapeXml="true" />
</c:otherwise>
</c:choose>
</rhn:column>
commit e41cf94f65841c5b521784e133d928a192891a58
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 16:18:39 2013 +0200
855845 - escaping system name for /rhn/systems/entitlements/GuestLimitedHosts.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
index 3c22ec2..6885cdc 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
@@ -38,7 +38,9 @@
emptykey="guestlimited.jsp.nosystems"
width="100%">
<rl:column bound="false" sortable="false" headerkey="guestlimited.jsp.hostsystem">
- <a href="/rhn/systems/details/Overview.do?sid=${current.hostId}">${current.hostName}</a>
+ <a href="/rhn/systems/details/Overview.do?sid=${current.hostId}">
+ <c:out value="${current.hostName}" escapeXml="true" />
+ </a>
</rl:column>
<rl:column bound="false" sortable="false" headerkey="guestlimited.jsp.guest">
<a href="/rhn/systems/details/Overview.do?sid=${current.hostId}">${current.numberOfGuests}</a>
commit c86e738b88428ffce8d7eb6e012c8c33847a53c2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 16:16:00 2013 +0200
userlist.jsp isn't used for /users/SystemsAdmined.do page
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index edaad8a..61a305c 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1719,7 +1719,6 @@
<action path="/users/SystemsAdmined"
scope="request"
- input="/WEB-INF/pages/admin/users/userlist.jsp"
type="com.redhat.rhn.frontend.action.user.VisibleSystemsListSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
commit b5820e6666086e489059f1a5e4d43a31c982291e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 16:14:53 2013 +0200
855845 - escaping system name for /rhn/users/SystemsAdmined.do
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp b/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp
index 1d5d044..4623089 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp
@@ -27,7 +27,9 @@
<rhn:listdisplay set="${requestScope.set}" hiddenvars="${requestScope.newset}">
<rhn:set value="${current.id}" disabled="${not current.selectable}"/>
<rhn:column header="systemsadmined.jsp.name">
- <a href="/rhn/systems/details/Overview.do?sid=${current.id}">${current.serverName}</a>
+ <a href="/rhn/systems/details/Overview.do?sid=${current.id}">
+ <c:out value="${current.serverName}" escapeXml="true" />
+ </a>
</rhn:column>
<rhn:column header="systemsadmined.jsp.access">
<c:forEach items="${current.groupName}" var="group">
commit c738808a61656e09c1ebe0b1e411656897803417
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 16:10:27 2013 +0200
simplify the column message
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
index a794c54..c79f7a3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
@@ -42,15 +42,9 @@
<%@ include file="/WEB-INF/pages/common/fragments/user/userlist_columns.jspf" %>
- <rl:column sortable="false"
- headerkey="userlist.jsp.status">
- <c:if test="${current.status == 'enabled'}">
- <bean:message key="userlist.jsp.${current.status}"/>
- </c:if>
- <c:if test="${current.status == 'disabled'}">
- <bean:message key="userlist.jsp.${current.status}"/>
- </c:if>
- </rl:column>
+ <rl:column sortable="false" headerkey="userlist.jsp.status">
+ <bean:message key="userlist.jsp.${current.status}"/>
+ </rl:column>
</rl:list>
<rl:csv dataset="pageList"
commit e4687f14e3029ea895c5605042761b9d1f1b1af7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 16:05:03 2013 +0200
855845 - escaping system name for /rhn/systems/details/audit/ScheduleXccdf.do
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java
index 16fd90d..c2992f3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java
@@ -29,6 +29,7 @@ import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.DynaActionForm;
import com.redhat.rhn.common.util.DatePicker;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.scap.ScapAction;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
@@ -97,7 +98,8 @@ public class ScheduleXccdfAction extends ScapSetupAction {
ActionMessages msgs = new ActionMessages();
msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("message.xccdfeval",
- action.getId().toString(), server.getId().toString(), server.getName()));
+ action.getId().toString(), server.getId().toString(),
+ StringUtil.htmlifyText(server.getName())));
return msgs;
}
10 years, 11 months
java/code
by Jan Dobes
java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java | 70 ++++++----
java/code/src/com/redhat/rhn/common/translation/test/ExceptionsWrapperTest.java | 47 +++++-
java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java | 3
3 files changed, 88 insertions(+), 32 deletions(-)
New commits:
commit 528259d7bcd4d7a90dfa2fbbd3dd55b6d097d588
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu May 23 10:07:00 2013 +0200
junit tests postgresql fixes
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java b/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
index 6b7ab85..9f761bf 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.common.hibernate.test;
+import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
@@ -140,7 +141,7 @@ public class TestFactoryWrapperTest extends RhnBaseTestCase {
public void testLotsOfTransactions() throws Exception {
for (int i = 0; i < 20; i++) {
- SelectMode m = ModeFactory.getMode("test_queries", "date_dto_test");
+ SelectMode m = ModeFactory.getMode("test_queries", "get_debug_log");
m.execute(new HashMap());
HibernateFactory.commitTransaction();
HibernateFactory.closeSession();
@@ -178,29 +179,54 @@ public class TestFactoryWrapperTest extends RhnBaseTestCase {
catch (SQLException e) {
// let's clean up anything that MAY have been left
// over
- forceQuery(c, "drop sequence persist_sequence");
forceQuery(c, "drop table persist_test");
+ forceQuery(c, "drop sequence persist_sequence");
+
// Couldn't select 1, so the table didn't exist, create it
- stmt.execute("create sequence persist_sequence");
- stmt.execute("create table persist_test " +
- "( " +
- " foobar VarChar2(32)," +
- " test_column VarChar2(5)," +
- " pin number, " +
- " hidden VarChar(32), " +
- " id number" +
- " constraint persist_test_pk primary key," +
- " created date" +
- ")");
-
- stmt.execute("insert into persist_test (foobar, id) " +
- "values ('Blarg', persist_sequence.nextval)");
- stmt.execute("insert into persist_test (foobar, id) " +
- "values ('duplicate', persist_sequence.nextval)");
- stmt.execute("insert into persist_test (foobar, id) " +
- "values ('duplicate', persist_sequence.nextval)");
- stmt.execute("insert into persist_test (foobar, hidden, id) " +
- "values ('duplicate', 'xxxxx', persist_sequence.nextval)");
+ if (ConfigDefaults.get().isOracle()) {
+ stmt.execute("create sequence persist_sequence");
+ stmt.execute("create table persist_test " +
+ "( " +
+ " foobar VarChar2(32)," +
+ " test_column VarChar2(5)," +
+ " pin number, " +
+ " hidden VarChar(32), " +
+ " id number" +
+ " constraint persist_test_pk primary key," +
+ " created timestamp with local time zone" +
+ ")");
+ stmt.execute("insert into persist_test (foobar, id) " +
+ "values ('Blarg', persist_sequence.nextval");
+ stmt.execute("insert into persist_test (foobar, id) " +
+ "values ('duplicate', persist_sequence.nextval)");
+ stmt.execute("insert into persist_test (foobar, id) " +
+ "values ('duplicate', persist_sequence.nextval)");
+ stmt.execute("insert into persist_test (foobar, hidden, id) " +
+ "values ('duplicate', 'xxxxx', persist_sequence.nextval)");
+
+ }
+ else {
+ c.rollback();
+ stmt.execute("create sequence persist_sequence");
+ stmt.execute("create table persist_test " +
+ "( " +
+ " foobar VarChar(32)," +
+ " test_column VarChar(5)," +
+ " pin numeric, " +
+ " hidden VarChar(32), " +
+ " id numeric" +
+ " constraint persist_test_pk primary key," +
+ " created timestamp with time zone" +
+ ")");
+ stmt.execute("insert into persist_test (foobar, id) " +
+ "values ('Blarg', nextval('persist_sequence'))");
+ stmt.execute("insert into persist_test (foobar, id) " +
+ "values ('duplicate', nextval('persist_sequence'))");
+ stmt.execute("insert into persist_test (foobar, id) " +
+ "values ('duplicate', nextval('persist_sequence'))");
+ stmt.execute("insert into persist_test (foobar, hidden, id) " +
+ "values ('duplicate', 'xxxxx', nextval('persist_sequence'))");
+ }
c.commit();
}
diff --git a/java/code/src/com/redhat/rhn/common/translation/test/ExceptionsWrapperTest.java b/java/code/src/com/redhat/rhn/common/translation/test/ExceptionsWrapperTest.java
index 5f84121..3975734 100644
--- a/java/code/src/com/redhat/rhn/common/translation/test/ExceptionsWrapperTest.java
+++ b/java/code/src/com/redhat/rhn/common/translation/test/ExceptionsWrapperTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.common.translation.test;
+import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.ConstraintViolationException;
import com.redhat.rhn.common.db.WrappedSQLException;
import com.redhat.rhn.common.hibernate.HibernateFactory;
@@ -46,9 +47,6 @@ public class ExceptionsWrapperTest extends TestCase {
super(name);
}
- /**
- * These tests assume that the DB is oracle
- */
public void testConstraintViolation() throws Exception {
Session session = null;
Statement stmt = null;
@@ -60,6 +58,9 @@ public class ExceptionsWrapperTest extends TestCase {
"values ('tooBigAString', 1)");
}
catch (SQLException e) {
+ if (!ConfigDefaults.get().isOracle()) {
+ session.connection().rollback();
+ }
try {
throw SqlExceptionTranslator.sqlException(e);
}
@@ -68,6 +69,10 @@ public class ExceptionsWrapperTest extends TestCase {
assertEquals(c.getConstraintType(),
ExceptionConstants.VALUE_TOO_LARGE);
}
+ // PostgreSQL
+ catch (WrappedSQLException c) {
+ assertTrue(c.getMessage().toLowerCase().contains("value too long"));
+ }
}
finally {
HibernateHelper.cleanupDB(stmt);
@@ -87,6 +92,9 @@ public class ExceptionsWrapperTest extends TestCase {
"values ('ano', 1)");
}
catch (SQLException e) {
+ if (!ConfigDefaults.get().isOracle()) {
+ session.connection().rollback();
+ }
try {
throw SqlExceptionTranslator.sqlException(e);
}
@@ -95,6 +103,10 @@ public class ExceptionsWrapperTest extends TestCase {
assertEquals(c.getConstraintType(),
ExceptionConstants.VALUE_TOO_LARGE);
}
+ // PostgreSQL
+ catch (WrappedSQLException c) {
+ assertTrue(c.getMessage().toLowerCase().contains("duplicate key"));
+ }
}
finally {
HibernateHelper.cleanupDB(stmt);
@@ -114,6 +126,9 @@ public class ExceptionsWrapperTest extends TestCase {
"values ('ano', 1)");
}
catch (SQLException e) {
+ if (!ConfigDefaults.get().isOracle()) {
+ session.connection().rollback();
+ }
try {
throw SqlExceptionTranslator.sqlException(e);
}
@@ -141,6 +156,9 @@ public class ExceptionsWrapperTest extends TestCase {
"values ('ano', 1)");
}
catch (SQLException e) {
+ if (!ConfigDefaults.get().isOracle()) {
+ session.connection().rollback();
+ }
try {
throw SqlExceptionTranslator.sqlException(e);
}
@@ -185,12 +203,23 @@ public class ExceptionsWrapperTest extends TestCase {
}
catch (SQLException e) {
// Couldn't select 1, so the table didn't exist, create it
- stmt.execute("create table exceptions_test " +
- "( " +
- " small_column VarChar2(5)," +
- " id number" +
- " constraint exceptions_test_pk primary key" +
- ")");
+ if (ConfigDefaults.get().isOracle()) {
+ stmt.execute("create table exceptions_test " +
+ "( " +
+ " small_column VarChar2(5)," +
+ " id number" +
+ " constraint exceptions_test_pk primary key" +
+ ")");
+ }
+ else {
+ session.connection().rollback();
+ stmt.execute("create table exceptions_test " +
+ "( " +
+ " small_column VarChar(5)," +
+ " id numeric" +
+ " constraint exceptions_test_pk primary key" +
+ ")");
+ }
session.connection().commit();
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java
index b6007b6..fd0652e 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/test/KickstartCleanupTest.java
@@ -90,8 +90,9 @@ public class KickstartCleanupTest extends RhnBaseTestCase {
KickstartSession ksession, int days) throws Exception {
Connection cn = session.connection();
StringBuffer sql = new StringBuffer();
- sql.append("update rhnkickstartsession set last_action = sysdate - ");
+ sql.append("update rhnkickstartsession set last_action = current_timestamp - interval '");
sql.append(String.valueOf(days));
+ sql.append("' day");
sql.append(" where id = ").append(ksession.getId());
Statement stmt = null;
try {
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.83-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.83-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-05-28 12:37 +0000
Tagging package [spacewalk-java] version [1.10.83-1] in directory [java/].
Changes since spacewalk-java-1.10.82-1:
Tomas Lestach (2):
967526 - on RHEL5 the (P)SQLException is wrapped into a RuntimeException
Automatic commit of package [spacewalk-java] release [1.10.83-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 6 ++++++
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
---
10 years, 11 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 6 ++++++
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 58a867a92113525c8a1d40c2fbdb077341a379f0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 14:37:42 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.83-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 1d6bc78..8b4198e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.82
+Version: 1.10.83
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.83-1
+- 967526 - on RHEL5 the (P)SQLException is wrapped into a RuntimeException
+
* Tue May 28 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.82-1
- 960885 - add list elaborator into session for CSV export
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f050ea8..d758c65 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.82-1 java/
+1.10.83-1 java/
commit 32531e3cfd506253469f309a9644fc3aeb6bc1d0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 28 14:31:43 2013 +0200
967526 - on RHEL5 the (P)SQLException is wrapped into a RuntimeException
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index 676603d..c174f0e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -538,6 +538,12 @@ public class CachedStatement implements Serializable {
"HibernateException executing CachedStatement", he);
}
+ catch (RuntimeException e) {
+ if (e.getCause() instanceof SQLException) {
+ throw SqlExceptionTranslator.sqlException((SQLException) e.getCause());
+ }
+ throw e;
+ }
finally {
HibernateHelper.cleanupDB(cs);
}
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.82-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.10.82-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-05-28 11:05 +0000
Tagging package [spacewalk-java] version [1.10.82-1] in directory [java/].
Changes since spacewalk-backend-1.10.38-1:
Tomas Kasparek (2):
960885 - add list elaborator into session for CSV export
Automatic commit of package [spacewalk-java] release [1.10.82-1].
---
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 6 ++++++
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
---
10 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4875a34bc9adac8c38a05d9866a5a732b37148ce
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue May 28 13:05:40 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.82-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9ae8621..1d6bc78 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.81
+Version: 1.10.82
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 28 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.82-1
+- 960885 - add list elaborator into session for CSV export
+
* Fri May 24 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.81-1
- 855845 - escaping system name for /rhn/systems/entitlements/FlexGuests.do
- 855845 - escaping system name for /rhn/systems/entitlements/PhysicalHosts.do
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 740124e..f050ea8 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.81-1 java/
+1.10.82-1 java/
10 years, 11 months