rpms/struts/devel struts-1.2.8.build.patch, NONE, 1.1 struts-1.2.8.bz157205.patch, NONE, 1.1 struts-1.2.8.servlet24.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.5, 1.6 struts.spec, 1.27, 1.28 struts-1.2.4.build.patch, 1.1, NONE struts-1.2.4.bz157205.patch, 1.2, NONE struts-1.2.4.servlet24.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Feb 22 04:46:45 UTC 2006
Author: rafaels
Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17081
Modified Files:
.cvsignore sources struts.spec
Added Files:
struts-1.2.8.build.patch struts-1.2.8.bz157205.patch
struts-1.2.8.servlet24.patch
Removed Files:
struts-1.2.4.build.patch struts-1.2.4.bz157205.patch
struts-1.2.4.servlet24.patch
Log Message:
Updated to 1.2.8
struts-1.2.8.build.patch:
build-webapp.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE struts-1.2.8.build.patch ---
--- build-webapp.xml Sun Feb 10 08:38:52 2002
+++ build-webapp.xml.new Wed Mar 27 01:09:51 2002
@@ -213,6 +213,7 @@
<mkdir dir="${webapp.target}" />
<mkdir dir="${webapp.target}/WEB-INF" />
<mkdir dir="${webapp.target}/WEB-INF/classes" />
+ <mkdir dir="${webapp.target}/WEB-INF/lib" />
<mkdir dir="${webapp.target}" />
</target>
@@ -272,7 +272,7 @@
The "static" target copies the static web resources portion of your
web application source into the build target area.
-->
-<target name="static" depends="prepare,source,libs,struts"
+<target name="static" depends="prepare,source,libs"
description="Copy static files">
<echo message="Processing webapp ${webapp.name}"/>
<copy todir="${webapp.target}">
@@ -301,6 +301,10 @@
<exclude name="**/*.java"/>
</fileset>
</copy>
+ <jar jarfile="${webapp.target}/WEB-INF/lib/classes.jar"
+ basedir="${webapp.target}/WEB-INF/classes"/>
+ <delete dir="${webapp.target}/WEB-INF/classes" />
+ <delete dir="${webapp.target}/WEB-INF/src" />
</target>
struts-1.2.8.bz157205.patch:
MessageResourcesFactory.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
--- NEW FILE struts-1.2.8.bz157205.patch ---
RequestUtils.applicationClass() uses the context classloader to find
the class, but for some reason it sometimes seems to be set to what
looks like the normal system classloader. Possibly its something to
do with the fact that MessageResourcesFactory.createFactory() is
called from MessageResources.getMessageResources() which is usually
called from <clinit> methods. Or, it could be because RequestUtils
itself calls getMessageResources(), so createFactory() reenters
itself.
--- jakarta-struts-1.1-src/src/share/org/apache/struts/util/MessageResourcesFactory.java.orig 2003-06-30 05:51:19.000000000 +0100
+++ jakarta-struts-1.1-src/src/share/org/apache/struts/util/MessageResourcesFactory.java 2005-05-09 13:36:32.000000000 +0100
@@ -188,8 +188,16 @@
// Construct a new instance of the specified factory class
try {
- if (clazz == null)
- clazz = RequestUtils.applicationClass(factoryClass);
+ if (clazz == null) {
+ if (System.getProperty("java.vm.name").equals("GNU libgcj")) {
+ // XXX should use context class loader but it's wrong
+ ClassLoader classLoader =
+ MessageResourcesFactory.class.getClassLoader();
+ clazz = classLoader.loadClass(factoryClass);
+ }
+ else
+ clazz = RequestUtils.applicationClass(factoryClass);
+ }
MessageResourcesFactory factory =
(MessageResourcesFactory) clazz.newInstance();
return (factory);
struts-1.2.8.servlet24.patch:
MultipartRequestWrapper.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+)
--- NEW FILE struts-1.2.8.servlet24.patch ---
--- jakarta-struts-1.1-src/src/share/org/apache/struts/upload/MultipartRequestWrapper.java.orig 2003-06-30 05:51:36.000000000 +0100
+++ jakarta-struts-1.1-src/src/share/org/apache/struts/upload/MultipartRequestWrapper.java 2005-01-20 15:57:41.126231975 +0000
@@ -344,6 +344,39 @@
return false;
}
+ //SERVLET 2.4 EMPTY METHODS
+ /**
+ * This method returns -1. To use any Servlet 2.4 methods,
+ * call on getRequest() and use that request object. Once Servlet 2.4
+ * is required to build Struts, this will no longer be an issue.
+ */
+ public int getRemotePort() {
+ return -1;
+ }
+ /**
+ * This method returns null. To use any Servlet 2.4 methods,
+ * call on getRequest() and use that request object. Once Servlet 2.4
+ * is required to build Struts, this will no longer be an issue.
+ */
+ public String getLocalName() {
+ return null;
+ }
+ /**
+ * This method returns null. To use any Servlet 2.4 methods,
+ * call on getRequest() and use that request object. Once Servlet 2.4
+ * is required to build Struts, this will no longer be an issue.
+ */
+ public String getLocalAddr() {
+ return null;
+ }
+ /**
+ * This method returns -1. To use any Servlet 2.4 methods,
+ * call on getRequest() and use that request object. Once Servlet 2.4
+ * is required to build Struts, this will no longer be an issue.
+ */
+ public int getLocalPort() {
+ return -1;
+ }
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 14 Jun 2005 16:22:54 -0000 1.6
+++ .cvsignore 22 Feb 2006 04:46:42 -0000 1.7
@@ -1,4 +1 @@
-jakarta-struts-1.2.4-src-RHCLEAN.tar.bz2
-jakarta-struts-1.2.4-src
-i386
-*.src.rpm
+struts-1.2.8-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 14 Jun 2005 16:22:54 -0000 1.5
+++ sources 22 Feb 2006 04:46:42 -0000 1.6
@@ -1 +1 @@
-08ff76831f60a04df815f8a069ed3cae jakarta-struts-1.2.4-src-RHCLEAN.tar.bz2
+99b90aed5fd29bb06b2b97f70da4b889 struts-1.2.8-src.tar.gz
Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- struts.spec 11 Feb 2006 05:44:37 -0000 1.27
+++ struts.spec 22 Feb 2006 04:46:42 -0000 1.28
@@ -1,7 +1,9 @@
%define name struts
%define full_name jakarta-%{name}
-%define version 1.2.4
-%define release 2jpp_7fc
+%define version 1.2.8
+%define release 2jpp_8fc
+%define tomcat3appsdir %{_localstatedir}/tomcat3/webapps
+%define tomcat4appsdir %{_localstatedir}/lib/tomcat4/webapps
%define tomcat5appsdir %{_localstatedir}/lib/tomcat5/webapps
%define tomcat5ctxdir %{_sysconfdir}/tomcat5/Catalina/localhost
%define section free
@@ -15,19 +17,18 @@
Summary: Web application framework
License: Apache License
Group: Development/Libraries/Java
-Source0: %{full_name}-%{version}-src-RHCLEAN.tar.bz2
+Source0: %{name}-%{version}-src.tar.gz
Source2: tomcat4-context-allowlinking.xml
Source3: tomcat5-context-allowlinking.xml
Patch0: %{name}-%{version}.build.patch
-Patch1: %{name}-%{version}.servlet24.patch
-Patch2: %{name}-%{version}.bz157205.patch
+Patch1: %{name}-%{version}.bz157205.patch
Url: http://jakarta.apache.org/%{name}
Requires: servletapi5
Requires: jdbc-stdext
Requires: jakarta-commons-beanutils >= 0:1.7.0
Requires: jakarta-commons-digester >= 0:1.6
Requires: jakarta-commons-fileupload >= 0:1.0
-Requires: jakarta-commons-validator >= 0:1.1.3
+Requires: jakarta-commons-validator >= 0:1.1.4
Requires: oro >= 0:2.0.7
BuildRequires: jpackage-utils >= 1.5
BuildRequires: ant >= 1.6.1
@@ -39,12 +40,10 @@
BuildRequires: servletapi5
BuildRequires: jdbc-stdext
BuildRequires: jakarta-commons-beanutils >= 0:1.7.0
-BuildRequires: jakarta-commons-collections >= 0:2.1
BuildRequires: jakarta-commons-digester >= 0:1.6
BuildRequires: jakarta-commons-fileupload >= 0:1.0
-BuildRequires: jakarta-commons-lang >= 0:1.0.1
BuildRequires: jakarta-commons-logging >= 0:1.0.4
-BuildRequires: jakarta-commons-validator >= 0:1.1.3
+BuildRequires: jakarta-commons-validator >= 0:1.1.4
BuildRequires: oro >= 0:2.0.7
Group: Development/Java
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -89,6 +88,28 @@
%description javadoc
Javadoc for %{name}.
+%package webapps-tomcat3
+Summary: Sample %{name} webapps for tomcat3
+Group: Development/Java
+Requires: %{name} = %{version}-%{release}
+Prereq: tomcat3
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+
+%description webapps-tomcat3
+Sample %{name} webapps for tomcat3.
+
+%package webapps-tomcat4
+Summary: Sample %{name} webapps for tomcat4
+Group: Development/Java
+Requires: %{name} = %{version}-%{release}
+Prereq: tomcat4
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+
+%description webapps-tomcat4
+Sample %{name} webapps for tomcat4.
+
%package webapps-tomcat5
Summary: Sample %{name} webapps for tomcat5
Group: Development/Java
@@ -103,29 +124,32 @@
%prep
rm -rf $RPM_BUILD_ROOT
-%setup -n %{full_name}-%{version}-src -q
+%setup -n %{name}-%{version}-src -q
%patch0
%patch1 -p1
-%patch2 -p1
# remove all binary libs
find . -name "*.class" -exec rm -f {} \;
find . -name "*.jar" -exec rm -f {} \;
find . -name "*.war" -exec rm -f {} \;
+mkdir lib; pushd lib
+ ln -s $(find-jar jspapi) .
+popd
+
%build
# build struts
-export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl \
-jaxp_transform_impl jdbc-stdext servletapi5 jspapi antlr commons-digester-rss)
+export CLASSPATH=
ant -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
- -Dcommons-collections.jar=$(build-classpath commons-collections) \
-Dcommons-digester.jar=$(build-classpath commons-digester) \
-Dcommons-fileupload.jar=$(build-classpath commons-fileupload) \
- -Dcommons-lang.jar=$(build-classpath commons-lang) \
-Dcommons-logging.jar=$(build-classpath commons-logging) \
-Dcommons-validator.jar=$(build-classpath commons-validator) \
-Djakarta-oro.jar=$(build-classpath oro) \
+ -Djsp.jar=$(build-classpath jspapi) \
+ -Dservlet.jar=$(build-classpath servletapi5) \
+ -Dantlr.jar=$(build-classpath antlr) \
compile.library compile.webapps compile.javadoc
%install
@@ -142,6 +166,34 @@
install -m 644 target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 644 target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
+# tomcat 3 webapps
+install -d -m 755 $RPM_BUILD_ROOT%{tomcat3appsdir}
+for webapp in %{webapps}; do
+ cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp
+ # tomcat3 doesn't support allowLinking, this might not work
+ # XXX: move to %%post/preun
+ for jar in %{webapplibs}; do
+ (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF/lib \
+ && ln -sf ../../../../../..%{_javadir}/$jar.jar .)
+ done
+ (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF \
+ && for tld in ../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
+done
+
+# tomcat 4 webapps
+install -d -m 755 $RPM_BUILD_ROOT%{tomcat4appsdir}
+for webapp in %{webapps}; do
+ cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp
+ cat %{SOURCE2} | sed -e "s/@@@APPNAME@@@/$webapp/g;" > $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp.xml
+ # XXX: move to %%post/preun
+ for jar in %{webapplibs}; do
+ (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF/lib \
+ && ln -sf ../../../../../../..%{_javadir}/$jar.jar .)
+ done
+ (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF \
+ && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
+done
+
# tomcat 5 webapps
install -d -m 755 $RPM_BUILD_ROOT%{tomcat5appsdir}
install -d -m 755 $RPM_BUILD_ROOT%{tomcat5ctxdir}
@@ -165,13 +217,24 @@
%postun
%{_bindir}/rebuild-gcj-db
+%post webapps-tomcat3
+%{_bindir}/rebuild-gcj-db
+
+%postun webapps-tomcat3
+%{_bindir}/rebuild-gcj-db
+
+%post webapps-tomcat4
+%{_bindir}/rebuild-gcj-db
+
+%postun webapps-tomcat4
+%{_bindir}/rebuild-gcj-db
+
%post webapps-tomcat5
%{_bindir}/rebuild-gcj-db
%postun webapps-tomcat5
%{_bindir}/rebuild-gcj-db
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -195,6 +258,35 @@
%defattr(-,root,root)
%{_javadocdir}/%{name}-%{version}
+%files webapps-tomcat3
+%defattr(-,tomcat3,tomcat3)
+%dir %{tomcat3appsdir}/%{name}-blank
+%{tomcat3appsdir}/%{name}-blank/*
+%dir %{tomcat3appsdir}/%{name}-documentation
+%{tomcat3appsdir}/%{name}-documentation/*
+%dir %{tomcat3appsdir}/%{name}-example
+%{tomcat3appsdir}/%{name}-example/*
+%dir %{tomcat3appsdir}/%{name}-examples
+%{tomcat3appsdir}/%{name}-examples/*
+%dir %{tomcat3appsdir}/%{name}-tiles-documentation
+%{tomcat3appsdir}/%{name}-tiles-documentation/*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
+
+%files webapps-tomcat4
+%defattr(-,tomcat,tomcat)
+%dir %{tomcat4appsdir}/%{name}-blank
+%{tomcat4appsdir}/%{name}-blank/*
+%dir %{tomcat4appsdir}/%{name}-documentation
+%{tomcat4appsdir}/%{name}-documentation/*
+%dir %{tomcat4appsdir}/%{name}-example
+%{tomcat4appsdir}/%{name}-example/*
+%dir %{tomcat4appsdir}/%{name}-examples
+%{tomcat4appsdir}/%{name}-examples/*
+%dir %{tomcat4appsdir}/%{name}-tiles-documentation
+%{tomcat4appsdir}/%{name}-tiles-documentation/*
+%{tomcat4appsdir}/%{name}-*.xml
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
+
%files webapps-tomcat5
%defattr(-,tomcat,tomcat)
%dir %{tomcat5appsdir}/%{name}-blank
@@ -211,6 +303,9 @@
%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
%changelog
+* Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_8fc
+- Updated to 1.2.8
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_7fc
- bump again for double-long bug on ppc(64)
--- struts-1.2.4.build.patch DELETED ---
--- struts-1.2.4.bz157205.patch DELETED ---
--- struts-1.2.4.servlet24.patch DELETED ---
More information about the fedora-cvs-commits
mailing list