[Jpackage-commits] dist/dwr/devel .cvsignore, 1.1, 1.2 dwr-2.0.5-to138-StrutsCreator.patch, NONE, 1.1 dwr.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Sun Feb 1 20:05:32 CET 2009


Update of /home/projects/jpackage/cvs/dist/dwr/devel
In directory ryu.zarb.org:/tmp/cvs-serv29563/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dwr-2.0.5-to138-StrutsCreator.patch dwr.spec 
Log Message:
Import dwr into devel

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/dwr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	1 Feb 2009 18:57:16 -0000	1.1
--- .cvsignore	1 Feb 2009 19:05:30 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ dwr-2.0.5-src.zip

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/dwr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	1 Feb 2009 18:57:16 -0000	1.1
--- sources	1 Feb 2009 19:05:30 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ abf8a49cb6c51c8d8d89e6c91abcc7fb  dwr-2.0.5-src.zip

--- NEW FILE: dwr.spec ---
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

%define section free

Summary:        Direct Web Remoting
Name:           dwr
Version:        2.0.5
Release:        1%{dist}
Epoch:          0
License:        Apache Software License 2.0
URL:            https://dwr.dev.java.net/
Group:          Development/Libraries/Java
Source0:        https://dwr.dev.java.net/files/documents/2427/101134/dwr-2.0.5-src.zip
Patch:          dwr-2.0.5-to138-StrutsCreator.patch
BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  java-devel = 0:1.4.2
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  junit >= 0:3.8.1
BuildRequires:  backport-util-concurrent
BuildRequires:  bsf
BuildRequires:  jakarta-commons-logging
BuildRequires:  dom4j
BuildRequires:  google-guice
BuildRequires:  hibernate2
BuildRequires:  hibernate3
BuildRequires:  hibernate3-entitymanager
BuildRequires:  jdom
BuildRequires:  jetty6
BuildRequires:  jsp_2_0_api
BuildRequires:  myfaces
BuildRequires:  servlet_2_4_api
BuildRequires:  servlet_2_5_api
BuildRequires:  spring2-all
BuildRequires:  spring2-webmvc
BuildRequires:  struts >= 0:1.3.8
BuildRequires:  webwork
BuildRequires:  xml-commons-jaxp-1.3-apis
BuildRequires:  xom
BuildRequires:  xwork

Requires:  java >= 0:1.4.2
Requires:  backport-util-concurrent
Requires:  bsf
Requires:  jakarta-commons-logging
Requires:  dom4j
Requires:  google-guice
Requires:  hibernate2
Requires:  hibernate3
Requires:  hibernate3-entitymanager
Requires:  jdom
Requires:  jsp_2_0_api
Requires:  myfaces
Requires:  servlet_2_4_api
Requires:  servlet_2_5_api
Requires:  spring2-all
Requires:  spring2-webmvc
Requires:  struts >= 0:1.3.8
Requires:  webwork
Requires:  xml-commons-jaxp-1.3-apis
Requires:  xom
Requires:  xwork
%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:          java-gcj-compat-devel
Requires(post):         java-gcj-compat
Requires(postun):       java-gcj-compat
%endif
%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
DWR allows Javascript in a browser to interact with Java on
a server and helps you manipulate web pages with the results.
DWR is Easy Ajax for Java.

%package        javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description    javadoc
%{summary}.

%prep
%setup -q -c -n %{name}-%{version}
for j in $(find . -name "*.jar"); do
      mv $j $j.no
done
rm -rf java/org/directwebremoting/webwork/
%patch0 -b .sav0

%build
pushd jar
ln -s $(build-classpath backport-util-concurrent)
ln -s $(build-classpath bsf)
ln -s $(build-classpath commons-logging)
ln -s $(build-classpath dom4j)
ln -s $(build-classpath google-guice)
ln -s $(build-classpath hibernate2)
ln -s $(build-classpath hibernate3)
ln -s $(build-classpath hibernate3-entitymanager)
#ln -s $(build-classpath hostedqa)
ln -s $(build-classpath jdom)
ln -s $(build-classpath jetty6/jetty6)
ln -s $(build-classpath jetty6/jetty6-util)
ln -s $(build-classpath jsp_2_0_api)
#ln -s $(build-classpath junit)
ln -s $(build-classpath myfaces/myfaces-jsf-api)
ln -s $(build-classpath servlet_2_4_api)
ln -s $(build-classpath servlet_2_5_api)
ln -s $(build-classpath spring2)
ln -s $(build-classpath spring2/webmvc)
ln -s $(build-classpath struts)
ln -s $(build-classpath webwork)
ln -s $(build-classpath xml-commons-jaxp-1.3-apis)
ln -s $(build-classpath xom)
ln -s $(build-classpath xwork)
popd
mkdir -p web/WEB-INF/lib
ant \
    -Djava.13.home=%{_jvmdir}/java-1.4.2 \
    -Djava.15.home=%{_jvmdir}/java-1.5.0 \
    files

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -Dpm 644 target/ant/%{name}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

install -Dpm 644 target/ant/%{name}.war \
      $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/%{name}.war

# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/ant/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%if %{gcj_support}
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(0644,root,root,0755)
%{_javadir}/*.jar
%doc LICENSE.txt
%{_datadir}/%{name}-%{version}
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%changelog
* Wed Jan 21 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.0.5-1.jpp5
- 2.0.5

* Tue May 15 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.1.3-2jpp
- Fix aot build
- Make Vendor, Distribution based on macro

* Thu Oct 05 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1.3-1jpp
- First release
- Add post/postun Requires for javadoc
- Add gcj_support option


--- NEW FILE: dwr-2.0.5-to138-StrutsCreator.patch ---
--- java/org/directwebremoting/struts/StrutsCreator.java.sav	2009-01-21 21:48:14.000000000 +0100
+++ java/org/directwebremoting/struts/StrutsCreator.java	2009-01-21 21:49:11.000000000 +0100
@@ -22,7 +22,7 @@
 
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.config.ModuleConfig;
-import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ModuleUtils;
 import org.directwebremoting.WebContext;
 import org.directwebremoting.WebContextFactory;
 import org.directwebremoting.create.AbstractCreator;
@@ -111,7 +111,7 @@
                         request = new FakeHttpServletRequest();
                     }
 
-                    moduleConfig = RequestUtils.getModuleConfig(request, wc.getServletContext());
+                    moduleConfig = ModuleUtils.getInstance().getModuleConfig(request, wc.getServletContext());
                 }
             }
         }




More information about the JPackage-commits mailing list