commit jakarta-commons-dbcp

29 Jul 2008

Hello community,

here is the log from the commit of package jakarta-commons-dbcp
checked in at Wed Jul 30 00:58:22 CEST 2008.


--------

--- jakarta-commons-dbcp/jakarta-commons-dbcp.changes	2008-04-09 09:46:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/jakarta-commons-dbcp/jakarta-commons-dbcp.changes	2008-07-29 09:10:59.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Jul 29 09:03:46 CEST 2008 - anosek@suse.cz
+
+- made the symlink jakarta-commons-dbcp -> jakarta-commons-dbcp-1.2.2
+  part of the javadoc package
+
+-------------------------------------------------------------------
+Mon Jul 21 13:04:46 CEST 2008 - mvyskocil@suse.cz
+
+- merged with jpackage 1.7 spec
+  - added a tomcat5 subpackage (to fix [bnc#408253])
+  - added a maven build branch (n/a in suse yet):
+    - added a poms and project.xmls for maven
+    - added a depmagfrags for maven
+- build againts tomcat6 (instead of tomcat5 as in original jpackage project)
+- add a java6 compatibility patch
+
+
+-------------------------------------------------------------------



New:
----
  commons-build.tar.bz2
  commons-dbcp-1.2.2.pom
  commons-dbcp-1.2.2-project_xml.patch
  dbcp-1.2.2-jpp-depmap.xml
  dbcp-tomcat5-build.xml
  java6-compatibility.patch
  pom-maven2jpp-depcat.xsl
  pom-maven2jpp-mapdeps.xsl
  pom-maven2jpp-newdepmap.xsl

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ jakarta-commons-dbcp.spec ++++++
--- /var/tmp/diff_new_pack.T17711/_old	2008-07-30 00:58:00.000000000 +0200
+++ /var/tmp/diff_new_pack.T17711/_new	2008-07-30 00:58:00.000000000 +0200
@@ -11,30 +11,66 @@
 # norootforbuild
 # icecream 0
 
-
-Name:           jakarta-commons-dbcp
-BuildRequires:  ant jakarta-commons-collections jakarta-commons-pool java-devel junit xml-commons-apis
+%define with_maven 0
 %define base_name	dbcp
 %define short_name	commons-%{base_name}
-%define name		jakarta-%{short_name}
-%define version		1.2.2
-%define release		3jpp
-%define	section		devel
+%define section         free
+
+Name:           jakarta-commons-dbcp
 Version:        1.2.2
-Release:        1
+Release:        52
 Summary:        Jakarta Commons DataBase Pooling Package
 License:        The Apache Software License
 Group:          Development/Libraries/Java
-Source0:        %{short_name}-%{version}-src.tar.bz2
+Source0:        http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.bz...
+Source1:        pom-maven2jpp-depcat.xsl
+Source2:        pom-maven2jpp-newdepmap.xsl
+Source3:        pom-maven2jpp-mapdeps.xsl
+Source4:        %{base_name}-%{version}-jpp-depmap.xml
+Source5:        commons-build.tar.bz2
+Source6:        dbcp-tomcat5-build.xml
+Source7:        commons-dbcp-1.2.2.pom
+Patch0:         commons-dbcp-1.2.2-project_xml.patch
+#improved from https://issues.apache.org/jira/browse/DBCP-191
+Patch1:         java6-compatibility.patch
 Url:            http://jakarta.apache.org/commons/dbcp/
-PreReq:         /usr/sbin/update-alternatives
-Requires:       jakarta-commons-collections >= 2.0
-Requires:       jakarta-commons-pool >= 1.1
+BuildRequires:  ant >= 1.6.5
+BuildRequires:  jpackage-utils > 1.7.2
+BuildRequires:  jakarta-commons-pool >= 1.3
+BuildRequires:  jakarta-commons-logging
+BuildRequires:  jdbc-stdext >= 2.0
+BuildRequires:  xerces-j2
+BuildRequires:  junit >= 3.8.1
+BuildRequires:  jakarta-commons-pool-tomcat5
+BuildRequires:  jakarta-commons-collections-tomcat5
+BuildRequires:  tomcat6-lib
+BuildRequires:  java-devel
+%if %{with_maven}
+BuildRequires:  maven >= 1.1
+BuildRequires:  maven-plugins-base
+BuildRequires:  maven-plugin-artifact
+BuildRequires:  maven-plugin-checkstyle
+BuildRequires:  sf-cobertura-maven-plugin
+BuildRequires:  sf-findbugs-maven-plugin
+BuildRequires:  maven-plugin-pmd
+BuildRequires:  maven-plugin-xdoc
+BuildRequires:  maven-plugin-test
+BuildRequires:  maven-plugin-license
+BuildRequires:  maven-plugin-changes
+BuildRequires:  saxon
+BuildRequires:  saxon-scripts
+%endif
+Requires(post):  /usr/sbin/update-alternatives
+Requires(preun):  /usr/sbin/update-alternatives
+Requires:       jakarta-commons-collections >= 3.2
+Requires:       jakarta-commons-pool >= 1.3
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       %{short_name}
 Provides:       hibernate_jdbc_cache
 Obsoletes:      %{short_name}
+Requires(post):    jpackage-utils >= 1.7.2
+Requires(postun):  jpackage-utils >= 1.7.2
 
 %description
 The DBCP package creates and maintains a database connection pool
@@ -49,9 +85,10 @@
 
 %package javadoc
 License:        The Apache Software License
-PreReq:         coreutils
 Summary:        Javadoc for jakarta-commons-dbcp
 Group:          Development/Libraries/Java
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 This package contains the javadoc documentation for the DBCP package.
@@ -66,27 +103,128 @@
 
 
 
+%package tomcat5
+License:        The Apache Software License
+Summary:        Jakarta Commons DataBase Pooling Package
+Group:          Development/Libraries/Java
+
+%description tomcat5
+The DBCP package creates and maintains a database connection pool
+package written in the Java language to be distributed under the ASF
+license. The package is available as a pseudo-JDBC driver and via a
+DataSource interface. The package also supports multiple logins to
+multiple database systems, reclamation of stale or dead connections,
+testing for valid connections, PreparedStatement pooling, and other
+features.
+
+
+
+%if %{with_maven}
+
+%package manual
+
+Summary:        Documents for %{name}
+Group:          Development/Documentation
+
+%description manual
+This package contains the documentation for the DBCP package.
+
+The DBCP package shall create and maintain a database connection pool
+package written in the Java language to be distributed under the ASF
+license. The package shall be available as a pseudo-JDBC driver and via
+a DataSource interface. The package shall also support multiple logins
+to multiple database systems, reclamation of stale or dead connections,
+testing for valid connections, PreparedStatement pooling, and other
+features.
+%endif
+
 %prep
 %setup -q -n %{short_name}-%{version}-src
 # quick hack
 cp LICENSE.txt ../LICENSE
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
+bzip2 -dc %{SOURCE5} | tar xf -
+cp %{SOURCE6} .
+%patch0 -b .sav
+%patch1 -b .sav1
+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)
+       /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
+fi
 
 %build
-#export CLASSPATH=$(build-classpath commons-collections commons-pool jdbc-stdext junit)
-export CLASSPATH=$(build-classpath commons-collections commons-pool junit)
-ant -Djava.io.tmpdir=. dist
+%if %{with_maven}
+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
+mkdir -p .maven/repository/JPP/jars
+pushd .maven/repository/JPP/jars
+    ln -sf $(build-classpath jdbc-stdext) jdbc.jar
+popd
+maven \
+        -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 tomcat6/catalina) \
+        -Dnaming-java.jar=$(build-classpath tomcat6/catalina) \
+        -Dlogging.jar=$(build-classpath commons-logging) \
+        -Djava.io.tmpdir=. \
+        dist test
+%endif
+export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2 commons-collections-tomcat5 commons-pool-tomcat5)        
+ant     -f dbcp-tomcat5-build.xml
 
 %install
 # 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
 install -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%endif
+#tomcat5 jars 
+install -m 644 dbcp-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|jakarta-||g"`; done)
 (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
+%else
 cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%endif
+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
 # quick hack clean up
 rm ../LICENSE
 # hibernate_jdbc_cache ghost symlink
@@ -99,6 +237,10 @@
 %post
 update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \
   hibernate_jdbc_cache %{_javadir}/%{name}.jar 60
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
 
 %preun
 {
@@ -109,14 +251,41 @@
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt
-%{_javadir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{short_name}.jar
+%{_javadir}/%{short_name}-%{version}.jar
 %ghost %{_javadir}/hibernate_jdbc_cache.jar
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
+
+%files tomcat5
+%defattr(-,root,root)
+%{_javadir}/*-tomcat5*.jar
 
 %files javadoc
 %defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
+%if %{with_maven}
+
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}
+%endif
 
 %changelog
+* Tue Jul 29 2008 anosek@suse.cz
+- made the symlink jakarta-commons-dbcp -> jakarta-commons-dbcp-1.2.2
+  part of the javadoc package
+* Mon Jul 21 2008 mvyskocil@suse.cz
+- merged with jpackage 1.7 spec
+  - added a tomcat5 subpackage (to fix [bnc#408253])
+  - added a maven build branch (n/a in suse yet):
+    - added a poms and project.xmls for maven
+    - added a depmagfrags for maven
+- build againts tomcat6 (instead of tomcat5 as in original jpackage project)
+- add a java6 compatibility patch
 * Wed Apr 09 2008 mvyskocil@suse.cz
 - update to 1.2.2
 - remove the java14compat patch

++++++ commons-dbcp-1.2.2-project_xml.patch ++++++
--- project.xml.sav	2007-08-28 16:19:16.000000000 +0200
+++ project.xml	2007-08-28 16:20:45.000000000 +0200
@@ -193,6 +193,24 @@
       </properties>
     </dependency>
 
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.8.0</version>
+      <properties>
+        <scope>test</scope>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.3.03</version>
+      <properties>
+        <scope>test</scope>
+      </properties>
+    </dependency>
+
     <!-- tomcat naming jars for jndi reference tests -->
     <dependency>
       <groupId>tomcat</groupId>
++++++ java6-compatibility.patch ++++++
++++ 1952 lines (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)