[Jpackage-commits] rpms/free/jakarta-commons-dbcp commons-dbcp-1.2.1-TestConnectionPool.patch, 1.1, 1.2 commons-dbcp-1.2.1-TestJOCLed.patch, 1.1, 1.2 commons-dbcp-1.2.1-jdk6.patch, NONE, 1.1 commons-dbcp-1.2.1-navigation_xml.patch, 1.1, 1.2 commons-dbcp-1.2.1-project_properties.patch, 1.1, 1.2 commons-dbcp-1.2.1-project_xml.patch, 1.1, 1.2 commons-dbcp-1.2.1-sourcever.patch, NONE, 1.1 commons-dbcp-1.2.1.pom, NONE, 1.1 commons-dbcp-1.2.2-project_xml.patch, 1.2, NONE commons-dbcp-1.2.2.pom, 1.2, NONE dbcp-1.2.1-jpp-depmap.xml, 1.1, 1.2 dbcp-1.2.2-jpp-depmap.xml, 1.2, NONE dbcp-tomcat5-build.xml, 1.3, 1.4 jakarta-commons-dbcp.spec, 1.7, 1.8

jpackage jpackage at ryu.zarb.org
Thu Feb 5 09:20:28 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/jakarta-commons-dbcp
In directory ryu.zarb.org:/tmp/1TNlgpGBbF/rpms/free/jakarta-commons-dbcp

Modified Files:
	dbcp-tomcat5-build.xml jakarta-commons-dbcp.spec 
Added Files:
	commons-dbcp-1.2.1-TestConnectionPool.patch 
	commons-dbcp-1.2.1-TestJOCLed.patch 
	commons-dbcp-1.2.1-jdk6.patch 
	commons-dbcp-1.2.1-navigation_xml.patch 
	commons-dbcp-1.2.1-project_properties.patch 
	commons-dbcp-1.2.1-project_xml.patch 
	commons-dbcp-1.2.1-sourcever.patch commons-dbcp-1.2.1.pom 
	dbcp-1.2.1-jpp-depmap.xml 
Removed Files:
	commons-dbcp-1.2.2-project_xml.patch commons-dbcp-1.2.2.pom 
	dbcp-1.2.2-jpp-depmap.xml 
Log Message:
1.2.1-14.jpp6

--- NEW FILE: commons-dbcp-1.2.1-project_properties.patch ---
--- project.properties.sav	2006-04-12 16:17:46.000000000 +0200
+++ project.properties	2006-04-12 16:17:55.000000000 +0200
@@ -6,7 +6,7 @@
 maven.javadoc.author=false
 maven.javadoc.links=http://java.sun.com/j2se/1.4.2/docs/api,http://jakarta.apache.org/commons/pool/apidocs
 
-maven.xdoc.jsl=../commons-build/commons-site.jsl
+maven.xdoc.jsl=commons-build/commons-site.jsl
 maven.xdoc.date=bottom
 maven.xdoc.poweredby.image=maven-feather.png
 maven.xdoc.version=${pom.currentVersion}

--- NEW FILE: commons-dbcp-1.2.1-sourcever.patch ---
diff -up ./build.xml.sav ./build.xml
--- ./build.xml.sav	2008-04-10 17:15:19.000000000 -0400
+++ ./build.xml	2008-04-10 17:16:54.000000000 -0400
@@ -48,6 +48,9 @@
       <property name="javac.debug" value="true"/>
       <property name="javac.deprecation" value="false"/>
 
+      <property name="source.version" value="1.5"/>
+      <property name="target.version" value="1.5"/>
+
       <available property="jndi.present" classname="javax.naming.Context"/>
       <available property="jdbc3.present" classname="java.sql.Savepoint"/>
    </target>
@@ -108,7 +111,8 @@
                noindex="false"
                nohelp="true"
                nonavbar="false"
-               serialwarn="false">
+               serialwarn="false"
+               source="${source.version}">
           <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
           <link href="http://jakarta.apache.org/commons/pool/apidocs"/>
       </javadoc>
@@ -123,7 +127,9 @@
              classpath="${classpath}"
              debug="${javac.debug}"
              deprecation="${javac.deprecation}"
-             optimize="${javac.optimize}">
+             optimize="${javac.optimize}"
+             source="${source.version}"
+             target="${target.version}">
          <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
              unless="jndi.present"/>
          <exclude name="org/apache/commons/dbcp/datasources/**"
@@ -139,7 +145,9 @@
              srcdir="${src.test.dir}"
              debug="${javac.debug}"
              deprecation="${javac.deprecation}"
-             optimize="${javac.optimize}">
+             optimize="${javac.optimize}"
+             source="${source.version}"
+             target="${target.version}">
         <classpath>
           <pathelement location="${build.classes.dir}" /> 
           <pathelement location="${build.test-classes.dir}" /> 

Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jakarta-commons-dbcp/jakarta-commons-dbcp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** jakarta-commons-dbcp.spec	15 Jul 2008 21:12:39 -0000	1.7
--- jakarta-commons-dbcp.spec	5 Feb 2009 08:20:26 -0000	1.8
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
***************
*** 29,40 ****
  #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with maven
  
