java/buildconf/build-props.xml |
3
java/buildconf/build-taskdefs.xml |
2
java/code/internal/src/com/redhat/rhn/internal/jasper2/JspfC.java |
39 ++++++++++
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deleteheader.jspf |
26 ------
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf |
2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf |
1
java/ivy.xml |
4 -
java/spacewalk-java.spec |
7 +
rel-eng/packages/spacewalk-java |
2
9 files changed, 53 insertions(+), 33 deletions(-)
New commits:
commit 0ab9d45f0809a22cbf2d7681d410811d9e0901cf
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Sep 30 08:51:08 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.48-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fe446b5..a46cfa5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.47
+Version: 1.2.48
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -336,6 +336,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Sep 30 2010 Lukas Zapletal 1.2.48-1
+- jspf pages are now precompiled too
+- deleted jpsf that was no longer in use
+- known error (628555) is solved by jspf precompilation
+
* Wed Sep 29 2010 Shannon Hughes <shughes(a)redhat.com> 1.2.47-1
- fix incorrect adding of trust set for system migrate (shughes(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3488fb9..b5976da 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.47-1 java/
+1.2.48-1 java/
commit 3fd124cb5b3c61319ed94c3cacd37a54b8175729
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Wed Sep 29 17:33:51 2010 +0200
jspf pages are now precompiled too
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index dbbca14..65addd6 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -137,9 +137,8 @@
<path refid="testjars" />
<fileset dir="${build.lib.dir}">
<include name="*.jar" />
- <include name="log4j.properties" />
- <include name="${build.dir}/classes/" />
</fileset>
+ <pathelement location="${build.dir}/classes/"/>
</path>
<path id="alljars">
diff --git a/java/buildconf/build-taskdefs.xml b/java/buildconf/build-taskdefs.xml
index bfd360c..37ce349 100644
--- a/java/buildconf/build-taskdefs.xml
+++ b/java/buildconf/build-taskdefs.xml
@@ -22,7 +22,7 @@
<!-- =================== Jspc Tasks ======================= -->
<taskdef name="jasper2"
- classname="org.apache.jasper.JspC"
+ classname="com.redhat.rhn.internal.jasper2.JspfC"
classpathref="buildjars"/>
<!-- =================== Ant Contrib Tasks ======================= -->
diff --git a/java/code/internal/src/com/redhat/rhn/internal/jasper2/JspfC.java
b/java/code/internal/src/com/redhat/rhn/internal/jasper2/JspfC.java
new file mode 100644
index 0000000..f540003
--- /dev/null
+++ b/java/code/internal/src/com/redhat/rhn/internal/jasper2/JspfC.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2009--2010 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ *
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.internal.jasper2;
+
+import java.io.File;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.JspC;
+
+/**
+ * Helper TaskDef which compiles jsp AND jspf files.
+ *
+ * Instead using default Tomcat 5.5+ JspC Jasper2 Compiler we
+ * use our version which extends it. It has the very same
+ * functionality but it also compiles *.jspf Struts files.
+ *
+ * @author Lukas Zapletal
+ */
+public class JspfC extends JspC {
+
+ @Override
+ public void scanFiles(File file) throws JasperException {
+ addExtension("jsp");
+ addExtension("jspf");
+ addExtension("jspx");
+ super.scanFiles(file);
+ }
+}
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
index 9e03c43..4440921 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
@@ -1,3 +1,5 @@
+<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+
<bean:message key="deploylocal.jspf.local"
arg0="${revision.revision}"
arg1="/rhn/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}"
arg2="${system}"
arg3="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}"
/>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
index 1a8635d..83df2ea 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
@@ -2,6 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://jakarta.apache.org/struts/tags-bean"
prefix="bean" %>
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
<rl:list width="100%" emptykey =
"kickstart.schedule.no.profiles.jsp" alphabarcolumn="label">
<rl:decorator name = "PageSizeDecorator"/>
diff --git a/java/ivy.xml b/java/ivy.xml
index 28c9eaf..a817116 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -32,8 +32,8 @@
<dependency org="redhat" name="hibernate3"
rev="3.2.4.1" />
<dependency org="redhat" name="imap" rev="1.3.1"
/>
<dependency org="redhat" name="jaf" rev="1.0.2"
/>
- <dependency org="redhat" name="jasper5-compiler"
rev="5.0.19" />
- <dependency org="redhat" name="jasper5-runtime"
rev="5.0.19" />
+ <dependency org="redhat" name="jasper5-compiler"
rev="5.5.28" />
+ <dependency org="redhat" name="jasper5-runtime"
rev="5.5.28" />
<dependency org="redhat" name="jcommon"
rev="1.0.12" />
<dependency org="redhat" name="jdom" rev="1.0"
/>
<dependency org="redhat" name="jfreechart"
rev="1.0.9" />
commit eee9e5fba8c7562e8c8cb978f27ac38883079a0e
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Fri Sep 24 16:56:23 2010 +0200
deleted jpsf that was no longer in use
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deleteheader.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deleteheader.jspf
deleted file mode 100644
index 2ae2b40..0000000
---
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deleteheader.jspf
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ taglib
uri="http://www.opensymphony.com/sitemesh/decorator"
prefix="decorator" %>
-<%@ taglib
uri="http://jakarta.apache.org/struts/tags-html"
prefix="html" %>
-<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
-<html:xhtml/>
-<div>
-<c:choose>
- <c:when test="file.directory}">
- <rhn:toolbar base="h1"
- img="/img/folder-config.gif"
- imgAlt="config.common.dirAlt"
- helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp">
- ${file.configFileName.path}
- </rhn:toolbar>
- </c:when>
- <c:otherwise>
- <rhn:toolbar base="h1"
- img="/img/file-config.gif"
- imgAlt="config.common.fileAlt"
- helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp">
- ${file.configFileName.path}
- </rhn:toolbar>
- </c:otherwise>
-</c:when>
-
-<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/configfile_detail.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />