rpms/jakarta-commons-dbcp/devel commons-dbcp-1.2.1-jdk6.patch, NONE, 1.1 commons-dbcp-1.2.1.pom, NONE, 1.1 commons-dbcp-1.2.1-sourcever.patch, NONE, 1.1 jakarta-commons-dbcp.spec, 1.32, 1.33
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Aug 20 18:58:45 UTC 2009
Author: akurtakov
Update of /cvs/pkgs/rpms/jakarta-commons-dbcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32698/devel
Modified Files:
jakarta-commons-dbcp.spec
Added Files:
commons-dbcp-1.2.1-jdk6.patch commons-dbcp-1.2.1.pom
commons-dbcp-1.2.1-sourcever.patch
Log Message:
* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.1-13.6
- Drop gcj support.
- Fix build with java 6.
- Add maven pom.
- Drop maven1 support.
commons-dbcp-1.2.1-jdk6.patch:
commons-dbcp-1.2.1-jdk6.patch | 1037 ++++++++++
commons-dbcp-1.2.1.iml | 13
commons-dbcp-1.2.1.ipr | 328 +++
commons-dbcp-1.2.1.iws | 684 ++++++
src/java/org/apache/commons/dbcp/BasicDataSource.java | 8
src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java | 132 +
src/java/org/apache/commons/dbcp/DelegatingConnection.java | 60
src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java | 77
src/java/org/apache/commons/dbcp/DelegatingResultSet.java | 203 +
src/java/org/apache/commons/dbcp/DelegatingStatement.java | 18
src/java/org/apache/commons/dbcp/PoolingDataSource.java | 8
src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java | 60
src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java | 9
src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java | 8
src/test/org/apache/commons/dbcp/TesterConnection.java | 61
src/test/org/apache/commons/dbcp/TesterPreparedStatement.java | 76
src/test/org/apache/commons/dbcp/TesterResultSet.java | 205 +
src/test/org/apache/commons/dbcp/TesterStatement.java | 19
18 files changed, 3005 insertions(+), 1 deletion(-)
--- 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
+++ ./commons-dbcp-1.2.1.ipr 2009-01-09 23:08:08.000000000 +0800
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+ <component name="AntConfiguration">
+ <defaultAnt bundledAnt="true" />
+ </component>
+ <component name="BuildJarProjectSettings">
+ <option name="BUILD_JARS_ON_MAKE" value="false" />
+ </component>
+ <component name="CCaseConfig">
+ <option name="checkoutReserved" value="false" />
+ <option name="markExternalChangeAsUpToDate" value="true" />
+ <option name="checkInUseHijack" value="true" />
+ <option name="useUcmModel" value="true" />
+ <option name="isOffline" value="false" />
+ <option name="synchOutside" value="false" />
+ <option name="isHistoryResticted" value="true" />
+ <option name="useIdenticalSwitch" value="true" />
+ <option name="synchActivitiesOnRefresh" value="true" />
+ <option name="lastScr" value="" />
+ <option name="scrTextFileName" value="" />
+ <option name="historyRevisionsNumber" value="4" />
+ </component>
+ <component name="CodeStyleProjectProfileManger">
+ <option name="PROJECT_PROFILE" />
+ <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+ </component>
+ <component name="CodeStyleSettingsManager">
+ <option name="PER_PROJECT_SETTINGS" />
+ <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+ </component>
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <option name="DEPLOY_AFTER_MAKE" value="0" />
+ <resourceExtensions>
+ <entry name=".+\.(properties|xml|html|dtd|tld)" />
+ <entry name=".+\.(gif|png|jpeg|jpg)" />
+ </resourceExtensions>
+ <wildcardResourcePatterns>
+ <entry name="?*.properties" />
+ <entry name="?*.xml" />
+ <entry name="?*.gif" />
+ <entry name="?*.png" />
+ <entry name="?*.jpeg" />
+ <entry name="?*.jpg" />
+ <entry name="?*.html" />
+ <entry name="?*.dtd" />
+ <entry name="?*.tld" />
+ </wildcardResourcePatterns>
+ </component>
+ <component name="DependenciesAnalyzeManager">
+ <option name="myForwardDirection" value="false" />
+ </component>
+ <component name="DependencyValidationManager">
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </component>
+ <component name="EclipseCompilerSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="true" />
+ <option name="DEPRECATION" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="EclipseEmbeddedCompilerSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="true" />
+ <option name="DEPRECATION" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+ <component name="EntryPointsManager">
+ <entry_points version="2.0" />
+ </component>
+ <component name="ErrorTreeViewConfiguration">
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="HIDE_WARNINGS" value="false" />
+ </component>
+ <component name="HierarchyBrowserManager">
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="SORT_ALPHABETICALLY" value="false" />
+ <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
+ </component>
+ <component name="IdProvider" IDEtalkID="C6A49ECD75ED7164A26CE3371D004C3B" />
+ <component name="InspectionProjectProfileManager">
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+ <scopes />
+ <profiles>
+ <profile version="1.0" is_locked="false">
+ <option name="myName" value="Project Default" />
+ <option name="myLocal" value="false" />
+ </profile>
+ </profiles>
+ <list size="0" />
+ </component>
+ <component name="JavacSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="DEPRECATION" value="true" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="JavadocGenerationManager">
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="OPTION_SCOPE" value="protected" />
+ <option name="OPTION_HIERARCHY" value="true" />
+ <option name="OPTION_NAVIGATOR" value="true" />
+ <option name="OPTION_INDEX" value="true" />
+ <option name="OPTION_SEPARATE_INDEX" value="true" />
+ <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+ <option name="OPTION_DEPRECATED_LIST" value="true" />
+ <option name="OTHER_OPTIONS" value="" />
+ <option name="HEAP_SIZE" />
+ <option name="LOCALE" />
+ <option name="OPEN_IN_BROWSER" value="true" />
+ </component>
+ <component name="JikesSettings">
+ <option name="JIKES_PATH" value="" />
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="DEPRECATION" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="IS_EMACS_ERRORS_MODE" value="true" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ </component>
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
[...2819 lines suppressed...]
+
+ public void updateNString(String columnLabel, String nString) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public NClob getNClob(int columnIndex) throws SQLException {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public NClob getNClob(String columnLabel) throws SQLException {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public SQLXML getSQLXML(int columnIndex) throws SQLException {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public SQLXML getSQLXML(String columnLabel) throws SQLException {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getNString(int columnIndex) throws SQLException {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public String getNString(String columnLabel) throws SQLException {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Reader getNCharacterStream(int columnIndex) throws SQLException {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Reader getNCharacterStream(String columnLabel) throws SQLException {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateClob(int columnIndex, Reader reader) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateClob(String columnLabel, Reader reader) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNClob(int columnIndex, Reader reader) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
+ //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.
+ }
}
diff -uNr ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterStatement.java ./src/test/org/apache/commons/dbcp/TesterStatement.java
--- ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterStatement.java 2004-06-12 21:42:21.000000000 +0800
+++ ./src/test/org/apache/commons/dbcp/TesterStatement.java 2009-01-14 17:44:37.000000000 +0800
@@ -264,4 +264,23 @@
}
/* JDBC_3_ANT_KEY_END */
+ 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.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>
commons-dbcp-1.2.1-sourcever.patch:
build.xml | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
--- 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: /cvs/pkgs/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- jakarta-commons-dbcp.spec 25 Jul 2009 03:49:03 -0000 1.32
+++ jakarta-commons-dbcp.spec 20 Aug 2009 18:58:45 -0000 1.33
@@ -28,29 +28,18 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
-%define _without_maven 1
-
-%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
%define short_name commons-%{base_name}
%define section free
Name: jakarta-commons-dbcp
Version: 1.2.1
-Release: 13.5%{?dist}
+Release: 13.6%{?dist}
Epoch: 0
Summary: Jakarta Commons DataBase Pooling Package
-License: ASL 2.0
-Group: Development/Libraries/Java
-Source0: http://archive.apache.org/dist/jakarta/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz
+License: ASL 2.0
+Group: Development/Libraries
+Source0: http://archive.apache.org/dist/jakarta/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz
Source1: pom-maven2jpp-depcat.xsl
Source2: pom-maven2jpp-newdepmap.xsl
Source3: pom-maven2jpp-mapdeps.xsl
@@ -59,14 +48,17 @@ 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}
+URL: http://jakarta.apache.org/commons/%{base_name}
BuildRequires: ant
BuildRequires: jakarta-commons-collections >= 2.0
BuildRequires: jakarta-commons-pool >= 1.1
@@ -77,96 +69,49 @@ BuildRequires: jpackage-utils > 1.6
BuildRequires: junit >= 3.8
BuildRequires: jakarta-commons-pool-tomcat5
BuildRequires: jakarta-commons-collections-tomcat5
-%if %{with_maven}
-BuildRequires: maven >= 0:1.1
-BuildRequires: maven-plugins-base
-BuildRequires: maven-plugin-test
-BuildRequires: maven-plugin-xdoc
-BuildRequires: maven-plugin-license
-BuildRequires: maven-plugin-changes
-BuildRequires: maven-plugin-jdepend
-BuildRequires: maven-plugin-jdiff
-BuildRequires: maven-plugin-jxr
-BuildRequires: maven-plugin-tasklist
-BuildRequires: maven-plugin-developer-activity
-BuildRequires: maven-plugin-file-activity
-BuildRequires: saxon
-BuildRequires: saxon-scripts
-%endif
Requires(post): /usr/sbin/update-alternatives
Requires(preun): /usr/sbin/update-alternatives
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
-
%description
-Many Jakarta projects support interaction with a relational
-database. Creating a new connection for each user can be time
-consuming (often requiring multiple seconds of clock time),
-in order to perform a database transaction that might take
-milliseconds. Opening a connection per user can be unfeasible
-in a publicly-hosted Internet application where the number of
-simultaneous users can be very large. Accordingly, developers
-often wish to share a "pool" of open connections between all
-of the application's current users. The number of users actually
-performing a request at any given time is usually a very small
-percentage of the total number of active users, and during
-request processing is the only time that a database connection
-is required. The application itself logs into the DBMS, and
+Many Jakarta projects support interaction with a relational
+database. Creating a new connection for each user can be time
+consuming (often requiring multiple seconds of clock time),
+in order to perform a database transaction that might take
+milliseconds. Opening a connection per user can be unfeasible
+in a publicly-hosted Internet application where the number of
+simultaneous users can be very large. Accordingly, developers
+often wish to share a "pool" of open connections between all
+of the application's current users. The number of users actually
+performing a request at any given time is usually a very small
+percentage of the total number of active users, and during
+request processing is the only time that a database connection
+is required. The application itself logs into the DBMS, and
handles any user account issues internally.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
-Requires(post): /bin/rm,/bin/ln
-Requires(postun): /bin/rm
+Group: Documentation
%description javadoc
Javadoc for %{name}.
%package tomcat5
Summary: DBCP dependency for Tomcat5
-Group: Development/Libraries/Java
-
-%if %{gcj_support}
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
+Group: Development/Libraries
%description tomcat5
DBCP dependency for Tomcat5
-%if %{with_maven}
-%package manual
-Summary: Documents for %{name}
-Group: Development/Documentation
-
-%description manual
-%{summary}.
-%endif
-
%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
@@ -183,38 +128,10 @@ cp %{SOURCE6} .
%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
-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
-
export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2)
ant \
-Dbuild.sysclasspath=first \
@@ -225,21 +142,16 @@ ant \
-Dsax2.jar=$(build-classpath xml-commons-apis) \
-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
+export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2 commons-collections-tomcat5 commons-pool-tomcat5)
+ant -Dcompile.source=1.5 -Dant.build.javac.target=1.5 -f dbcp-tomcat5-build.xml
%install
rm -rf $RPM_BUILD_ROOT
# 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
+#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)
@@ -247,29 +159,19 @@ install -m 644 dbcp-tomcat5/%{short_name
# 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
touch $RPM_BUILD_ROOT%{_javadir}/hibernate_jdbc_cache.jar
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+# 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
%clean
rm -rf $RPM_BUILD_ROOT
@@ -277,21 +179,10 @@ rm -rf $RPM_BUILD_ROOT
%post
update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \
hibernate_jdbc_cache %{_javadir}/%{name}.jar 60
+%update_maven_depmap
-%if %{gcj_support}
-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
+%update_maven_depmap
%preun
{
@@ -299,56 +190,34 @@ fi
update-alternatives --remove hibernate_jdbc_cache %{_javadir}/%{name}.jar
} >/dev/null 2>&1 || :
-%if %{gcj_support}
-%post tomcat5
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun tomcat5
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files
%defattr(-,root,root)
%doc LICENSE.txt NOTICE.txt README.txt
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{short_name}.jar
%{_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*
-%endif
-
%files javadoc
%defattr(-,root,root)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
-%if %{with_maven}
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
-%endif
-
%changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.2.1-13.6
+- Drop gcj support.
+- Fix build with java 6.
+- Add maven pom.
+- Drop maven1 support.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.1-13.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -448,7 +317,7 @@ fi
- use sed instead of bash 2.x extension in link area to make spec compatible
with distro using bash 1.1x
-* Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.0-1jpp
+* Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.0-1jpp
- 1.0 (cvs 20020606)
- added short names in %%{_javadir}, as does jakarta developpers
- first jPackage release
More information about the scm-commits
mailing list