! %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 base_name       dbcp
--- 29,39 ----
  #
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
! # If you don't want to build with maven, and use straight ant instead,
! # give rpmbuild option '--without maven'
  
! %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
! %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
  %define base_name       dbcp
***************
*** 43,53 ****
  
  Name:           jakarta-commons-dbcp
! Version:        1.2.2
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Jakarta Commons DataBase Pooling Package
! License:        ASL 2.0
  Group:          Development/Libraries/Java
! Source0:        http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
  Source1:        pom-maven2jpp-depcat.xsl
  Source2:        pom-maven2jpp-newdepmap.xsl
--- 42,52 ----
  
  Name:           jakarta-commons-dbcp
! Version:        1.2.1
! Release:        14%{?dist}
  Epoch:          0
  Summary:        Jakarta Commons DataBase Pooling Package
! License:        Apache Software License 
  Group:          Development/Libraries/Java
! Source0:        http://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz
  Source1:        pom-maven2jpp-depcat.xsl
  Source2:        pom-maven2jpp-newdepmap.xsl
***************
*** 55,64 ****
  Source4:        %{base_name}-%{version}-jpp-depmap.xml
  Source5:        commons-build.tar.gz
  Source6:        dbcp-tomcat5-build.xml
! Source7:        commons-dbcp-1.2.2.pom
  
! Patch0:         commons-dbcp-1.2.2-project_xml.patch
  
- Url:            http://commons.apache.org/dbcp/
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  jpackage-utils > 1.7.2
--- 54,72 ----
  Source4:        %{base_name}-%{version}-jpp-depmap.xml
  Source5:        commons-build.tar.gz
+ # svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
+ # tar czf commons-build.tar.gz commons-build
  Source6:        dbcp-tomcat5-build.xml
! Source7:        http://repo1.maven.org/maven2/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.pom
  
! Patch0:         commons-dbcp-1.2.1-project_xml.patch
! Patch1:         commons-dbcp-1.2.1-TestJOCLed.patch
! Patch2:         commons-dbcp-1.2.1-TestConnectionPool.patch
! Patch3:         commons-dbcp-1.2.1-navigation_xml.patch
! Patch4:         commons-dbcp-1.2.1-project_properties.patch
! Patch5:         commons-dbcp-1.2.1-sourcever.patch
! Patch6:		commons-dbcp-1.2.1-jdk6.patch
! 
! Url:            http://jakarta.apache.org/commons/%{base_name}
  
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  jpackage-utils > 1.7.2
***************
*** 77,81 ****
  BuildRequires:  maven-plugins-base
  BuildRequires:  maven-plugin-artifact
- BuildRequires:  maven-plugin-checkstyle
  BuildRequires:  sf-cobertura-maven-plugin
  BuildRequires:  sf-findbugs-maven-plugin
--- 85,88 ----
***************
*** 87,108 ****
  BuildRequires:  saxon
  BuildRequires:  saxon-scripts
  %endif
  
! Requires(post):  %{_sbindir}/update-alternatives
! Requires(preun):  %{_sbindir}/update-alternatives
! Requires:       jakarta-commons-collections
! Requires:       jakarta-commons-pool
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
- BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
- Provides:       %{short_name} = %{epoch}:%{version}-%{release}
- Provides:  hibernate_jdbc_cache = %{epoch}:%{version}-%{release}
- Obsoletes:      %{short_name} < %{epoch}:%{version}-%{release}
  
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  %if %{gcj_support}
  BuildRequires:          java-gcj-compat-devel
  %endif
  
--- 94,120 ----
  BuildRequires:  saxon
  BuildRequires:  saxon-scripts
+ BuildRequires:  plexus-containers-component-api >= 1.0-0.a34
  %endif
  
! 
! Requires(post):  /usr/sbin/update-alternatives
! Requires(preun):  /usr/sbin/update-alternatives
! Requires(post):    jpackage-utils >= 1.7.2
! Requires(postun):  jpackage-utils >= 1.7.2
! Requires:       jakarta-commons-collections >= 2.0
! Requires:       jakarta-commons-pool >= 1.1
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
  
! BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! Provides:   %{short_name} = %{epoch}:%{version}-%{release}
! Provides:   hibernate_jdbc_cache = %{epoch}:%{version}-%{release}
! Obsoletes:  %{short_name} < %{epoch}:%{version}-%{release}
! 
  %if %{gcj_support}
  BuildRequires:          java-gcj-compat-devel
+ Requires(post):         java-gcj-compat
+ Requires(postun):       java-gcj-compat
  %endif
  
***************
*** 126,129 ****
--- 138,143 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires(post):   /bin/rm,/bin/ln
+ Requires(postun): /bin/rm
  
  %description javadoc
***************
*** 134,141 ****
  Group:          Development/Libraries/Java
  
  %description tomcat5
  DBCP dependency for Tomcat5
  
! %if %with maven
  %package manual
  Summary:        Documents for %{name}
