On 06/26/2009 08:03 PM, Mike McCune wrote:
Joshua,
I'm also getting this compile error:
[javac] Compiling 2455 source files to
/home/mmccune/devel/spacewalk/java/build/classes
[javac]
/home/mmccune/devel/spacewalk/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java:253:
cannot find symbol
[javac] symbol : constructor DataResult()
[javac] location: class
com.redhat.rhn.common.db.datasource.DataResult<com.redhat.rhn.frontend.dto.AuditMachineDto>
[javac] return new DataResult<AuditMachineDto>();
[javac] ^
[javac] Note: Some input files use or override a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[javac] Note: Some input files use unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
[javac] 1 error
looks like AuditMachineDto is missing the default constructor.
Mike,
Try the patch located here to avoid the conflict:
http://www.stl.gtri.gatech.edu/jroys/spacewalk-audit-20090625-master-96465f0.patch
Also, attached is a patch to remove the recently (re)moved html:messages
from my jsp pages, and fix that compile error.
Thanks!
Joshua
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
index a44b8cd..49b54bd 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
@@ -15,10 +15,6 @@
</head>
<body>
-<html:messages id="message" message="true">
- <rhn:messages><c:out escapeXml="false" value="${message}" /></rhn:messages>
-</html:messages>
-
<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="auditsearch.jsp.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
index 5f1d303..b23d902 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
@@ -15,10 +15,6 @@
</head>
<body>
-<html:messages id="message" message="true">
- <rhn:messages><c:out escapeXml="false" value="${message}" /></rhn:messages>
-</html:messages>
-
<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="auditsearch.jsp.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/audit/machine.jsp
b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
index 71e74da..847ec0c 100644
--- a/java/code/webapp/WEB-INF/pages/audit/machine.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
@@ -11,10 +11,6 @@
</head>
<body>
-<html:messages id="message" message="true">
- <rhn:messages><c:out escapeXml="false" value="${message}" /></rhn:messages>
-</html:messages>
-
<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="audit.overview.jsp.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/audit/overview.jsp
b/java/code/webapp/WEB-INF/pages/audit/overview.jsp
index deb319b..ec12c64 100644
--- a/java/code/webapp/WEB-INF/pages/audit/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/overview.jsp
@@ -11,10 +11,6 @@
</head>
<body>
-<html:messages id="message" message="true">
- <rhn:messages><c:out escapeXml="false" value="${message}" /></rhn:messages>
-</html:messages>
-
<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="audit.overview.jsp.header"/>
diff --git a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
index 445c692..eafa1be 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
@@ -250,7 +250,7 @@ public class AuditManager /* extends BaseManager */ {
LinkedList<AuditMachineDto> hosts = new LinkedList<AuditMachineDto>();
if (logDir == null) {
- return new DataResult<AuditMachineDto>();
+ return new DataResult<AuditMachineDto>(null);
}
for (File host : logDir.listFiles()) {
_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel
