java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 8 +--
java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDeleteAction.java | 5 ++
java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java | 11 +++-
java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashDto.java | 10 ++--
java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java | 5 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 ++
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 24 ++++++++++
java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf | 8 +++
8 files changed, 64 insertions(+), 13 deletions(-)
New commits:
commit 14ac03438e9ff3695b4ddab80fef7e94222d9402
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 28 17:47:39 2013 +0100
fix checkstyle issues
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
index 121939e..7f2988c 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
@@ -862,9 +862,9 @@ public class ServerFactory extends HibernateFactory {
}
/**
- * Looks up snapshot tag by tag name
- * @param tagName name of the tag
- * @return snapshot tag
+ * Lists software crashes for a server
+ * @param server of interest
+ * @return crash list
*/
public static List<SoftwareCrashDto> listServerSoftwareCrashes(Server server) {
SelectMode m = ModeFactory.getMode("System_queries",
@@ -874,4 +874,4 @@ public class ServerFactory extends HibernateFactory {
params.put("server_id", server.getId());
return m.execute(params);
}
-}
\ No newline at end of file
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java
index 620400e..a2862d7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java
@@ -44,7 +44,7 @@ import javax.servlet.http.HttpServletResponse;
* SoftwareCrashesDetailsAction
* @version $Rev$
*/
-public class SoftwareCrashesDetailsAction extends RhnAction implements Listable{
+public class SoftwareCrashesDetailsAction extends RhnAction implements Listable {
public static final String CRASH_ID = "crid";
public static final String CRASH = "crash";
@@ -87,7 +87,8 @@ public class SoftwareCrashesDetailsAction extends RhnAction implements Listable{
for (Iterator iter = crash.getCrashFiles().iterator(); iter.hasNext();) {
CrashFile cf = (CrashFile) iter.next();
SoftwareCrashFileDto scDto = new SoftwareCrashFileDto(cf);
- scDto.setDownloadPath(DownloadManager.getCrashFileDownloadPath(cf, contextIn.getCurrentUser()));
+ scDto.setDownloadPath(DownloadManager.getCrashFileDownloadPath(cf,
+ contextIn.getCurrentUser()));
dr.add(scDto);
}
return dr;
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashDto.java b/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashDto.java
index 58f9c5d..b3ab8ee 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashDto.java
@@ -24,11 +24,11 @@ import java.util.Date;
*/
public class SoftwareCrashDto extends BaseDto {
- Long id;
- String crash;
- Long count;
- String component;
- Date modified;
+ private Long id;
+ private String crash;
+ private Long count;
+ private String component;
+ private Date modified;
/**
* @return Returns the id.
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java b/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java
index a5c3fed..a1d8f5b 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java
@@ -34,9 +34,10 @@ public class SoftwareCrashFileDto extends BaseDto {
private String downloadPath;
/**
- *
+ * Constructor
+ * @param cFile construct object according to crash file
*/
- public SoftwareCrashFileDto(CrashFile cFile ) {
+ public SoftwareCrashFileDto(CrashFile cFile) {
id = cFile.getId();
filename = cFile.getFilename();
path = cFile.getPath();
commit fbf1c2530b7b77964e238d0bf3aec9ae13826103
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 28 17:38:11 2013 +0100
add package nevra for crash pages
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 4ff08cf..829770a 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
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.system.CrashManager;
import org.apache.struts.action.ActionForm;
@@ -41,6 +42,7 @@ public class SoftwareCrashesDeleteAction extends RhnAction {
public static final String CRASH_ID = "crid";
public static final String CRASH = "crash";
+ public static final String CRASH_NEVRA = "crash_nevra";
public static final String SID = "sid";
@@ -59,6 +61,9 @@ public class SoftwareCrashesDeleteAction extends RhnAction {
request.setAttribute(CRASH_ID, crashId);
Crash crash = CrashManager.lookupCrashByUserAndId(user, crashId);
request.setAttribute(CRASH, crash);
+ request.setAttribute(CRASH_NEVRA,
+ PackageManager.buildPackageNevra(crash.getPackageNameId(),
+ crash.getPackageEvrId(), crash.getPackageArchId()));
if (ctx.isSubmitted()) {
String crashName = crash.getCrash();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java
index ca855b7..620400e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesDetailsAction.java
@@ -25,7 +25,9 @@ import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.download.DownloadManager;
+import com.redhat.rhn.manager.rhnpackage.PackageManager;
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;
@@ -46,6 +48,7 @@ public class SoftwareCrashesDetailsAction extends RhnAction implements Listable{
public static final String CRASH_ID = "crid";
public static final String CRASH = "crash";
+ public static final String CRASH_NEVRA = "crash_nevra";
public static final String SID = "sid";
/** {@inheritDoc} */
@@ -64,6 +67,9 @@ public class SoftwareCrashesDetailsAction extends RhnAction implements Listable{
Crash crash = CrashManager.lookupCrashByUserAndId(user, crashId);
request.setAttribute(CRASH, crash);
+ request.setAttribute(CRASH_NEVRA,
+ PackageManager.buildPackageNevra(crash.getPackageNameId(),
+ crash.getPackageEvrId(), crash.getPackageArchId()));
ListHelper helper = new ListHelper(this, request);
helper.execute();
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 10327bc..1e009e0 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
@@ -16339,6 +16339,12 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa
<context context-type="sourcefile">/systems/details/SoftwareCrashes.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="crashes.jsp.nevra">
+ <source>Package</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/systems/details/SoftwareCrashes.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="crashes.jsp.crash">
<source>Crash</source>
<context-group name="ctx">
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 2656870..d2fbfd9 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -1390,4 +1390,28 @@ public class PackageManager extends BaseManager {
throw new IncompatibleArchException(channel.getChannelArch(), archNonCompat);
}
}
+
+ public static String buildPackageNevra(Long name_id, Long evr_id, Long arch_id) {
+ String nevra = "";
+ if (name_id != null) {
+ PackageName pn = PackageFactory.lookupPackageName(name_id);
+ nevra += pn.getName();
+ if (evr_id != null) {
+ PackageEvr pevr = PackageEvrFactory.lookupPackageEvrById(evr_id);
+ if (pevr != null) {
+ nevra += "-" + pevr.getVersion() + "-" + pevr.getRelease();
+ if (!StringUtils.isEmpty(pevr.getEpoch())) {
+ nevra += ":" + pevr.getEpoch();
+ }
+ }
+ }
+ if (arch_id != null) {
+ PackageArch pa = PackageFactory.lookupPackageArchById(arch_id);
+ if (pa != null) {
+ nevra += "." + pa.getLabel();
+ }
+ }
+ }
+ return nevra;
+ }
}
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf
index 7e05dea..71e086c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf
@@ -9,6 +9,14 @@
</tr>
<tr>
<th>
+ <bean:message key="crashes.jsp.nevra"/>:
+ </th>
+ <td>
+ <c:out value="${crash_nevra}"/>
+ </td>
+ </tr>
+ <tr>
+ <th>
<bean:message key="crashes.jsp.crashcount"/>:
</th>
<td>