--- 148,160 ----
  Group:          Development/Libraries/Java
  
+ %if %{gcj_support}
+ Requires(post):         java-gcj-compat
+ Requires(postun):       java-gcj-compat
+ %endif
+ 
  %description tomcat5
  DBCP dependency for Tomcat5
  
! %if %{with_maven}
  %package manual
  Summary:        Documents for %{name}
***************
*** 147,180 ****
  
  %prep
! %setup -q -n %{short_name}-%{version}-src
! %setup -q -n %{short_name}-%{version}-src -T -D -a 5
  # quick hack
  cp LICENSE.txt ../LICENSE
  # remove all binary libs
  find . -name "*.jar" -exec rm -f {} \;
! cp -p %{SOURCE6} .
  
  %patch0 -b .sav
! 
! if [ ! -f %{SOURCE4} ]; then
!    export DEPCAT=$(pwd)/%{base_name}-%{version}-depcat.new.xml
!    echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
!    echo '<depset>' >> $DEPCAT
!    for p in $(find . -name project.xml); do
!        pushd $(dirname $p)
!        %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT
!        popd
!    done
!    echo >> $DEPCAT
!    echo '</depset>' >> $DEPCAT
!    %{_bindir}/saxon $DEPCAT %{SOURCE2} > %{base_name}-%{version}-depmap.new.xml
! fi
  
  %build
! %if %with maven
  for p in $(find . -name project.xml); do
      pushd $(dirname $p)
      cp project.xml project.xml.orig
!     %{_bindir}/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
      popd
  done
--- 166,213 ----
  
  %prep
! cat <<EOT
! 
!                 If you dont want to build with maven,
!                 give rpmbuild option '--without maven'
! 
! EOT
! 
! %setup -q -n %{short_name}-%{version}
! %{__sed} -i 's/\r//' LICENSE.txt
! %{__sed} -i 's/\r//' NOTICE.txt
! %{__sed} -i 's/\r//' README.txt
  # quick hack
  cp LICENSE.txt ../LICENSE
  # remove all binary libs
  find . -name "*.jar" -exec rm -f {} \;
! gzip -dc %{SOURCE5} | tar xf -
! cp %{SOURCE6} .
  
  %patch0 -b .sav
! %patch1 -b .sav
! %patch2 -b .sav
! %patch3 -b .sav
! %patch4 -b .sav
! %patch5 -b .sav
! %patch6
  
  %build
! %if %{with_maven}
! export DEPCAT=$(pwd)/%{base_name}-%{version}-depcat.new.xml
! echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
! echo '<depset>' >> $DEPCAT
! for p in $(find . -name project.xml); do
!     pushd $(dirname $p)
!     /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
!     popd
! done
! echo >> $DEPCAT
! echo '</depset>' >> $DEPCAT
! /usr/bin/saxon $DEPCAT %{SOURCE2} > %{base_name}-%{version}-depmap.new.xml
! 
  for p in $(find . -name project.xml); do
      pushd $(dirname $p)
      cp project.xml project.xml.orig
!     /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
      popd
  done
***************
*** 187,205 ****
          -Dmaven.repo.remote=file:/usr/share/maven/repository \
          -Dmaven.home.local=$(pwd)/.maven \
!         jar javadoc xdoc:transform
  %else
! 
  ant \
          -Dcommons-pool.jar=$(build-classpath commons-pool) \
!         -Djdbc20ext.jar=$(build-classpath jdbc-stdext) \
          -Djunit.jar=$(build-classpath junit) \
!         -Dxerces.jar=$(build-classpath xerces-j2) \
!         -Dxml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis) \
!         -Dnaming-common.jar=$(build-classpath tomcat5/naming-resources) \
!         -Dnaming-java.jar=$(build-classpath tomcat5/naming-factory) \
!         -Dlogging.jar=$(build-classpath commons-logging) \
          -Djava.io.tmpdir=. \
!         dist test
! 
  %endif
  
--- 220,238 ----
          -Dmaven.repo.remote=file:/usr/share/maven/repository \
          -Dmaven.home.local=$(pwd)/.maven \
!         jar javadoc \
! #	xdoc:transform  #Unable to obtain goal [xdoc:transform]
  %else
! export JAVA_HOME=/usr/lib/jvm/java-1.6.0
! export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2)
  ant \
+         -Dbuild.sysclasspath=first \
          -Dcommons-pool.jar=$(build-classpath commons-pool) \
!         -Dcommons-collections.jar=$(build-classpath commons-collections) \
          -Djunit.jar=$(build-classpath junit) \
!         -Djndi.jar=$(build-classpath jndi) \
!         -Dsax2.jar=$(build-classpath xml-commons-apis) \
          -Djava.io.tmpdir=. \
!         dist
! # test
  %endif
  
***************
*** 211,215 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! %if %with maven
  install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %else
--- 244,248 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! %if %{with_maven}
  install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %else
