diff --git a/README.en.md b/README.en.md deleted file mode 100644 index cd0d142..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# proxool - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 5f72645..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# proxool - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/proxool-no-embedded-cglib.patch b/proxool-no-embedded-cglib.patch new file mode 100644 index 0000000..b16f3a4 --- /dev/null +++ b/proxool-no-embedded-cglib.patch @@ -0,0 +1,261 @@ +diff -ur proxool-0.9.1/build.xml proxool-0.9.1.new/build.xml +--- proxool-0.9.1/build.xml 2008-08-23 06:08:08.000000000 -0400 ++++ proxool-0.9.1.new/build.xml 2011-08-26 09:01:12.895999398 -0400 +@@ -46,14 +46,14 @@ + + + +- ++ + + + + + + +- ++ + + + +@@ -197,7 +197,7 @@ + description="Compiles the code" + depends="init,build-src,repackage-dependencies" + > +- ++ + + + +@@ -217,18 +217,11 @@ + + + +- +- +- +- +- +- +- +- ++ + + + + + +- + +- +- +- +- + + + iface) throws SQLException{ ++ throw new SQLException("Not supported operation"); ++ } ++ public T unwrap(Class iface) throws SQLException{ ++ throw new SQLException("Not supported operation"); ++ } ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException("Not supported operation"); ++ } + } + + /* +@@ -722,4 +735,4 @@ + Revision 1.1 2004/03/15 23:54:25 chr32 + Initail Proxool J2EE-managed DataSource. Not quite complete yet. + +- */ +\ No newline at end of file ++ */ +diff -ur proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxoolDriver.java proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxoolDriver.java +--- proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxoolDriver.java 2007-12-14 08:34:13.000000000 -0500 ++++ proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxoolDriver.java 2011-08-26 08:57:59.546000109 -0400 +@@ -14,6 +14,8 @@ + import java.sql.DriverManager; + import java.sql.DriverPropertyInfo; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; + import java.util.Properties; + import java.util.ResourceBundle; + +@@ -221,6 +223,11 @@ + return true; + } + ++ /* JDK 1.7 */ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException("Not supported operation"); ++ } ++ + } + + /* +diff -ur proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java +--- proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java 2007-12-14 08:34:12.000000000 -0500 ++++ proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java 2011-08-26 08:30:04.274000384 -0400 +@@ -8,8 +8,8 @@ + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + +-import org.logicalcobwebs.cglib.proxy.MethodInterceptor; +-import org.logicalcobwebs.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodInterceptor; ++import net.sf.cglib.proxy.MethodProxy; + + import java.lang.reflect.InvocationTargetException; + import java.lang.reflect.Method; +diff -ur proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyFactory.java proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxyFactory.java +--- proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyFactory.java 2007-12-14 08:34:13.000000000 -0500 ++++ proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxyFactory.java 2011-08-26 08:30:03.807000384 -0400 +@@ -5,11 +5,11 @@ + */ + package org.logicalcobwebs.proxool; + +-import org.logicalcobwebs.cglib.proxy.Enhancer; +-import org.logicalcobwebs.cglib.proxy.Factory; +-import org.logicalcobwebs.cglib.proxy.Callback; +-import org.logicalcobwebs.cglib.core.NamingPolicy; +-import org.logicalcobwebs.cglib.core.Predicate; ++import net.sf.cglib.proxy.Enhancer; ++import net.sf.cglib.proxy.Factory; ++import net.sf.cglib.proxy.Callback; ++import net.sf.cglib.core.NamingPolicy; ++import net.sf.cglib.core.Predicate; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + +diff -ur proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyStatement.java proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxyStatement.java +--- proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyStatement.java 2007-12-14 08:34:13.000000000 -0500 ++++ proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxyStatement.java 2011-08-26 08:30:04.320000384 -0400 +@@ -8,9 +8,9 @@ + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + +-import org.logicalcobwebs.cglib.proxy.MethodInterceptor; +-import org.logicalcobwebs.cglib.proxy.MethodProxy; +-import org.logicalcobwebs.cglib.proxy.InvocationHandler; ++import net.sf.cglib.proxy.MethodInterceptor; ++import net.sf.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.InvocationHandler; + import org.logicalcobwebs.proxool.proxy.InvokerFacade; + + import java.lang.reflect.InvocationTargetException; +diff -ur proxool-0.9.1/src/java/org/logicalcobwebs/proxool/WrappedConnection.java proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/WrappedConnection.java +--- proxool-0.9.1/src/java/org/logicalcobwebs/proxool/WrappedConnection.java 2007-12-14 08:34:13.000000000 -0500 ++++ proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/WrappedConnection.java 2011-08-26 08:30:04.088000384 -0400 +@@ -5,9 +5,9 @@ + */ + package org.logicalcobwebs.proxool; + +-import org.logicalcobwebs.cglib.proxy.InvocationHandler; +-import org.logicalcobwebs.cglib.proxy.MethodInterceptor; +-import org.logicalcobwebs.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.InvocationHandler; ++import net.sf.cglib.proxy.MethodInterceptor; ++import net.sf.cglib.proxy.MethodProxy; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.logicalcobwebs.proxool.proxy.InvokerFacade; +@@ -81,7 +81,7 @@ + + /** + * Delegates to {@link #invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[]) invoke} +- * @see MethodInterceptor#intercept(java.lang.Object, java.lang.reflect.Method, java.lang.Object[], org.logicalcobwebs.cglib.proxy.MethodProxy) ++ * @see MethodInterceptor#intercept(java.lang.Object, java.lang.reflect.Method, java.lang.Object[], net.sf.cglib.proxy.MethodProxy) + */ + public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + return invoke(proxy, method, args); +diff -ur proxool-0.9.1/src/java-test/org/logicalcobwebs/cglib/EnhancerTest.java proxool-0.9.1.new/src/java-test/org/logicalcobwebs/cglib/EnhancerTest.java +--- proxool-0.9.1/src/java-test/org/logicalcobwebs/cglib/EnhancerTest.java 2007-12-14 08:34:17.000000000 -0500 ++++ proxool-0.9.1.new/src/java-test/org/logicalcobwebs/cglib/EnhancerTest.java 2011-08-26 08:30:03.425000384 -0400 +@@ -3,10 +3,10 @@ + * See org.logicalcobwebs.proxool.package.html for details. + * The latest version is available at http://proxool.sourceforge.net + */ +-package org.logicalcobwebs.cglib; ++package net.sf.cglib; + + import org.logicalcobwebs.proxool.AbstractProxoolTest; +-import org.logicalcobwebs.cglib.proxy.Enhancer; ++import net.sf.cglib.proxy.Enhancer; + + /** + * A test test class (!) to help me understand the Enhancer. It fails. Or at least, +diff -ur proxool-0.9.1/src/java-test/org/logicalcobwebs/cglib/MyConcreteClass.java proxool-0.9.1.new/src/java-test/org/logicalcobwebs/cglib/MyConcreteClass.java +--- proxool-0.9.1/src/java-test/org/logicalcobwebs/cglib/MyConcreteClass.java 2007-12-14 08:34:17.000000000 -0500 ++++ proxool-0.9.1.new/src/java-test/org/logicalcobwebs/cglib/MyConcreteClass.java 2011-08-26 08:30:03.402000384 -0400 +@@ -3,7 +3,7 @@ + * See org.logicalcobwebs.proxool.package.html for details. + * The latest version is available at http://proxool.sourceforge.net + */ +-package org.logicalcobwebs.cglib; ++package net.sf.cglib; + + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; +diff -ur proxool-0.9.1/src/java-test/org/logicalcobwebs/cglib/MyInterfaceIF.java proxool-0.9.1.new/src/java-test/org/logicalcobwebs/cglib/MyInterfaceIF.java +--- proxool-0.9.1/src/java-test/org/logicalcobwebs/cglib/MyInterfaceIF.java 2007-12-14 08:34:17.000000000 -0500 ++++ proxool-0.9.1.new/src/java-test/org/logicalcobwebs/cglib/MyInterfaceIF.java 2011-08-26 08:30:03.391000384 -0400 +@@ -3,7 +3,7 @@ + * See org.logicalcobwebs.proxool.package.html for details. + * The latest version is available at http://proxool.sourceforge.net + */ +-package org.logicalcobwebs.cglib; ++package net.sf.cglib; + + /** + * See {@link EnhancerTest} +diff -ur proxool-0.9.1/src/java-test/org/logicalcobwebs/cglib/MyProxy.java proxool-0.9.1.new/src/java-test/org/logicalcobwebs/cglib/MyProxy.java +--- proxool-0.9.1/src/java-test/org/logicalcobwebs/cglib/MyProxy.java 2007-12-14 08:34:17.000000000 -0500 ++++ proxool-0.9.1.new/src/java-test/org/logicalcobwebs/cglib/MyProxy.java 2011-08-26 08:30:03.414000384 -0400 +@@ -3,11 +3,11 @@ + * See org.logicalcobwebs.proxool.package.html for details. + * The latest version is available at http://proxool.sourceforge.net + */ +-package org.logicalcobwebs.cglib; ++package net.sf.cglib; + + +-import org.logicalcobwebs.cglib.proxy.MethodInterceptor; +-import org.logicalcobwebs.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodInterceptor; ++import net.sf.cglib.proxy.MethodProxy; + + import java.lang.reflect.Method; + diff --git a/proxool-proxool-659fc71.tar.gz b/proxool-proxool-659fc71.tar.gz new file mode 100644 index 0000000..37816c7 Binary files /dev/null and b/proxool-proxool-659fc71.tar.gz differ diff --git a/proxool.pom b/proxool.pom new file mode 100644 index 0000000..434aabc --- /dev/null +++ b/proxool.pom @@ -0,0 +1,29 @@ + + 4.0.0 + proxool + proxool + 0.9.1 + Proxool database connection pooling library + + + net.sf.cglib + cglib + 2.1.3 + + + dom4j + dom4j + 1.6.1 + + + javax.transaction + jta + 1.1.1 + + + avalon-logkit + avalon-logkit + 2.1 + + + diff --git a/proxool.spec b/proxool.spec new file mode 100644 index 0000000..5577fec --- /dev/null +++ b/proxool.spec @@ -0,0 +1,152 @@ +%global git_commit 659fc71 + +Summary: Java connection pool library +Name: proxool +Version: 0.9.1 +Release: 22%{?dist} +Epoch: 0 +License: ASL 2.0 +URL: http://proxool.sourceforge.net/ +# Grabbing a newer version from git due to license change +# https://github.com/proxool/proxool/tarball/master +# (commit 659fc71e617151327779802a5171f0da8205918d) +Source0: proxool-proxool-%{git_commit}.tar.gz +Source1: proxool.pom +Patch0: proxool-no-embedded-cglib.patch + +BuildRequires: ant >= 0:1.7.1 +BuildRequires: ant-junit +BuildRequires: java-devel >= 0:1.6.0 +BuildRequires: javapackages-local +BuildRequires: mvn(avalon-framework:avalon-framework-api) +BuildRequires: mvn(avalon-framework:avalon-framework-impl) +BuildRequires: mvn(avalon-logkit:avalon-logkit) +BuildRequires: mvn(com.puppycrawl.tools:checkstyle) +BuildRequires: mvn(commons-collections:commons-collections) +BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(dom4j:dom4j) +BuildRequires: mvn(hsqldb:hsqldb:1) +BuildRequires: mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(javax.transaction:jta) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(log4j:log4j:1.2.17) +BuildRequires: mvn(net.sf.cglib:cglib) + +BuildArch: noarch + +%description +Transparently adds connection pooling to your existing JDBC driver. +Complies with the J2SE API, giving you the confidence to develop to +standards. You can monitor the performance of your database +connections and listen to connection events. +It's easy to configure using the JDBC API, XML, or Java property +files - you decide. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n %{name}-%{name}-%{git_commit} +#find . -name "*.jar" -exec rm {} \; +find . -type f -a -executable -exec chmod -x {} \; +rm -rf lib jarjar + +%patch0 -p1 -b .sav0 + +sed -i.new_checkstyle "s|com.puppycrawl.tools.checkstyle.CheckStyleTask|com.puppycrawl.tools.checkstyle.ant.CheckstyleAntTask|" build.xml + +sed -i.doclint "s|public="true"|public="true" additionalparam="-Xdoclint:none"|" build.xml + +%mvn_file %{name}:%{name} %{name} + +%build +CLASSPATH=$(build-classpath cglib avalon-framework glassfish-servlet-api) ant build-jar javadoc + +%install +%mvn_artifact %{SOURCE1} build/%{name}-%{version}.jar +%mvn_install -J build/api + +%files -f .mfiles +%doc CHANGES.txt README.txt +%license LICENCE.txt + +%files javadoc -f .mfiles-javadoc +%license LICENCE.txt + +%changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0:0.9.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0:0.9.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:0.9.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0:0.9.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0:0.9.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Dec 24 2015 gil cattaneo 0:0.9.1-17 +- convert %%defines to %%global + +* Tue Jul 07 2015 gil cattaneo 0:0.9.1-16 +- rebuilt for RHBZ#1240441 +- edit POM dependencies list +- use BRs mvn()-like + +* Thu Jun 18 2015 Fedora Release Engineering - 0:0.9.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Feb 11 2015 gil cattaneo 0:0.9.1-14 +- introduce license macro + +* Sat Jun 07 2014 Fedora Release Engineering - 0:0.9.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 28 2014 Michael Simacek - 0:0.9.1-12 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 17 2013 gil cattaneo 0:0.9.1-11 +- fix rhbz#992827 +- fix BR list +- removed rpmlint problems +- minor changes to adapt to current guideline + +* Sun Aug 04 2013 Fedora Release Engineering - 0:0.9.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0:0.9.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 0:0.9.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Mar 14 2012 Andy Grimm - 0:0.9.1-7 +- Fix cglib groupId in POM to match Fedora's cglib + +* Sat Jan 14 2012 Fedora Release Engineering - 0:0.9.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 13 2011 Andy Grimm - 0:0.9.1-5 +- Remove executable permissions introduced in git repository + +* Mon Dec 12 2011 Andy Grimm - 0:0.9.1-4 +- Fix license, use git upstream source, and fix + Requires for javadoc subpackage. + +* Thu Oct 20 2011 Andy Grimm - 0:0.9.1-3 +- add POM file + +* Wed Oct 19 2011 Andy Grimm - 0:0.9.1-2 +- spec file clean-up + +* Fri Aug 26 2011 Andy Grimm - 0:0.9.1-1 +- initial build +