2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java | 1
java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java | 13 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 27 ---
java/code/src/com/redhat/rhn/manager/errata/AsyncErrataCloneCounter.java | 74 ++++++++++
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 12 +
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
7 files changed, 110 insertions(+), 24 deletions(-)
New commits:
commit 2de3ceb59ad5116cf6bab7c09724cb3552406c36
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 26 14:46:23 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.98-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index dd8204c..2b65ffe 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.97
+Version: 1.8.98
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -615,6 +615,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 26 2012 Stephen Herr <sherr(a)redhat.com> 1.8.98-1
+- 829485 - resolveing potential deadlock during asynchronous errata clone
+
* Tue Jun 26 2012 Jan Pazdziora 1.8.97-1
- Each dataset must have a different name.
- Add CSV downloader for scap search page.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a6ddb83..5b9f9ed 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.97-1 java/
+1.8.98-1 java/
commit 7713d370ccb509980056ecd18a5846960f964458
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 26 14:46:08 2012 -0400
829485 - resolveing potential deadlock during asynchronous errata clone
diff --git a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java
index 74a64a5..d2db2ea 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java
@@ -43,5 +43,6 @@ extends AbstractDatabaseAction {
errata.add(ErrataFactory.lookupById(eid));
ErrataManager.cloneErrataApi(msg.getChan(), errata,
msg.getUser(), msg.isInheritPackages());
+ msg.deregister();
}
}
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 458d126..7b8f173 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataEvent.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
+import com.redhat.rhn.manager.errata.AsyncErrataCloneCounter;
import org.hibernate.Transaction;
@@ -128,5 +129,17 @@ public class NewCloneErrataEvent implements EventDatabaseMessage {
return UserFactory.lookupById(userId);
}
+ /**
+ * Register the async clone event with the counter
+ */
+ public void register() {
+ AsyncErrataCloneCounter.getInstance().addAsyncErrataCloneJob(chanId);
+ }
+ /**
+ * De-regiser the async clone event from the counter
+ */
+ public void deregister() {
+ AsyncErrataCloneCounter.getInstance().removeAsyncErrataCloneJob(chanId);
+ }
}
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 d557ee7..49aca00 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
@@ -865,11 +865,6 @@ public class ErrataHandler extends BaseHandler {
*
* @xmlrpc.doc Clone a list of errata into the specified channel.
*
- * Warning: Issuing a synchronous clone request for a channel that has asynchronous
- * errata cloning jobs pending can result in a database deadlock! Adding more
- * asynchronous jobs is safe. If deadlock occurs one must re-schedule both the
- * synchronous and asynchronous jobs to ensure all errata are cloned.
- *
* @xmlrpc.param #session_key()
* @xmlrpc.param #param("string", "channel_label")
* @xmlrpc.param
@@ -896,11 +891,6 @@ public class ErrataHandler extends BaseHandler {
*
* @xmlrpc.doc Asynchronously clone a list of errata into the specified channel.
*
- * Warning: Issuing a synchronous clone request for a channel that has asynchronous
- * errata cloning jobs pending can result in a database deadlock! Adding more
- * asynchronous jobs is safe. If deadlock occurs one must re-schedule both the
- * synchronous and asynchronous jobs to ensure all errata are cloned.
- *
* @xmlrpc.param #session_key()
* @xmlrpc.param #param("string", "channel_label")
* @xmlrpc.param
@@ -968,6 +958,13 @@ public class ErrataHandler extends BaseHandler {
inheritPackages);
return new ArrayList<Errata>().toArray();
}
+ else if (ErrataManager.channelHasPendingAsyncCloneJobs(channel)) {
+ throw new InvalidChannelException(
+ "Channel " +
+ channel.getLabel() +
+ " has pending asynchronous errata clone jobs. You must wait" +
+ "until asychronous errata clone jobs are done.");
+ }
return ErrataManager.cloneErrataApi(channel, errataToClone,
loggedInUser, inheritPackages);
}
@@ -987,11 +984,6 @@ public class ErrataHandler extends BaseHandler {
* @xmlrpc.doc Clones a list of errata into a specified cloned channel
* according the original erratas.
*
- * Warning: Issuing a synchronous cloneAsOriginal request for a channel that has
- * asynchronous errata cloning jobs pending can result in a database deadlock! Adding
- * more asynchronous jobs is safe. If deadlock occurs one must re-schedule both the
- * synchronous and asynchronous jobs to ensure all errata are cloned.
- *
* @xmlrpc.param #session_key()
* @xmlrpc.param #param("string", "channel_label")
* @xmlrpc.param
@@ -1020,11 +1012,6 @@ public class ErrataHandler extends BaseHandler {
* @xmlrpc.doc Asynchronously clones a list of errata into a specified cloned channel
* according the original erratas
*
- * Warning: Issuing a synchronous cloneAsOriginal request for a channel that has
- * asynchronous errata cloning jobs pending can result in a database deadlock! Adding
- * more asynchronous jobs is safe. If deadlock occurs one must re-schedule both the
- * synchronous and asynchronous jobs to ensure all errata are cloned.
- *
* @xmlrpc.param #session_key()
* @xmlrpc.param #param("string", "channel_label")
* @xmlrpc.param
diff --git a/java/code/src/com/redhat/rhn/manager/errata/AsyncErrataCloneCounter.java b/java/code/src/com/redhat/rhn/manager/errata/AsyncErrataCloneCounter.java
new file mode 100644
index 0000000..ed3d528
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/manager/errata/AsyncErrataCloneCounter.java
@@ -0,0 +1,74 @@
+package com.redhat.rhn.manager.errata;
+
+import java.util.Hashtable;
+
+/**
+ * If someone attempts to schedule a synchronous errata clone into a
+ * channel that has asynchronous errata clones taking place in the
+ * background, a database deadlock will occur. There is no way to
+ * avoid the deadlock, so instead we'll keep track of how many
+ * pending jobs we have here. The jobs themselves are not persistent,
+ * residing in tomcat memory only, so the counter should not be
+ * persistent. That is why I implemented the counter as a singeton
+ * class instead of a database table or some other such implementation.
+ *
+ * @author Stephen Herr <sherr(a)redhat.com>
+ *
+ */
+public class AsyncErrataCloneCounter {
+ // hashtable is syncronized, so is threadsafe
+ private final Hashtable<Long, Integer> count;
+ private static AsyncErrataCloneCounter instance = new AsyncErrataCloneCounter();
+
+ private AsyncErrataCloneCounter() {
+ count = new Hashtable<Long, Integer>();
+ }
+
+ /**
+ * Get the one and only instance of AsyncErrataCloneCounter
+ * @return the singleton instance
+ */
+ public static AsyncErrataCloneCounter getInstance() {
+ return instance;
+ }
+
+ /**
+ * Check if a channel has pending asyncrhonous errata clone jobs
+ * @param cid channel id
+ * @return True if there are pending jobs for a channel, false otherwise
+ */
+ public boolean channelHasPendingJobs(Long cid) {
+ Integer n = count.get(cid);
+ if (n == null || n == 0) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Call this with the channel id when scheduling a new asyncronous
+ * errata clone job
+ * @param cid channel id
+ */
+ public void addAsyncErrataCloneJob(Long cid) {
+ Integer n = count.get(cid);
+ if (n != null) {
+ count.put(cid, n + 1);
+ }
+ else {
+ count.put(cid, 1);
+ }
+ }
+
+ /**
+ * Call this with channel id when completeing an asynchronous
+ * errata clone job
+ * @param cid channel id
+ */
+ public void removeAsyncErrataCloneJob(Long cid) {
+ Integer n = count.get(cid);
+ if (n != null && n > 0) {
+ count.put(cid, n - 1);
+ }
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
index 3e3f5c8..4ee5a65 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
@@ -1274,12 +1274,20 @@ public class ErrataManager extends BaseManager {
for (long eid : errata) {
NewCloneErrataEvent neve = new NewCloneErrataEvent(chan, eid, user,
inheritPackages);
+ neve.register();
MessageQueue.publish(neve);
}
}
-
-
+ /**
+ * Check if the channel has pending asynchronous errata clone jobs
+ * @param channel channel to check
+ * @return true if there are pending jobs, false otherwise
+ */
+ public static boolean channelHasPendingAsyncCloneJobs(Channel channel) {
+ return AsyncErrataCloneCounter.getInstance().channelHasPendingJobs(
+ channel.getId());
+ }
/**
* Send errata notifications for a particular errata and channel
11 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.8.97-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.97-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-06-26 15:14 +0000
Tagging package [spacewalk-java] version [1.8.97-1] in directory [java/].
Changes since spacewalk-backend-1.8.41-1:
Jan Pazdziora (2):
Exit if starting tomcat did not pass.
Automatic commit of package [spacewalk-java] release [1.8.97-1].
---
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
spacewalk/setup/bin/spacewalk-setup | 6 +++---
3 files changed, 12 insertions(+), 5 deletions(-)
---
11 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 4053975f6741b2876e32e321e4592a5f57693221
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jun 26 17:14:52 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.97-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3e7d022..dd8204c 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.96
+Version: 1.8.97
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -615,6 +615,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 26 2012 Jan Pazdziora 1.8.97-1
+- Each dataset must have a different name.
+- Add CSV downloader for scap search page.
+- Add CSV downloader to all-scans page
+- Add CSV downloader for scan's details page
+- Add CSV downloader for system's scans page
+
* Tue Jun 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.96-1
- Correcting two ISE on postgresql: NVRE not found
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8dc6ab5..a6ddb83 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.96-1 java/
+1.8.97-1 java/
11 years, 10 months
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/bin/spacewalk-setup | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8655acd5c471c446f4ea25354ee8989aba640bde
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jun 26 16:57:36 2012 +0200
Exit if starting tomcat did not pass.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index c08f777..f4d0ba4 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -136,7 +136,7 @@ print Spacewalk::Setup::loc("* Restarting services.\n");
Spacewalk::Setup::system_or_exit(['/usr/sbin/spacewalk-service', 'restart'], 40,
'Could not restart spacewalk services.');
-wait_for_tomcat($answers{hostname});
+wait_for_tomcat($answers{hostname}) or exit 56;
Spacewalk::Setup::upgrade_stop_services(\%opts);
Spacewalk::Setup::oracle_upgrade_start_db(\%opts);
@@ -1394,11 +1394,11 @@ sub wait_for_tomcat {
sleep 5;
}
else {
- return;
+ return 1;
}
}
print "Tomcat failed to start properly or the installer ran out of tries. Please check /var/log/tomcat*/catalina.out for errors.\n";
- return;
+ return 0;
}
package Sat::Cert;
11 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.8.41-1'
by Michael Mraka
Tag 'spacewalk-backend-1.8.41-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-26 11:52 +0000
Tagging package [spacewalk-backend] version [1.8.41-1] in directory [backend/].
Changes since rhnpush-5.5.47-1:
Michael Mraka (2):
833686 - don't open file if path is None
Automatic commit of package [spacewalk-backend] release [1.8.41-1].
Simon Lukasik (5):
Add CSV downloader for system's scans page
Add CSV downloader for scan's details page
Add CSV downloader to all-scans page
Add CSV downloader for scap search page.
Each dataset must have a different name.
---
backend/server/handlers/app/packages.py | 10 -
backend/spacewalk-backend.spec | 5
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 2
java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java | 11 +
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java | 2
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java | 8 +
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 60 ++++++++++
java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 2
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf | 2
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 2
rel-eng/packages/spacewalk-backend | 2
12 files changed, 101 insertions(+), 11 deletions(-)
---
11 years, 10 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/server/handlers/app/packages.py | 10 +++++-----
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 30161d150daf33faf40ea28356993f1cb0176031
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 26 13:52:36 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.41-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0e99669..8aec5c0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.40
+Version: 1.8.41
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.41-1
+- 833686 - don't open file if path is None
+
* Tue Jun 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.40-1
- removed dead code backend.listChannel()
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 97d91c2..780e499 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.40-1 backend/
+1.8.41-1 backend/
commit be337700d59bd4fc4165d552f7bb43c6a0a9cf3b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 26 13:47:52 2012 +0200
833686 - don't open file if path is None
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index aa2ca68..7ed5a7e 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -310,7 +310,7 @@ class Packages(RPC_Base):
package['checksum'] = package['md5sum']
exec_args = {
- 'pkg_name': package['name'],
+ 'name': package['name'],
'pkg_epoch': package['epoch'],
'pkg_version': package['version'],
'pkg_rel': package['release'],
@@ -425,7 +425,7 @@ class Packages(RPC_Base):
rhnPackageArch pa,
rhnChecksumView c
where
- pn.name = :pkg_name
+ pn.name = :name
and ( pe.epoch = :pkg_epoch or
( pe.epoch is null and :pkg_epoch is null )
)
@@ -459,7 +459,7 @@ class Packages(RPC_Base):
pkg_epoch = str(pkg_epoch)
query_args = {
- 'pkg_name': pkg_info['name'],
+ 'name': pkg_info['name'],
'pkg_epoch': pkg_epoch,
'pkg_version': str(pkg_info['version']),
'pkg_rel': str(pkg_info['release']),
@@ -486,7 +486,7 @@ class Packages(RPC_Base):
row = h.fetchone_dict()
if not row:
ret = ''
- elif row.has_key('path'):
+ elif row.get('path'):
filePath = os.path.join(CFG.MOUNT_POINT, row['path'])
if os.access(filePath, os.R_OK):
if row.has_key('checksum'):
@@ -498,7 +498,7 @@ class Packages(RPC_Base):
log_error("Package not found", filePath)
ret = ''
else:
- log_error("Package path null for package", filePath)
+ log_error("Package path null for package", query_args['name'])
ret = ''
return ret
11 years, 10 months
5 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 2
java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java | 11 +
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java | 2
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java | 8 +
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 60 ++++++++++
java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 2
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf | 2
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 2
9 files changed, 91 insertions(+), 4 deletions(-)
New commits:
commit 67d77aa305799c670d8fdef241de2ca3a7a38b53
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Jun 26 11:39:05 2012 +0200
Each dataset must have a different name.
Otherwise the elaborator (once bind to that name) remains
in the session. Even after another dataset has been assigned to.
Causing the consequent CSV export to fail.
Addressing:
com.redhat.rhn.common.db.datasource.MapColumnNotFoundException: Column, xid, not found in driving query results
at com.redhat.rhn.common.db.datasource.CachedStatement.executeElaboratorBatch(CachedStatement.java:378)
at com.redhat.rhn.common.db.datasource.CachedStatement.executeElaborator(CachedStatement.java:352)
at com.redhat.rhn.common.db.datasource.SelectMode.elaborate(SelectMode.java:169)
at com.redhat.rhn.common.db.datasource.ModeElaborator.elaborate(ModeElaborator.java:48)
at com.redhat.rhn.frontend.action.CSVDownloadAction.getStreamInfo(CSVDownloadAction.java:188)
at org.apache.struts.actions.DownloadAction.execute(DownloadAction.java:104)
at com.redhat.rhn.frontend.action.CSVDownloadAction.execute(CSVDownloadAction.java:61)
at org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:425)
at org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:228)
at com.redhat.rhn.frontend.struts.RhnRequestProcessor.process(RhnRequestProcessor.java:99)
at org.apache.struts.action.ActionServlet.process(ActionServlet.java:1913)
at org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:449)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
(...)
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
index 9c09ce7..0b87f05 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
@@ -146,7 +146,7 @@ public class XccdfSearchAction extends RhnAction {
request.setAttribute(RequestContext.PAGE_LIST,
results != null ? results : Collections.EMPTY_LIST);
if (isTestestResultRequested(form) && results != null) {
- TagHelper.bindElaboratorTo("searchResults", results.getElaborator(),
+ TagHelper.bindElaboratorTo("searchResultsTr", results.getElaborator(),
request);
}
}
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index baa30ac..43de22c 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -119,10 +119,10 @@
<rhn:csrf/>
<c:choose>
<c:when test="${param.show_as == 'tr'}">
- <rl:list emptykey="generic.jsp.none" name="searchResults" dataset="pageList">
+ <rl:list emptykey="generic.jsp.none" name="searchResultsTr" dataset="pageList">
<%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
</rl:list>
- <rl:csv dataset="pageList" name="searchResults"
+ <rl:csv dataset="pageList" name="searchResultsTr"
exportColumns="id,sid,serverName,profile,satisfied,dissatisfied,satisfactionUnknown"/>
</c:when>
commit a3222f6189a91240fa55ac4b2add1ab2ed0fc979
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 22 13:31:58 2012 +0200
Add CSV downloader for scap search page.
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index 8aa62f6..baa30ac 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -122,6 +122,8 @@
<rl:list emptykey="generic.jsp.none" name="searchResults" dataset="pageList">
<%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
</rl:list>
+ <rl:csv dataset="pageList" name="searchResults"
+ exportColumns="id,sid,serverName,profile,satisfied,dissatisfied,satisfactionUnknown"/>
</c:when>
<c:otherwise>
@@ -129,6 +131,8 @@
<rl:decorator name="PageSizeDecorator"/>
<%@ include file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %>
</rl:list>
+ <rl:csv dataset="pageList" name="searchResults"
+ exportColumns="id,documentIdref,identsString,evaluationResult"/>
</c:otherwise>
</c:choose>
commit 3fa1381b08adcf340c4d793630515a3bb0699673
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 22 11:32:17 2012 +0200
Add CSV downloader to all-scans page
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
index 9cdcd1a..2624792 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
@@ -21,7 +21,7 @@ import java.util.List;
* Simple DTO for transfering data from the DB to the UI through datasource.
* @version $Rev$
*/
-public abstract class XccdfTestResultCounts {
+public abstract class XccdfTestResultCounts extends BaseDto {
private static final String PASS_LABEL = "pass";
private static final String FAIL_LABEL = "fail";
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java
index 1397c1b..ec1a710 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java
@@ -46,6 +46,14 @@ public class XccdfTestResultDto extends XccdfTestResultCounts {
}
/**
+ * Returs id of xccdf:TestResult
+ * @return the xid
+ */
+ public Long getId() {
+ return getXid();
+ }
+
+ /**
* Returns id of targeted system
* @return the sid
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 238aa7d..4cb60c5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7772,6 +7772,19 @@ Follow this url to see the full list of inactive systems:
<source>Result of Evaluation</source>
</trans-unit>
+ <trans-unit id="profile">
+ <source>Idref of Profile</source>
+ </trans-unit>
+ <trans-unit id="satisfied">
+ <source>Satisfied</source>
+ </trans-unit>
+ <trans-unit id="dissatisfied">
+ <source>Dissatisfied</source>
+ </trans-unit>
+ <trans-unit id="satisfactionUnknown">
+ <source>Unknown</source>
+ </trans-unit>
+
<trans-unit id="listtag.clearfilter">
<source>Clear filter </source>
diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
index 30ce4c8..21c9cf5 100644
--- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
@@ -23,6 +23,8 @@
<rl:list emptykey="audit.listxccdf.jsp.noscans">
<%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
</rl:list>
+ <rl:csv name="groupSet"
+ exportColumns="id,sid,serverName,profile,satisfied,dissatisfied,satisfactionUnknown"/>
<rhn:tooltip key="audit.listxccdf.jsp.tooltip"/>
</rl:listset>
commit cb1eb06ea399f3db6b0faf857bf62c25861e67ea
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Jun 21 16:19:30 2012 +0200
Add CSV downloader for scan's details page
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java b/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
index 6865840..92d0496 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
@@ -25,7 +25,7 @@ import com.redhat.rhn.manager.audit.ScapManager;
* Simple DTO for transfering data from the DB to the UI through datasource.
* @version $Rev$
*/
-public class XccdfRuleResultDto {
+public class XccdfRuleResultDto extends BaseDto {
private Long id;
private String label;
@@ -57,6 +57,15 @@ public class XccdfRuleResultDto {
}
/**
+ * Returns the actual xccdf:rule-result result
+ * @return the result
+ */
+ public String getEvaluationResult() {
+ // this method serve only for better localization within CSVWriter
+ return getLabel();
+ }
+
+ /**
* Sets the actual xccdf:rule-result result
* @param labelIn to set
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 986c5ea..238aa7d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7762,6 +7762,16 @@ Follow this url to see the full list of inactive systems:
<source>Total</source>
</trans-unit>
+ <trans-unit id="documentIdref">
+ <source>Idref of rule-result</source>
+ </trans-unit>
+ <trans-unit id="identsString">
+ <source>Assigned Idents</source>
+ </trans-unit>
+ <trans-unit id="evaluationResult">
+ <source>Result of Evaluation</source>
+ </trans-unit>
+
<trans-unit id="listtag.clearfilter">
<source>Clear filter </source>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index 6248806..fa07347 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -79,6 +79,8 @@
<%@ include file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %>
</rl:list>
+ <rl:csv name="groupSet"
+ exportColumns="id,documentIdref,identsString,evaluationResult"/>
</rl:listset>
</body>
commit 582780437e7b97b606620fa5f22f7eb62a3bf609
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Jun 21 15:10:31 2012 +0200
Add CSV downloader for system's scans page
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 795d821..986c5ea 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7725,6 +7725,43 @@ Follow this url to see the full list of inactive systems:
<source>Matching Field Value</source>
</trans-unit>
+ <trans-unit id="testResult">
+ <source>Idref of TestResult</source>
+ </trans-unit>
+ <trans-unit id="completionTime">
+ <source>Completion Time</source>
+ </trans-unit>
+ <trans-unit id="pass">
+ <source>Pass</source>
+ </trans-unit>
+ <trans-unit id="fail">
+ <source>Fail</source>
+ </trans-unit>
+ <trans-unit id="error">
+ <source>Error</source>
+ </trans-unit>
+ <trans-unit id="unknown">
+ <source>Unknown</source>
+ </trans-unit>
+ <trans-unit id="notapplicable">
+ <source>Notapplicable</source>
+ </trans-unit>
+ <trans-unit id="notchecked">
+ <source>Notchecked</source>
+ </trans-unit>
+ <trans-unit id="notselected">
+ <source>Notselected</source>
+ </trans-unit>
+ <trans-unit id="informational">
+ <source>Informational</source>
+ </trans-unit>
+ <trans-unit id="fixed">
+ <source>Fixed</source>
+ </trans-unit>
+ <trans-unit id="sum">
+ <source>Total</source>
+ </trans-unit>
+
<trans-unit id="listtag.clearfilter">
<source>Clear filter </source>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
index 4491c6e..bbadbe9 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
@@ -84,6 +84,8 @@
</c:choose>
</rl:column>
</rl:list>
+ <rl:csv name="groupSet"
+ exportColumns="id,testResult,completionTime,pass,fail,error,unknown,notapplicable,notchecked,notselected,informational,fixed,sum"/>
</rl:listset>
<rhn:tooltip><bean:message key="system.audit.listscap.jsp.tooltip"/></rhn:tooltip>
11 years, 10 months
Changes to 'refs/tags/rhnpush-5.5.47-1'
by Michael Mraka
Tag 'rhnpush-5.5.47-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-26 09:48 +0000
Tagging package [rhnpush] version [5.5.47-1] in directory [client/tools/rhnpush/].
Changes since spacewalk-backend-1.8.40-1:
Michael Mraka (1):
Automatic commit of package [rhnpush] release [5.5.47-1].
---
client/tools/rhnpush/rhnpush.spec | 7 ++++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
11 years, 10 months
client/tools rel-eng/packages
by Michael Mraka
client/tools/rhnpush/rhnpush.spec | 7 ++++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 1e002f3850f32033839f4ef7939dfa2403b7ea82
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 26 11:48:33 2012 +0200
Automatic commit of package [rhnpush] release [5.5.47-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index f62c175..38c7e7f 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -4,7 +4,7 @@ Name: rhnpush
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.46
+Version: 5.5.47
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Tue Jun 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.47-1
+- reuse UploadError from uploadLib
+- removed functions not used in rhnpush/rhn-package-manager
+- simplified authentication code
+
* Fri Jun 22 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.46-1
- removed commented out code and obsoleted comments
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index adda683..0e34df8 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.46-1 client/tools/rhnpush/
+5.5.47-1 client/tools/rhnpush/
11 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.8.40-1'
by Michael Mraka
Tag 'spacewalk-backend-1.8.40-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-26 09:47 +0000
Tagging package [spacewalk-backend] version [1.8.40-1] in directory [backend/].
Changes since spacewalk-web-1.8.20-1:
Michael Mraka (5):
simplified authentication code
removed dead code backend.listChannel()
removed functions not used in rhnpush/rhn-package-manager
reuse UploadError from uploadLib
Automatic commit of package [spacewalk-backend] release [1.8.40-1].
---
backend/server/importlib/backend.py | 44 ------------------------------------
backend/spacewalk-backend.spec | 5 +++-
client/tools/rhnpush/rhnpush.py | 17 +++++--------
client/tools/rhnpush/uploadLib.py | 30 ++++--------------------
rel-eng/packages/spacewalk-backend | 2 -
5 files changed, 17 insertions(+), 81 deletions(-)
---
11 years, 10 months