***************
*** 222,235 ****
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
- %add_to_maven_depmap commons-dbcp commons-dbcp %{version} JPP %{name}
- 
- # pom
- install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
- install -pm 644 %{SOURCE7} \
-     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
- 
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %if %with maven
  cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  rm -rf target/docs/apidocs
--- 255,261 ----
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %if %{with_maven}
  cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  rm -rf target/docs/apidocs
***************
*** 239,246 ****
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
! %if %with maven
  # manual
  install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  %endif
  
--- 265,272 ----
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
! %if %{with_maven}
  # manual
  install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! #cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  %endif
  
***************
*** 249,258 ****
  
  # hibernate_jdbc_cache ghost symlink
! ln -s %{_sysconfdir}/alternatives \
!   $RPM_BUILD_ROOT%{_javadir}/hibernate_jdbc_cache.jar
  
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 275,286 ----
  
  # hibernate_jdbc_cache ghost symlink
! touch $RPM_BUILD_ROOT%{_javadir}/hibernate_jdbc_cache.jar
  
+ # Install pom file
+ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+ cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-jakarta-commons-dbcp.pom
+ %add_to_maven_depmap commons-dbcp commons-dbcp %{version} JPP jakarta-commons-dbcp
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 304,309 ****
  
  %files
! %defattr(0644,root,root,0755)
! %doc LICENSE.txt
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
--- 332,339 ----
  
  %files
! %defattr(-,root,root)
! %doc LICENSE.txt NOTICE.txt README.txt
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  %{_javadir}/%{name}.jar
  %{_javadir}/%{name}-%{version}.jar
***************
*** 311,324 ****
  %{_javadir}/%{short_name}-%{version}.jar
  %ghost %{_javadir}/hibernate_jdbc_cache.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
! %attr(0644,root,root,0755) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
  %files tomcat5
! %defattr(0644,root,root,0755)
  %{_javadir}/*-tomcat5*.jar
  %if %{gcj_support}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/*-tomcat5*
--- 341,354 ----
  %{_javadir}/%{short_name}-%{version}.jar
  %ghost %{_javadir}/hibernate_jdbc_cache.jar
! 
  %if %{gcj_support}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
  %files tomcat5
! %defattr(-,root,root)
  %{_javadir}/*-tomcat5*.jar
+ %doc LICENSE.txt NOTICE.txt
+ 
  %if %{gcj_support}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/*-tomcat5*
***************
*** 326,334 ****
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
! %if %with maven
  %files manual
  %defattr(0644,root,root,0755)
--- 356,364 ----
  
  %files javadoc
! %defattr(-,root,root)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
! %if %{with_maven}
  %files manual
  %defattr(0644,root,root,0755)
***************
*** 337,364 ****
  
  %changelog
! * Tue Jul 15 2008 David Walluck <dwalluck at redhat.com> 0:1.2.2-2
! - relax version requirements
! - remove javadoc scriptlets
! - GCJ fixes
! - update License
! - update BuildRoot
! - use %%setup to unpack sources
! - use macros
! - fix file permissions
  
! * Tue Aug 28 2007 Ralph Apel <r.apel at r-apel.de> 0:1.2.2-1jpp
! - Upgrade to 1.2.2
! - Add pom and depmap frags
! - Adjust (B)Rs
  
! * Fri May 11 2007 Jason Corley <jason.corley at gmail.com> 0:1.2.1-12jpp
! - rebuild through mock and centos 4
! - replace vendor and distribution with macros
  
! * Thu May 03 2007 Ralph Apel <r.apel at r-apel.de> 0:1.2.1-11jpp
! - Silence prep
! - Avoid empty post/postun
! - Restore Vendor and Distribution
! - Fix project_properties.patch to meet new plugins
  
  * Fri Feb 23 2007 Jason Corley <jason.corley at gmail.com> 0:1.2.1-10jpp
--- 367,399 ----
  
  %changelog
! * Thu Feb 05 2009 Yong Yang <yyang at redhat.com> - 0:1.2.1-14
! - Fix release tag
! - BR plexus-containers-component-api explicitly 
  
! * Thu Jan 15 2009 Yong Yang <yyang at redhat.com> - 0:1.2.1-13jpp.4 
! - re-build with maven
! - Disabled manual subpackage, because maven failed to run xdoc:transform
  
! * Fri Jan 09 2009 Yong Yang <yyang at redhat.com> - 0:1.2.1-12jpp.4
! - Imported from dbhole's maven 2.0.8 packages
! - Add jdk6 patch
  
! * Thu Apr 10 2008 Deepak Bhole <dbhole at redhat.com> - 0:1.2.1-11jpp.4
! - Update to 1.2.2
! - Add a pom file for the project
! 
! * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.2.1-11jpp.3
! - Autorebuild for GCC 4.3
! 
! * Thu Nov 22 2007 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-10jpp.3
! - Fix dangling symlink. bz#388801
! 
! * Thu Sep 20 2007 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-10jpp.2
! - Rebuild
! 
! * Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> 0:1.2.1-10jpp.1
! - Merger with newest jpp version
! - Fix rpmlint issues
! - Disable testThreaded for now as it will sometimes fail
  
  * Fri Feb 23 2007 Jason Corley <jason.corley at gmail.com> 0:1.2.1-10jpp
***************
*** 375,385 ****
  - Add missing maven plugin dependencies
  
! * Thu Aug 17 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-7jpp
  - Added missing postun section.
  
! * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-6jpp
  - Added missing requirements.
  
! * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-5jpp
  - Added conditional native compilation.
  
--- 410,429 ----
  - Add missing maven plugin dependencies
  
! * Thu Aug 17 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-7jpp.1
  - Added missing postun section.
  
! * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-6jpp.1
  - Added missing requirements.
  
! * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.2.1-5jpp_4fc
! - Requires(post/postun): coreutils
! 
! * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.2.1-5jpp_3fc
! - Rebuilt
! 
! * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-5jpp_2fc
! - Rebuild.
! 
! * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-5jpp_1fc
  - Added conditional native compilation.
  

--- dbcp-1.2.2-jpp-depmap.xml DELETED ---

--- NEW FILE: commons-dbcp-1.2.1-navigation_xml.patch ---
--- xdocs/navigation.xml.sav	2006-04-12 16:11:56.000000000 +0200
+++ xdocs/navigation.xml	2006-04-12 16:12:07.000000000 +0200
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<!DOCTYPE org.apache.commons.menus SYSTEM '../../commons-build/menus/menus.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM '../commons-build/menus/menus.dtd'>
 <project name="Commons DBCP">
     <title>Commons DBCP</title>
     <body>

--- commons-dbcp-1.2.2.pom DELETED ---

--- NEW FILE: dbcp-1.2.1-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
   <dependency>
      <maven>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <version>2.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>commons-collections</artifactId>
         <jar>commons-collections.jar</jar>
         <version>2.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
         <version>1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>commons-pool</artifactId>
         <jar>commons-pool.jar</jar>
         <version>1.2</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>jdbc</groupId>
         <artifactId>jdbc</artifactId>
         <version>2.0</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>jdbc</artifactId>
         <jar>jdbc.jar</jar>
         <version>2.0</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit</artifactId>
         <jar>junit.jar</jar>
         <version>3.8.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>xerces</groupId>
         <artifactId>xerces</artifactId>
         <version>2.0.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>xerces</artifactId>
         <jar>xerces-j2.jar</jar>
         <version>2.0.2</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
         <version>2.0.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>xml-apis</artifactId>
         <jar>xml-commons-apis.jar</jar>
         <version>2.0.2</version>
      </jpp>
   </dependency>
</depset>

--- commons-dbcp-1.2.2-project_xml.patch DELETED ---

Index: dbcp-tomcat5-build.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jakarta-commons-dbcp/dbcp-tomcat5-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** dbcp-tomcat5-build.xml	15 Jul 2008 21:12:39 -0000	1.3
--- dbcp-tomcat5-build.xml	5 Feb 2009 08:20:26 -0000	1.4
***************
*** 9,13 ****
     <property name="compile.debug" value="true"/>
     <property name="compile.deprecation" value="false"/>
!    <property name="compile.source" value="1.4"/>
  
     <target name="clean">
--- 9,13 ----
     <property name="compile.debug" value="true"/>
     <property name="compile.deprecation" value="false"/>
!    <property name="compile.source" value="1.5"/>
  
     <target name="clean">

--- NEW FILE: commons-dbcp-1.2.1-jdk6.patch ---
diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iml ./commons-dbcp-1.2.1.iml
--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iml	1970-01-01 08:00:00.000000000 +0800
+++ ./commons-dbcp-1.2.1.iml	2009-01-14 17:42:00.000000000 +0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.ipr ./commons-dbcp-1.2.1.ipr
--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.ipr	1970-01-01 08:00:00.000000000 +0800
[...3179 lines suppressed...]
+    public boolean isClosed() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setPoolable(boolean poolable) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isPoolable() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }

--- NEW FILE: commons-dbcp-1.2.1-TestConnectionPool.patch ---
--- src/test/org/apache/commons/dbcp/TestConnectionPool.java.sav	2004-06-12 09:42:21.000000000 -0400
+++ src/test/org/apache/commons/dbcp/TestConnectionPool.java	2007-03-21 15:08:56.000000000 -0400
@@ -21,6 +21,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Stack;
 
 import junit.framework.TestCase;
 
@@ -37,7 +38,7 @@
  * @author Sean C. Sullivan
  * @author John McNally
  * @author Dirk Verbeeck
- * @version $Revision: 1.2 $ $Date: 2009/02/05 08:20:26 $
+ * @version $Revision: 1.2 $ $Date: 2009/02/05 08:20:26 $
  */
 public abstract class TestConnectionPool extends TestCase {
     public TestConnectionPool(String testName) {
@@ -50,6 +51,17 @@
 
     public void tearDown() throws Exception {
         super.tearDown();
+        // Close any connections opened by the test
+        while (!connections.isEmpty()) {
+            Connection conn = (Connection) connections.pop();
+            try {
+                conn.close();
+            } catch (Exception ex) { 
+                // ignore
+            } finally {
+                conn = null;
+            }
+        }
     }
 
     protected abstract Connection getConnection() throws Exception;
@@ -62,6 +74,16 @@
         return 100L;
     }
 
+    /** Connections opened during the course of a test */
+    protected Stack connections = new Stack();
+    
+    /** Acquire a connection and push it onto the connections stack */
+    protected Connection newConnection() throws Exception {
+        Connection connection = getConnection();
+        connections.push(connection);
+        return connection;
+    }
+
     // ----------- Utility Methods --------------------------------- 
 
     protected String getUsername(Connection conn) throws SQLException {
@@ -78,7 +100,7 @@
     public void testClearWarnings() throws Exception {
         Connection[] c = new Connection[getMaxActive()];
         for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
+            c[i] = newConnection();
             assertTrue(c[i] != null);
             
             // generate SQLWarning on connection
@@ -94,7 +116,7 @@
         }
         
         for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
+            c[i] = newConnection();
         }        
 
         for (int i = 0; i < c.length; i++) {
@@ -109,7 +131,7 @@
 
     public void testIsClosed() throws Exception {
         for(int i=0;i<getMaxActive();i++) {
-            Connection conn = getConnection();
+            Connection conn = newConnection();
             assertTrue(null != conn);
             assertTrue(!conn.isClosed());
             PreparedStatement stmt = conn.prepareStatement("select * from dual");
@@ -126,7 +148,7 @@
 
     public void testCantCloseConnectionTwice() throws Exception {
         for(int i=0;i<getMaxActive();i++) { // loop to show we *can* close again once we've borrowed it from the pool again
-            Connection conn = getConnection();
+            Connection conn = newConnection();
             assertTrue(null != conn);
             assertTrue(!conn.isClosed());
             conn.close();
@@ -142,7 +164,7 @@
     }
 
     public void testCantCloseStatementTwice() throws Exception {
-        Connection conn = getConnection();
+        Connection conn = newConnection();
         assertTrue(null != conn);
         assertTrue(!conn.isClosed());
         for(int i=0;i<2;i++) { // loop to show we *can* close again once we've borrowed it from the pool again
@@ -160,7 +182,7 @@
     }
 
     public void testSimple() throws Exception {
-        Connection conn = getConnection();
+        Connection conn = newConnection();
         assertTrue(null != conn);
         PreparedStatement stmt = conn.prepareStatement("select * from dual");
         assertTrue(null != stmt);
@@ -174,7 +196,7 @@
 
     public void testRepeatedBorrowAndReturn() throws Exception {
         for(int i=0;i<100;i++) {
-            Connection conn = getConnection();
+            Connection conn = newConnection();
             assertTrue(null != conn);
             PreparedStatement stmt = conn.prepareStatement("select * from dual");
             assertTrue(null != stmt);
@@ -188,7 +210,7 @@
     }
 
     public void testSimple2() throws Exception {
-        Connection conn = getConnection();
+        Connection conn = newConnection();
         assertTrue(null != conn);
         {
             PreparedStatement stmt = conn.prepareStatement("select * from dual");
@@ -216,7 +238,7 @@
             ; // expected
         }
 
-        conn = getConnection();
+        conn = newConnection();
         assertTrue(null != conn);
         {
             PreparedStatement stmt = conn.prepareStatement("select * from dual");
@@ -241,47 +263,51 @@
     }
 
     public void testPooling() throws Exception {
-        Connection conn = getConnection();
-        Connection underconn = null;
-        if(conn instanceof DelegatingConnection) {
-            underconn = ((DelegatingConnection)conn).getInnermostDelegate();
+        // Grab a maximal set of open connections from the pool
+        Connection[] c = new Connection[getMaxActive()];
+        Connection[] u = new Connection[getMaxActive()];
+        for (int i = 0; i < c.length; i++) {
+            c[i] = newConnection();
+            if (c[i] instanceof DelegatingConnection) {
+                u[i] = ((DelegatingConnection) c[i]).getInnermostDelegate();
         } else {
-            return; // skip this test
+                for (int j = 0; j <= i; j++) {
+                    c[j].close();
         }
-        assertTrue(underconn != null);
-        Connection conn2 = getConnection();
-        Connection underconn2 = null;
-        if(conn2 instanceof DelegatingConnection) {
-            underconn2 = ((DelegatingConnection)conn2).getInnermostDelegate();
-        } else {
             return; // skip this test
         }
-        assertTrue(underconn2 != null);
-        assertTrue(underconn != underconn2);
-        conn2.close();
-        conn.close();
-        Connection conn3 = getConnection();
-        Connection underconn3 = null;
-        if(conn3 instanceof DelegatingConnection) {
-            underconn3 = ((DelegatingConnection)conn3).getInnermostDelegate();
-        } else {
-            return; // skip this test
         }
-        assertTrue( underconn3 == underconn || underconn3 == underconn2 );
-        conn3.close();
+        // Close connections one at a time and get new ones, making sure
+        // the new ones come from the pool
+        for (int i = 0; i < c.length; i++) {
+            c[i].close();
+            Connection con = newConnection();
+            Connection underCon = 
+                ((DelegatingConnection) con).getInnermostDelegate();
+            assertTrue("Failed to get connection", underCon != null);
+            boolean found = false;
+            for (int j = 0; j < c.length; j++) {
+                if (underCon == u[j]) {
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue("New connection not from pool", found);
+            con.close();
+        }
     }
     
     public void testAutoCommitBehavior() throws Exception {
-        Connection conn = getConnection();
+        Connection conn = newConnection();
         assertTrue(conn != null);
         assertTrue(conn.getAutoCommit());
         conn.setAutoCommit(false);
         conn.close();
         
-        Connection conn2 = getConnection();
+        Connection conn2 = newConnection();
         assertTrue( conn2.getAutoCommit() );
         
-        Connection conn3 = getConnection();
+        Connection conn3 = newConnection();
         assertTrue( conn3.getAutoCommit() );
 
         conn2.close();
@@ -293,7 +319,7 @@
     public void testConnectionsAreDistinct() throws Exception {
         Connection[] conn = new Connection[getMaxActive()];
         for(int i=0;i<conn.length;i++) {
-            conn[i] = getConnection();
+            conn[i] = newConnection();
             for(int j=0;j<i;j++) {
                 assertTrue(conn[j] != conn[i]);
                 assertTrue(!conn[j].equals(conn[i]));
@@ -309,7 +335,7 @@
         Connection[] c = new Connection[getMaxActive()];
         // test that opening new connections is not closing previous
         for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
+            c[i] = newConnection();
             assertTrue(c[i] != null);
             for (int j = 0; j <= i; j++) {
                 assertTrue(!c[j].isClosed());
@@ -325,7 +351,7 @@
         Connection[] c = new Connection[getMaxActive()];
         // open the maximum connections
         for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
+            c[i] = newConnection();
         }
 
         // close one of the connections
@@ -333,7 +359,7 @@
         assertTrue(c[0].isClosed());
 
         // get a new connection
-        c[0] = getConnection();
+        c[0] = newConnection();
 
         for (int i = 0; i < c.length; i++) {
             c[i].close();
@@ -343,12 +369,12 @@
     public void testMaxActive() throws Exception {
         Connection[] c = new Connection[getMaxActive()];
         for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
+            c[i] = newConnection();
             assertTrue(c[i] != null);
         }
 
         try {
-            getConnection();
+            newConnection();
             fail("Allowed to open more than DefaultMaxActive connections.");
         } catch (java.sql.SQLException e) {
             // should only be able to open 10 connections, so this test should
@@ -360,6 +386,8 @@
         }
     }
 
+    // Test Disabled due to random failures when using gcj.
+    /*
     public void testThreaded() {
         TestThread[] threads = new TestThread[getMaxActive()];
         for(int i=0;i<threads.length;i++) {
@@ -379,7 +407,7 @@
                 fail();
             }
         }
-    }
+    }
 */
 
     class TestThread implements Runnable {
         java.util.Random _random = new java.util.Random();
@@ -419,7 +447,7 @@
                 PreparedStatement stmt = null;
                 ResultSet rset = null;
                 try {
-                    conn = getConnection();
+                    conn = newConnection();
                     stmt = conn.prepareStatement("select 'literal', SYSDATE from dual");
                     rset = stmt.executeQuery();
                     try {
@@ -447,7 +475,7 @@
     // http://issues.apache.org/bugzilla/show_bug.cgi?id=24328
     public void testPrepareStatementOptions() throws Exception 
     {
-        Connection conn = getConnection();
+        Connection conn = newConnection();
         assertTrue(null != conn);
         PreparedStatement stmt = conn.prepareStatement("select * from dual", 
             ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
@@ -467,7 +495,7 @@
     // Bugzilla Bug 24966: NullPointer with Oracle 9 driver
     // wrong order of passivate/close when a rset isn't closed
     public void testNoRsetClose() throws Exception {
-        Connection conn = getConnection();
+        Connection conn = newConnection();
         assertNotNull(conn);
         PreparedStatement stmt = conn.prepareStatement("test");
         assertNotNull(stmt);
@@ -480,9 +508,9 @@
     
     // Bugzilla Bug 26966: Connectionpool's connections always returns same
     public void testHashCode() throws Exception {
-        Connection conn1 = getConnection();
+        Connection conn1 = newConnection();
         assertNotNull(conn1);
-        Connection conn2 = getConnection();
+        Connection conn2 = newConnection();
         assertNotNull(conn2);
 
         assertTrue(conn1.hashCode() != conn2.hashCode());

--- NEW FILE: commons-dbcp-1.2.1.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-dbcp</groupId>
  <artifactId>commons-dbcp</artifactId>
  <name>Commons DBCP</name>
  <version>1.2.1</version>
  <description>Commons Database Connection Pooling</description>
  <url>http://jakarta.apache.org/commons/dbcp/</url>
  <issueManagement>
    <url>http://issues.apache.org/bugzilla/</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <address>commons-dev at jakarta.apache.org</address>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>morgand</id>
      <name>Morgan Delagrange</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>geirm</id>
      <name>Geir Magnusson</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>craigmcc</id>
      <name>Craig McClanahan</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>jmcnally</id>
      <name>John McNally</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>mpoeschl</id>
      <name>Martin Poeschl</name>
      <email>mpoeschl at marmot.at</email>
      <organization>tucana.at</organization>
    </developer>
    <developer>
      <id>rwaldhoff</id>
      <name>Rodney Waldhoff</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dweinr1</id>
      <name>David Weinrich</name>
      <email></email>
      <organization></organization>
    </developer>
    <developer>
      <id>dirkv</id>
      <name>Dirk Verbeeck</name>
      <email></email>
      <organization></organization>
    </developer>
  </developers>
  <contributors>
    <contributor>
      <name>Todd Carmichael</name>
      <email>toddc at concur.com</email>
    </contributor>
    <contributor>
      <name>Wayne Woodfield</name>
    </contributor>
  </contributors>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:cvs:pserver:anoncvs at cvs.apache.org:/home/cvspublic:jakarta-commons/dbcp</connection>
    <url>http://cvs.apache.org/viewcvs/jakarta-commons/dbcp/</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <directory>${basedir}/src/test</directory>
        <includes>
          <include>testpool.jocl</include>
        </includes>
      </resource>
      <resource>
        <directory>${basedir}</directory>
        <targetPath>META-INF</targetPath>
        <includes>
          <include>NOTICE.txt</include>
        </includes>
      </resource>
    </resources>
    <testResources>
      <testResource>
        <directory>${basedir}/src/test</directory>
        <includes>
          <include>testpool.jocl</include>
        </includes>
      </testResource>
    </testResources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>org/apache/commons/dbcp/TestAbandonedObjectPool.java</include>
            <include>org/apache/commons/jocl/TestJOCLContentHandler.java</include>
            <include>org/apache/commons/dbcp/TestDelegatingConnection.java</include>
            <include>org/apache/commons/dbcp/TestDelegatingPreparedStatement.java</include>
            <include>org/apache/commons/dbcp/TestDelegatingStatement.java</include>
            <include>org/apache/commons/dbcp/TestJOCLed.java</include>
            <include>org/apache/commons/dbcp/TestManual.java</include>
            <include>org/apache/commons/dbcp/TestBasicDataSourceFactory.java</include>
            <include>org/apache/commons/dbcp/TestBasicDataSource.java</include>
            <include>org/apache/commons/dbcp/TestAbandonedBasicDataSource.java</include>
            <include>org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java</include>
            <include>org/apache/commons/dbcp/datasources/TestFactory.java</include>
            <include>org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java</include>
            <include>org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java</include>
          </includes>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>commons-collections</groupId>
      <artifactId>commons-collections</artifactId>
      <version>2.1</version>
    </dependency>
    <dependency>
      <groupId>commons-pool</groupId>
      <artifactId>commons-pool</artifactId>
      <version>1.2</version>
    </dependency>
    <dependency>
      <groupId>javax.sql</groupId>
      <artifactId>jdbc-stdext</artifactId>
      <version>2.0</version>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>2.0.2</version>
    </dependency>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xerces</artifactId>
      <version>2.0.2</version>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/dbcp/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/dbcp/</url>
    </site>
  </distributionManagement>
</project>
--- NEW FILE: commons-dbcp-1.2.1-project_xml.patch ---
--- ./project.xml.sav	2004-06-12 09:42:20.000000000 -0400
+++ ./project.xml	2006-07-20 17:14:46.000000000 -0400
@@ -219,6 +219,7 @@
       </resource>
       <resource>
         <targetPath>META-INF</targetPath>
+        <directory>${basedir}</directory>
         <includes>
           <include>NOTICE.txt</include>
         </includes>
@@ -227,7 +228,6 @@
   </build>
   
   <reports>
-    <report>maven-changelog-plugin</report>
     <report>maven-changes-plugin</report>
     <report>maven-developer-activity-plugin</report>
     <report>maven-file-activity-plugin</report>

--- NEW FILE: commons-dbcp-1.2.1-TestJOCLed.patch ---
--- src/test/org/apache/commons/dbcp/TestJOCLed.java.sav	2006-04-12 15:57:50.000000000 +0200
+++ src/test/org/apache/commons/dbcp/TestJOCLed.java	2006-04-12 15:58:27.000000000 +0200
@@ -45,6 +45,7 @@
     private PoolingDriver driver = null;
     
     public void setUp() throws Exception {
+        super.setUp();
         driver = new PoolingDriver();
         PoolingDriver.setAccessToUnderlyingConnectionAllowed(true);
     }
@@ -52,6 +53,7 @@
     public void tearDown() throws Exception {
         driver.closePool("testpool");
         DriverManager.deregisterDriver(driver);
+        super.tearDown();
     }
 
 }




More information about the JPackage-commits mailing list