[proxool] remove trailing whitespace in spec
Andy Grimm
arg at fedoraproject.org
Thu Dec 15 21:28:49 UTC 2011
commit 32ba65871321966481e72bca4fea41ead858f988
Author: Andy Grimm <agrimm at gmail.com>
Date: Thu Dec 15 16:27:51 2011 -0500
remove trailing whitespace in spec
.gitignore | 1 +
proxool-no-embedded-cglib.patch | 261 +++++++++++++++++++++++++++++++++++++++
proxool.pom | 14 ++
proxool.spec | 109 ++++++++++++++++
sources | 1 +
5 files changed, 386 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..6842247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/proxool-proxool-659fc71.tar.gz
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 @@
+
+ <!-- Classpath -->
+ <path id="source" path="${build-dir}/classes">
+- <fileset dir="lib">
++ <fileset dir="/usr/share/java">
+ <include name="**/*.jar"/>
+ <include name="**/*.zip"/>
+ </fileset>
+ <path path="build/lib/proxool-cglib.jar"/>
+ </path>
+ <path id="binary">
+- <fileset dir="lib">
++ <fileset dir="/usr/share/java">
+ <include name="**/*.jar"/>
+ <include name="**/*.zip"/>
+ </fileset>
+@@ -197,7 +197,7 @@
+ description="Compiles the code"
+ depends="init,build-src,repackage-dependencies"
+ >
+- <javac srcdir="${build-dir}/src/java" target="1.2" source="1.2" destdir="${build-dir}/classes" debug="${debug}">
++ <javac srcdir="${build-dir}/src/java" target="1.6" source="1.6" destdir="${build-dir}/classes" debug="${debug}">
+ <classpath refid="source"/>
+ <classpath path="build/proxool-cglib.jar"/>
+ </javac>
+@@ -217,18 +217,11 @@
+ <attribute name="Proxool-Version" value="${release}"/>
+ <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="jarjar/jarjar-0.6.jar"/>
+- <jarjar
+- verbose="true"
++ <jar
+ jarfile="${build-dir}/proxool-${release}.jar"
+ basedir="${build-dir}/classes"
+ manifest="${build-dir}/etc/MANIFEST.MF">
+- <zipfileset src="jarjar/cglib-nodep-2.1_3.jar"/>
+- <rule pattern="net.sf.cglib.**" result="org.logicalcobwebs.cglib. at 1"/>
+- <zap pattern="net.sf.cglib.transform.**"/>
+- <zap pattern="net.sf.cglib.beans.**"/>
+- <zap pattern="net.sf.cglib.util.**"/>
+- </jarjar>
++ </jar>
+ </target>
+
+ <target
+@@ -295,12 +288,7 @@
+ </target>
+
+ <target name="repackage-dependencies" description="Repackage the Cglib project into Proxool">
+- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="jarjar/jarjar-0.6.jar"/>
+ <mkdir dir="build/lib"/>
+- <jarjar verbose="false" jarfile="build/lib/proxool-cglib.jar">
+- <zipfileset src="jarjar/cglib-nodep-2.1_3.jar"/>
+- <rule pattern="net.sf.cglib.**" result="org.logicalcobwebs.cglib. at 1"/>
+- </jarjar>
+ </target>
+
+ <target
+Only in proxool-0.9.1: jarjar
+Only in proxool-0.9.1: lib
+diff -ur proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java
+--- proxool-0.9.1/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java 2007-12-14 18:03:28.000000000 -0500
++++ proxool-0.9.1.new/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java 2011-08-26 08:58:31.343000286 -0400
+@@ -17,8 +17,10 @@
+ import javax.sql.DataSource;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.Hashtable;
+ import java.util.Enumeration;
++import java.util.logging.Logger;
+ import java.util.Properties;
+ import java.util.StringTokenizer;
+ import java.io.PrintWriter;
+@@ -684,6 +686,17 @@
+ throw new UnsupportedOperationException("You should configure the username and password "
+ + "within the proxool configuration and just call getConnection() instead.");
+ }
++
++ /* JDK 1.7 */
++ public boolean isWrapperFor(Class<?> iface) throws SQLException{
++ throw new SQLException("Not supported operation");
++ }
++ public <T> T unwrap(Class<T> 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.pom b/proxool.pom
new file mode 100644
index 0000000..6e6b119
--- /dev/null
+++ b/proxool.pom
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>proxool</groupId>
+ <artifactId>proxool</artifactId>
+ <version>0.9.1</version>
+ <description>Proxool database connection pooling library</description>
+ <dependencies>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1.3</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/proxool.spec b/proxool.spec
new file mode 100644
index 0000000..5266018
--- /dev/null
+++ b/proxool.spec
@@ -0,0 +1,109 @@
+%define git_commit 659fc71
+
+Summary: Java connection pool library
+Name: proxool
+Version: 0.9.1
+Release: 5%{?dist}
+Epoch: 0
+License: ASL 2.0
+URL: http://proxool.sourceforge.net/
+Group: Development/Libraries
+# 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: jpackage-utils
+BuildRequires: java-devel >= 0:1.6.0
+BuildRequires: ant >= 0:1.7.1
+BuildRequires: ant-junit
+BuildRequires: apache-commons-collections
+BuildRequires: apache-commons-lang
+BuildRequires: apache-commons-logging
+BuildRequires: cglib
+BuildRequires: dom4j
+BuildRequires: avalon-framework
+BuildRequires: hsqldb >= 0:1.80
+BuildRequires: junit
+BuildRequires: log4j
+BuildRequires: tomcat6-servlet-2.5-api
+BuildRequires: checkstyle
+
+Requires: java >= 0:1.6.0
+Requires: avalon-logkit
+Requires: dom4j
+Requires: jta
+Requires: jpackage-utils
+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}
+Group: Documentation
+Requires: jpackage-utils
+
+%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
+
+%build
+CLASSPATH=$( build-classpath cglib avalon-framework servlet ) ant build-jar javadoc
+
+%install
+# jars
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
+install -m 0644 build/%{name}-%{version}.jar \
+$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# javadoc
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+# pom
+install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -m 0644 %{S:1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+%files
+%doc *.txt
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+
+%files javadoc
+%doc LICENCE.txt
+%doc %{_javadocdir}/%{name}
+
+%changelog
+* Wed Dec 13 2011 Andy Grimm <agrimm at gmail.com> - 0:0.9.1-5
+- Remove executable permissions introduced in git repository
+
+* Mon Dec 12 2011 Andy Grimm <agrimm at gmail.com> - 0:0.9.1-4
+- Fix license, use git upstream source, and fix
+ Requires for javadoc subpackage.
+
+* Thu Oct 20 2011 Andy Grimm <agrimm at gmail.com> - 0:0.9.1-3
+- add POM file
+
+* Wed Oct 19 2011 Andy Grimm <agrimm at gmail.com> - 0:0.9.1-2
+- spec file clean-up
+
+* Fri Aug 26 2011 Andy Grimm <agrimm at gmail.com> - 0:0.9.1-1
+- initial build
+
diff --git a/sources b/sources
index e69de29..96ca903 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+4668fe5de944d3f247cd3b701e8819dd proxool-proxool-659fc71.tar.gz
More information about the scm-commits
mailing list