From 33fa56507b281dc225d489bbfba3ee78f3d6c411 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 16:00:11 +0000
Subject: auto-import changelog data from castor-0.9.5-1jpp_3rh.src.rpm

0.9.5-1jpp_3rh
- use servletapi5 instead of servletapi4
0.9.5-1jpp_2rh
- try servletapi4 instead of servletapi3
- add example-servletapi4 patch

---

diff --git a/castor.spec b/castor.spec
index d212685..fd3fd71 100644
--- a/castor.spec
+++ b/castor.spec
@@ -1,6 +1,6 @@
 %define name            castor
 %define version         0.9.5
-%define release         1jpp_2rh
+%define release         1jpp_3rh
 %define section         free
 
 Summary:        An open source data binding framework for Java
@@ -13,6 +13,7 @@ License:        Exolab Software License
 URL:            http://castor.exolab.org/
 Source0:        ftp://ftp.exolab.org/pub/castor/castor_0.9.5/castor-0.9.5-src.tgz
 Patch0:		example-servletapi4.patch
+Patch1:		example-servletapi5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 #Vendor:         JPackage Project
 #Distribution:   JPackage
@@ -47,8 +48,8 @@ some more.
 Group:          Development/Java
 Summary:        Demo for %{name}
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       servletapi4
-BuildRequires:  servletapi4 
+Requires:       servletapi5
+BuildRequires:  servletapi5 
 
 %description demo
 Demonstrations and samples for %{name}.
@@ -93,9 +94,10 @@ src/main/org/exolab/castor/util/XercesRegExpEvaluator.java
 find . -name "*.java" -exec perl -p -i -e 's|assert\(|assertTrue\(|g;' {} \;
 find . -name "*.java" -exec perl -p -i -e 's|_test.name\(\)|_test.getName\(\)|g;' {} \;
 %patch0
+%patch1
 
 %build
-export CLASSPATH=%(build-classpath adaptx jdbc-stdext jndi jta junit ldapjdk oro regexp servletapi4 xerces-j2)
+export CLASSPATH=%(build-classpath adaptx jdbc-stdext jndi jta junit ldapjdk oro regexp servletapi5 xerces-j2)
 ant -buildfile src/build.xml jar
 ant -buildfile src/build.xml examples
 ant -buildfile src/build.xml CTFjar
@@ -169,8 +171,12 @@ fi
 %doc build/doc/*
 
 %changelog
-* Mon Mar  8 2004 Frank Ch. Eigler <fche@redhat.com> 0:0.9.5-1jpp_2rh
+* Fri Jul 23 2004 Fernando Nasser <fnasser@redhat.com> 0:0.9.5-1jpp_3rh
+- use servletapi5 instead of servletapi4
+
+* Thu Mar 11 2004 Frank Ch. Eigler <fche@redhat.com> 0:0.9.5-1jpp_2rh
 - try servletapi4 instead of servletapi3
+- add example-servletapi4 patch
 
 * Thu Mar  4 2004 Frank Ch. Eigler <fche@redhat.com> 0:0.9.5-1jpp_1rh
 - RH vacuuming
diff --git a/example-servletapi5.patch b/example-servletapi5.patch
new file mode 100644
index 0000000..7e1ceaf
--- /dev/null
+++ b/example-servletapi5.patch
@@ -0,0 +1,28 @@
+--- src/examples/servlet/XMLServlet.java.orig	2004-07-23 18:45:59.000000000 -0400
++++ src/examples/servlet/XMLServlet.java	2004-07-23 19:01:30.000000000 -0400
+@@ -277,6 +277,12 @@
+         }
+ 
+ 
++        public void setCharacterEncoding( String enc )
++        {
++            _response.setCharacterEncoding( enc );
++        }
++
++
+         public ServletOutputStream getOutputStream()
+             throws IOException
+         {
+@@ -297,6 +303,12 @@
+         }
+ 
+ 
++        public String getContentType()
++        {
++            return _response.getContentType();
++        }
++
++
+         public void setContentType( String type )
+         {
+             _response.setContentType( type );