On 06/25/2009 07:55 AM, Joshua Roys wrote:
Hello all.
I was wondering if the audit viewing code was at a state that you would
consider merging it in to master, or some branch. Right now it is based
off of and tested with SPACEWALK-0.5, although I just rebased it to
master. It would need a little clean up, I think, for instance:
commit 8c7a125761d570236aa67559e249ef336c3e83c6
Author: Partha Aji<[email protected]>
Date: Fri Jun 19 18:37:46 2009 -0400
Fix for html:errors and html:messages to be consitently viewed in the UI
I added one more patch to avoid a NPE for those who didn't create the
directories my code needed, and a bit of code in spacewalk-setup to make
said directories.
http://www.stl.gtri.gatech.edu/jroys/#code
Thanks,
Joshua Roys
Hey Joshua, I just patched master:
$ patch -p1 < spacewalk-audit-20090625.patch
patching file contrib/aup.c
patching file
java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java
patching file
java/code/src/com/redhat/rhn/frontend/action/audit/AuditMachineAction.java
patching file
java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
patching file java/code/src/com/redhat/rhn/frontend/dto/AuditDto.java
patching file java/code/src/com/redhat/rhn/frontend/dto/AuditMachineDto.java
patching file java/code/src/com/redhat/rhn/frontend/dto/AuditReviewDto.java
patching file
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
Hunk #1 succeeded at 363 (offset 9 lines).
Hunk #2 succeeded at 776 (offset -6 lines).
patching file
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
Hunk #1 succeeded at 3465 (offset 23 lines).
patching file
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
patching file java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
patching file java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
Hunk #1 FAILED at 128.
1 out of 1 hunk FAILED -- saving rejects to file
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml.rej
patching file java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
patching file java/code/webapp/WEB-INF/pages/audit/auditview.jsp
patching file java/code/webapp/WEB-INF/pages/audit/machine.jsp
patching file java/code/webapp/WEB-INF/pages/audit/overview.jsp
patching file java/code/webapp/WEB-INF/struts-config.xml
Hunk #2 succeeded at 1040 (offset 12 lines).
patching file spacewalk/setup/bin/spacewalk-setup
Looks like sitenav-authenticated.xml failed. very close! I'm
reviewing the changes now
--
Mike McCune
mmccune AT redhat.com
Engineering | Portland, OR
RHN Satellite | 650.567.9039x79248
_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel
