java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml |
2
java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java |
33 ++++++----
java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDeleteAction.java |
6 -
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml |
3
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml |
3
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java |
21 ++++--
java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java |
14 +++-
java/code/src/com/redhat/rhn/manager/system/CrashManager.java |
18 +++--
java/code/webapp/WEB-INF/pages/systems/crashes.jsp |
1
java/code/webapp/WEB-INF/struts-config.xml |
2
java/spacewalk-java.spec |
22 ++++++
rel-eng/packages/spacewalk-java |
2
12 files changed, 90 insertions(+), 37 deletions(-)
New commits:
commit 932aa9633667119754cf00377e714193b8bc0eac
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 28 21:25:25 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.79-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c2b4831..4d17110 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.9.78
+Version: 1.9.79
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,26 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Feb 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.79-1
+- fix system crash file CVS export column translation
+- delete multiple software crashes by selecting them on webui
+- fix deleting a system crash
+- fix crash select on the SoftwareCrashes page
+- add PackageManager.buildPackageNevra java doc
+- fix checkstyle issues
+- add package nevra for crash pages
+- abrt: add missing colons
+- abrt: show full storage path for a crash
+- abrt: add links to crash detail page
+- webui: <p/> instead of <br/>
+- adding system headers for the crash pages
+- adding crash files on the crash detail page
+- introducing crash delete page
+- introducing crash details page
+- introducing crash list page
+- abrt: webui to set crashfile upload size
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
* Wed Feb 27 2013 Jan Pazdziora 1.9.78-1
- API doc build fix.
- abrt: fix exception number
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f87635c..83f12b9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.78-1 java/
+1.9.79-1 java/
commit da6740afa57063c81e1ee053f884512511369d21
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 28 21:12:32 2013 +0100
fix system crash file CVS export column translation
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 1e009e0..ae238f3 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
@@ -15800,6 +15800,9 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer
Generation should alwa
<trans-unit id="exportcolumn.filesize">
<source>File Size</source>
</trans-unit>
+ <trans-unit id="exportcolumn.path">
+ <source>Path</source>
+ </trans-unit>
</group>
<trans-unit id="virtualization.provision.first.jsp.no.profiles">
<source>No profiles currently available for kickstarting guests. Please
<a href="/rhn/kickstart/CreateProfileWizard.do">create a new
kickstart profile with a Virtualization Type other than
none.</a></source>
commit 2945774f96db6eb97fa3a4a599f9c9ab17b6a3ff
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 28 20:08:11 2013 +0100
delete multiple software crashes by selecting them on webui
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java
index 7d5991b..42d3f7d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.systems;
+import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.user.User;
@@ -24,12 +25,16 @@ import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import com.redhat.rhn.manager.system.CrashManager;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -51,25 +56,33 @@ public class SoftwareCrashesAction extends RhnAction implements
Listable {
RequestContext context = new RequestContext(request);
context.copyParamToAttributes("sid");
- context.lookupAndBindServer();
+ Server server = context.lookupAndBindServer();
- ListRhnSetHelper helper = new ListRhnSetHelper(this, request, getSetDecl());
+ ListRhnSetHelper helper = new ListRhnSetHelper(this, request,
+ RhnSetDecl.setForSystemCrashes(server));
helper.execute();
if (helper.isDispatched()) {
- return handleSubmit(mapping, formIn, request, response);
+ return handleSubmit(mapping, context, server);
}
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected ActionForward handleSubmit(ActionMapping mapping,
- ActionForm formIn, HttpServletRequest request,
- HttpServletResponse response) {
- return mapping.findForward("default");
- }
-
- protected RhnSetDecl getSetDecl() {
- return RhnSetDecl.SYSTEM_CRASHES;
+ RequestContext ctx, Server server) {
+ User user = ctx.getCurrentUser();
+ RhnSet set = RhnSetDecl.setForSystemCrashes(server).get(user);
+ // until we delete crash files from taskomatic, we have to delete them one by one
+ for (Iterator<Long> iter = RhnSetDecl.setForSystemCrashes(server).
+ get(user).getElementValues().iterator(); iter.hasNext();) {
+ CrashManager.deleteCrash(user, iter.next());
+ }
+ createSuccessMessage(ctx.getRequest(), "message.crashesdeleted",
+ Integer.toString(set.size()));
+ Map params = new HashMap();
+ params.put("sid", server.getId());
+ return getStrutsDelegate().forwardParams(mapping.findForward("delete"),
+ params);
}
/**
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 162a659..ca0c999 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
@@ -7523,6 +7523,9 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="message.crashdeleted">
<source>Software crash {0} was successfully deleted.</source>
</trans-unit>
+ <trans-unit id="message.crashesdeleted">
+ <source>{0} software crashes were successfully deleted.</source>
+ </trans-unit>
<trans-unit id="kickstart.cobbler.profile.invalidvirt">
<source>Para-Virtualization is unsupported with the selected kickstart tree
or distribution.</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
index 553f071..905a416 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.util.Asserts;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.SetCleanup;
+import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
import com.redhat.rhn.frontend.action.monitoring.ProbeSuiteHelper;
@@ -68,10 +69,6 @@ public class RhnSetDecl {
public static final RhnSetDecl CHANNELS_FOR_ERRATA = make(
"channels_for_errata", SetCleanup.UNOWNED_CHANNELS);
- // set of system crashes
- public static final RhnSetDecl SYSTEM_CRASHES = make(
- "crashes_for_system", SetCleanup.NOOP);
-
// set of errata by errata_id
public static final RhnSetDecl ERRATA = make("errata_list",
SetCleanup.ILLEGAL_ERRATA);
@@ -517,6 +514,15 @@ public class RhnSetDecl {
return make("package_clone_list" + chan.getId(), SetCleanup.NOOP);
}
+ /**
+ * get the set for system software crashes
+ * @param serv server passed in
+ * @return the Set descl
+ */
+ public static RhnSetDecl setForSystemCrashes(Server serv) {
+ return make("crashes_for_system" + serv.getId(), SetCleanup.NOOP);
+ }
+
public static final RhnSetDecl SYSTEM_NOTES = make("systems_notes",
SetCleanup.NOOP);
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 3290fd8..7702d39 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -3608,6 +3608,8 @@
<set-property property="postRequiredIfSubmitted"
value="true" />
<forward name="default"
path="/WEB-INF/pages/systems/crashes.jsp"/>
+ <forward name="delete"
+ path="/systems/details/SoftwareCrashes.do"
redirect="true"/>
</action>
<action path="/systems/details/SoftwareCrashDetail"
commit c0a8fdfe8f89d0a02e344dbd3d25d07c9278b59b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 28 20:25:40 2013 +0100
fix deleting a system crash
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDeleteAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDeleteAction.java
index 829770a..c0f02bf 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDeleteAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDeleteAction.java
@@ -15,7 +15,6 @@
package com.redhat.rhn.frontend.action.systems;
import com.redhat.rhn.domain.server.Crash;
-import com.redhat.rhn.domain.server.CrashFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
@@ -66,9 +65,8 @@ public class SoftwareCrashesDeleteAction extends RhnAction {
crash.getPackageEvrId(), crash.getPackageArchId()));
if (ctx.isSubmitted()) {
- String crashName = crash.getCrash();
- CrashFactory.delete(crash);
- createSuccessMessage(request, "message.crashdeleted", crashName);
+ CrashManager.deleteCrash(user, crashId);
+ createSuccessMessage(request, "message.crashdeleted",
crash.getCrash());
Map params = new HashMap();
params.put("sid", crash.getServer().getId());
return
getStrutsDelegate().forwardParams(mapping.findForward("delete"),
diff --git a/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
b/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
index 14dc0c1..9bbfa7e 100644
--- a/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
@@ -93,16 +93,18 @@ public class CrashManager extends BaseManager {
Crash crash = lookupCrashByUserAndId(user, crashId);
// FIXME: async deletion via taskomatic?
- File storageDir = new File(Config.get().getString("web.mount_point"),
- crash.getStoragePath());
-
- for (CrashFile cf : crash.getCrashFiles()) {
- File crashFile = new File(storageDir, cf.getFilename());
- if (crashFile.exists() && crashFile.isFile()) {
- crashFile.delete();
+ if (crash.getStoragePath() != null) {
+ File storageDir = new
File(Config.get().getString("web.mount_point"),
+ crash.getStoragePath());
+
+ for (CrashFile cf : crash.getCrashFiles()) {
+ File crashFile = new File(storageDir, cf.getFilename());
+ if (crashFile.exists() && crashFile.isFile()) {
+ crashFile.delete();
+ }
}
+ storageDir.delete();
}
- storageDir.delete();
CrashFactory.delete(crash);
}
commit e88a01e9fbfa80b978ebb9f2964e464837d07954
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 28 19:31:55 2013 +0100
fix crash select on the SoftwareCrashes page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 3d3825c..866209d 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1425,7 +1425,7 @@ ORDER BY PN.name, PE.evr
</query>
</mode>
-<mode name="list_server_software_crashes">
+<mode name="list_server_software_crashes"
class="com.redhat.rhn.frontend.dto.SoftwareCrashDto">
<query params="server_id">
SELECT id,
crash,
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
index 908118e..ff13044 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
@@ -30,7 +30,6 @@
<rl:list
width="100%"
- name="crashesList"
styleclass="list"
emptykey="crashes.jsp.nocrashes"
alphabarcolumn="component">
commit 79a42ed68c57cd152f857f5de7cc72d3adc15398
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 28 19:58:00 2013 +0100
add PackageManager.buildPackageNevra java doc
+ fix the parameter naming
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
index d2fbfd9..e31b298 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -1391,13 +1391,20 @@ public class PackageManager extends BaseManager {
}
}
- public static String buildPackageNevra(Long name_id, Long evr_id, Long arch_id) {
+ /**
+ * build package nevra out of the name, evr, arch identifiers
+ * @param nameId name id
+ * @param evrId evr id
+ * @param archId arch id
+ * @return nevra
+ */
+ public static String buildPackageNevra(Long nameId, Long evrId, Long archId) {
String nevra = "";
- if (name_id != null) {
- PackageName pn = PackageFactory.lookupPackageName(name_id);
+ if (nameId != null) {
+ PackageName pn = PackageFactory.lookupPackageName(nameId);
nevra += pn.getName();
- if (evr_id != null) {
- PackageEvr pevr = PackageEvrFactory.lookupPackageEvrById(evr_id);
+ if (evrId != null) {
+ PackageEvr pevr = PackageEvrFactory.lookupPackageEvrById(evrId);
if (pevr != null) {
nevra += "-" + pevr.getVersion() + "-" +
pevr.getRelease();
if (!StringUtils.isEmpty(pevr.getEpoch())) {
@@ -1405,8 +1412,8 @@ public class PackageManager extends BaseManager {
}
}
}
- if (arch_id != null) {
- PackageArch pa = PackageFactory.lookupPackageArchById(arch_id);
+ if (archId != null) {
+ PackageArch pa = PackageFactory.lookupPackageArchById(archId);
if (pa != null) {
nevra += "." + pa.getLabel();
}