[pkg-java] r12349 - in trunk/libproxool-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Sat May 8 11:25:29 UTC 2010
Author: twerner
Date: 2010-05-08 11:25:27 +0000 (Sat, 08 May 2010)
New Revision: 12349
Added:
trunk/libproxool-java/debian/patches/proxool-detect-cglib-enhancer.diff
trunk/libproxool-java/debian/patches/testsuite.diff
Modified:
trunk/libproxool-java/debian/ant.properties
trunk/libproxool-java/debian/build.xml
trunk/libproxool-java/debian/changelog
trunk/libproxool-java/debian/control
trunk/libproxool-java/debian/patches/cglib.diff
trunk/libproxool-java/debian/patches/series
trunk/libproxool-java/debian/rules
Log:
* Merge changes from Ubuntu.
* Change Build-Depends: libexcalibur-logkit-java.
* Enable test suite:
* debian/ant.properties, debian/build.xml: Add ant rules to run tests
* debian/control: Added missing build-depends necessary for tests
* debian/rules: Enable tests, add missing JARs to classpath
* debian/patches/cglib.diff: updated so that src/java-test is also patched
* debian/patches/testsuite.diff: Disable some tests that require
non-packaged or universe dependencies, or fail due to CGLIB not being
repackaged in the proxool jar.
* debian/build.xml: Properly remove doc build directory on clean target
* debian/patches/proxool-detect-cglib-enhancer.diff: Fallback to using the
standard J2SE Proxy mechanism if it determines that using cglib would fail
because of a class loading issue
* debian/build.xml: Build java5 code, required for generics in source code
* debian/control: Depend on default-jre-headless | java5-runtime-headless
* debian/build.xml: Fix the jar packaging to include resources
Modified: trunk/libproxool-java/debian/ant.properties
===================================================================
--- trunk/libproxool-java/debian/ant.properties 2010-05-08 10:48:22 UTC (rev 12348)
+++ trunk/libproxool-java/debian/ant.properties 2010-05-08 11:25:27 UTC (rev 12349)
@@ -3,3 +3,4 @@
source.dir=src/java
doc.dir=doc/api
jar.name=proxool.jar
+testsource.dir=src/java-test
Modified: trunk/libproxool-java/debian/build.xml
===================================================================
--- trunk/libproxool-java/debian/build.xml 2010-05-08 10:48:22 UTC (rev 12348)
+++ trunk/libproxool-java/debian/build.xml 2010-05-08 11:25:27 UTC (rev 12349)
@@ -5,21 +5,51 @@
<target name="clean">
<delete dir="${class.dir}" quiet="true"/>
<delete file="${jar.name}" quiet="true"/>
- <delete file="${doc.dir}" quiet="true"/>
+ <delete dir="${doc.dir}" quiet="true"/>
+ <delete dir="db"/>
</target>
<target name="compile">
<mkdir dir="${class.dir}"/>
<javac srcdir="${source.dir}" destdir="${class.dir}"
+ target="1.5" source="1.5"
deprecation="true" debug="true" optimize="false"/>
</target>
<target name="jar" description="o Create the jar" depends="compile">
<jar jarfile="${jar.name}">
<fileset dir="${class.dir}" />
+ <fileset dir="${source.dir}"><include name="org/logicalcobwebs/proxool/resources/**"/></fileset>
+
</jar>
</target>
+ <target name="compile-tests">
+ <javac sourcepath="" srcdir="${testsource.dir}" destdir="${class.dir}"
+ target="1.5" source="1.5"
+ deprecation="true" debug="true" optimize="false">
+ <include name="**/*.java"/>
+ <exclude name="**/*Hibernate*.java"/>
+ <exclude name="**/*Spring*.java"/>
+ <exclude name="**/ProxoolDataSourceTest.java"/>
+ <exclude name="**/AvalonConfiguratorTest.java"/>
+ <exclude name="**/HibernateTest.java"/>
+ </javac>
+ <copy todir="${class.dir}">
+ <fileset dir="src/java-test" includes="**/*.properties,**/*.xml"/>
+ <fileset dir="${source.dir}"><include name="org/logicalcobwebs/proxool/resources/**"/></fileset>
+ </copy>
+ </target>
+
+ <target name="test" depends="compile-tests">
+ <echo message="Running tests, this can take a few minutes."/>
+ <java fork="yes" failonerror="true" classpath="${jar.name};${class.dir}" classname="junit.textui.TestRunner" >
+ <sysproperty key="log4jPath" value="src/java-test/org/logicalcobwebs/proxool/log4j-test.xml"/>
+ <arg value="org.logicalcobwebs.proxool.GlobalTest"/>
+ </java>
+ <echo message="Note! These unit tests have probably produced some worrying exceptions. As long as the tests passed then you can ignore these exceptions. They are part of the tests."/>
+ </target>
+
<target name="javadoc" description="Creates Javadoc documentation">
<mkdir dir="${doc.dir}"/>
<javadoc packagenames="org.logicalcobwebs.*"
Modified: trunk/libproxool-java/debian/changelog
===================================================================
--- trunk/libproxool-java/debian/changelog 2010-05-08 10:48:22 UTC (rev 12348)
+++ trunk/libproxool-java/debian/changelog 2010-05-08 11:25:27 UTC (rev 12349)
@@ -1,3 +1,46 @@
+libproxool-java (0.9.1-3) unstable; urgency=low
+
+ * Merge changes from Ubuntu.
+ * Change Build-Depends: libexcalibur-logkit-java.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 08 May 2010 13:21:27 +0200
+
+libproxool-java (0.9.1-2ubuntu4) lucid; urgency=low
+
+ * Enable test suite:
+ * debian/ant.properties, debian/build.xml: Add ant rules to run tests
+ * debian/control: Added missing build-depends necessary for tests
+ * debian/rules: Enable tests, add missing JARs to classpath
+ * debian/patches/cglib.diff: updated so that src/java-test is also patched
+ * debian/patches/testsuite.diff: Disable some tests that require
+ non-packaged or universe dependencies, or fail due to CGLIB not being
+ repackaged in the proxool jar.
+ * debian/build.xml: Properly remove doc build directory on clean target
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com> Fri, 18 Dec 2009 12:09:39 +0100
+
+libproxool-java (0.9.1-2ubuntu3) lucid; urgency=low
+
+ * debian/patches/proxool-detect-cglib-enhancer.diff: Fallback to using the
+ standard J2SE Proxy mechanism if it determines that using cglib would fail
+ because of a class loading issue
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com> Thu, 17 Dec 2009 15:18:27 +0100
+
+libproxool-java (0.9.1-2ubuntu2) lucid; urgency=low
+
+ * debian/build.xml: Build java5 code, required for generics in source code
+ * debian/control: Depend on default-jre-headless | java5-runtime-headless
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com> Wed, 16 Dec 2009 11:03:54 +0100
+
+libproxool-java (0.9.1-2ubuntu1) lucid; urgency=low
+
+ [ chris grzegorczyk <grze at eucalyptus.com> ]
+ * debian/build.xml: Fix the jar packaging to include resources
+
+ -- Dustin Kirkland <kirkland at ubuntu.com> Tue, 15 Dec 2009 20:01:14 -0600
+
libproxool-java (0.9.1-2) unstable; urgency=low
* Build-Depends: replace cglib2.1 with cglib (Closes: #550612)
Modified: trunk/libproxool-java/debian/control
===================================================================
--- trunk/libproxool-java/debian/control 2010-05-08 10:48:22 UTC (rev 12348)
+++ trunk/libproxool-java/debian/control 2010-05-08 11:25:27 UTC (rev 12349)
@@ -5,7 +5,7 @@
Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
Build-Depends: cdbs, debhelper (>= 7), quilt
Build-Depends-Indep: ant, default-jdk, libavalon-framework-java,
- libcommons-logging-java, libservlet2.4-java, libcglib-java
+ libcommons-logging-java, libservlet2.4-java, libcglib-java, junit, liblog4j1.2-java, libexcalibur-logkit-java, libhsqldb-java
Standards-Version: 3.8.3
Homepage: http://proxool.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libproxool-java
@@ -13,7 +13,7 @@
Package: libproxool-java
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}
Description: Java JDBC connection pool
A Java SQL Driver that provides a connection pool wrapper around
another Driver of your choice. Very simple to migrate existing code.
Modified: trunk/libproxool-java/debian/patches/cglib.diff
===================================================================
--- trunk/libproxool-java/debian/patches/cglib.diff 2010-05-08 10:48:22 UTC (rev 12348)
+++ trunk/libproxool-java/debian/patches/cglib.diff 2010-05-08 11:25:27 UTC (rev 12349)
@@ -1,8 +1,8 @@
Description: fix cglib class imports
-Index: libproxool-java-0.9.0RC3/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java
+Index: libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java
===================================================================
---- libproxool-java-0.9.0RC3.orig/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java 2007-10-30 10:38:53.000000000 +0530
-+++ libproxool-java-0.9.0RC3/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java 2007-10-30 10:39:12.000000000 +0530
+--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java 2007-12-14 14:34:12.000000000 +0100
++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java 2009-12-17 15:16:53.769118662 +0100
@@ -8,8 +8,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -14,10 +14,10 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-Index: libproxool-java-0.9.0RC3/src/java/org/logicalcobwebs/proxool/ProxyFactory.java
+Index: libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyFactory.java
===================================================================
---- libproxool-java-0.9.0RC3.orig/src/java/org/logicalcobwebs/proxool/ProxyFactory.java 2007-10-30 10:39:28.000000000 +0530
-+++ libproxool-java-0.9.0RC3/src/java/org/logicalcobwebs/proxool/ProxyFactory.java 2007-10-30 10:39:42.000000000 +0530
+--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/ProxyFactory.java 2007-12-14 14:34:13.000000000 +0100
++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyFactory.java 2009-12-17 15:16:53.889165517 +0100
@@ -5,11 +5,11 @@
*/
package org.logicalcobwebs.proxool;
@@ -35,11 +35,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-Index: libproxool-java-0.9.0RC3/src/java/org/logicalcobwebs/proxool/ProxyStatement.java
+Index: libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyStatement.java
===================================================================
---- libproxool-java-0.9.0RC3.orig/src/java/org/logicalcobwebs/proxool/ProxyStatement.java 2007-10-30 10:39:56.000000000 +0530
-+++ libproxool-java-0.9.0RC3/src/java/org/logicalcobwebs/proxool/ProxyStatement.java 2007-10-30 10:40:16.000000000 +0530
-@@ -8,9 +8,9 @@
+--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/ProxyStatement.java 2007-12-14 14:34:13.000000000 +0100
++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyStatement.java 2009-12-17 15:16:34.889198202 +0100
+@@ -8,11 +8,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -48,14 +48,25 @@
-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.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
-Index: libproxool-java-0.9.0RC3/src/java/org/logicalcobwebs/proxool/WrappedConnection.java
+ import java.lang.reflect.Method;
+ import java.sql.Statement;
+@@ -27,7 +27,7 @@
+ * @author billhorsman
+ * @author $Author: billhorsman $ (current maintainer)
+ */
+-class ProxyStatement extends AbstractProxyStatement implements MethodInterceptor {
++class ProxyStatement extends AbstractProxyStatement implements MethodInterceptor, InvocationHandler {
+
+ private static final Log LOG = LogFactory.getLog(ProxyStatement.class);
+
+Index: libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/WrappedConnection.java
===================================================================
---- libproxool-java-0.9.0RC3.orig/src/java/org/logicalcobwebs/proxool/WrappedConnection.java 2007-10-30 10:40:29.000000000 +0530
-+++ libproxool-java-0.9.0RC3/src/java/org/logicalcobwebs/proxool/WrappedConnection.java 2007-10-30 10:40:41.000000000 +0530
+--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/WrappedConnection.java 2007-12-14 14:34:13.000000000 +0100
++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/WrappedConnection.java 2009-12-17 15:16:53.648140124 +0100
@@ -5,9 +5,9 @@
*/
package org.logicalcobwebs.proxool;
@@ -76,3 +87,31 @@
-*/
\ No newline at end of file
+*/
+Index: libproxool-java-0.9.1/src/java-test/org/logicalcobwebs/cglib/EnhancerTest.java
+===================================================================
+--- libproxool-java-0.9.1.orig/src/java-test/org/logicalcobwebs/cglib/EnhancerTest.java 2009-12-18 11:32:01.682159077 +0100
++++ libproxool-java-0.9.1/src/java-test/org/logicalcobwebs/cglib/EnhancerTest.java 2009-12-18 11:34:22.562195531 +0100
+@@ -6,7 +6,7 @@
+ package org.logicalcobwebs.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,
+Index: libproxool-java-0.9.1/src/java-test/org/logicalcobwebs/cglib/MyProxy.java
+===================================================================
+--- libproxool-java-0.9.1.orig/src/java-test/org/logicalcobwebs/cglib/MyProxy.java 2009-12-18 11:32:01.462177650 +0100
++++ libproxool-java-0.9.1/src/java-test/org/logicalcobwebs/cglib/MyProxy.java 2009-12-18 11:37:31.651883681 +0100
+@@ -6,8 +6,8 @@
+ package org.logicalcobwebs.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;
+
Added: trunk/libproxool-java/debian/patches/proxool-detect-cglib-enhancer.diff
===================================================================
--- trunk/libproxool-java/debian/patches/proxool-detect-cglib-enhancer.diff (rev 0)
+++ trunk/libproxool-java/debian/patches/proxool-detect-cglib-enhancer.diff 2010-05-08 11:25:27 UTC (rev 12349)
@@ -0,0 +1,101 @@
+Index: libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java
+===================================================================
+--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java 2009-12-17 15:16:10.500202003 +0100
++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java 2009-12-17 15:16:34.889198202 +0100
+@@ -11,6 +11,7 @@
+ import net.sf.cglib.proxy.MethodInterceptor;
+ import net.sf.cglib.proxy.MethodProxy;
+
++import java.lang.reflect.InvocationHandler;
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.sql.Connection;
+@@ -23,7 +24,7 @@
+ * @author billhorsman
+ * @author $Author: billhorsman $ (current maintainer)
+ */
+-class ProxyDatabaseMetaData implements MethodInterceptor {
++class ProxyDatabaseMetaData implements MethodInterceptor, InvocationHandler {
+
+ private static final Log LOG = LogFactory.getLog(ProxyDatabaseMetaData.class);
+
+@@ -69,6 +70,10 @@
+
+ return result;
+ }
++ public Object invoke( Object proxy, Method method, Object[] args ) throws Throwable {
++ return intercept(proxy,method,args,null);
++ }
++
+
+ /**
+ * Whether the underlying databaseMetaData are equal
+Index: libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyFactory.java
+===================================================================
+--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/ProxyFactory.java 2009-12-17 15:16:10.559302547 +0100
++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/ProxyFactory.java 2009-12-17 15:16:34.889198202 +0100
+@@ -22,7 +22,10 @@
+ import java.util.Set;
+ import java.util.Map;
+ import java.util.HashMap;
++import java.lang.reflect.InvocationHandler;
++import java.lang.reflect.Method;
+ import java.lang.reflect.Modifier;
++import java.lang.reflect.Proxy;
+
+ /**
+ * A central place to build proxy objects. It will also provide the original
+@@ -107,13 +110,18 @@
+ return (DatabaseMetaData) getProxy(databaseMetaData, new ProxyDatabaseMetaData(databaseMetaData, wrappedConnection), null);
+ }
+
+- private static Object getProxy(Object delegate, Callback callback, ConnectionPoolDefinitionIF def) {
+- Enhancer e = new Enhancer();
+- e.setNamingPolicy(NAMING_POLICY);
+- e.setInterfaces(getInterfaces(delegate.getClass(), def));
+- e.setCallback(callback);
+- e.setClassLoader(ProxyFactory.class.getClassLoader());
+- return e.create();
++ private static Object getProxy(Object delegate, Object callback, ConnectionPoolDefinitionIF def) {
++ try {
++ Class.forName( "org.objectweb.asm.CodeVisitor" );
++ Enhancer e = new Enhancer( );
++ e.setNamingPolicy( NAMING_POLICY );
++ e.setInterfaces( getInterfaces( delegate.getClass( ), def ) );
++ e.setCallback( ( Callback ) callback );
++ e.setClassLoader( ProxyFactory.class.getClassLoader( ) );
++ return e.create( );
++ } catch(Throwable t) {
++ return Proxy.newProxyInstance( ProxyFactory.class.getClassLoader( ), getInterfaces( delegate.getClass(), def ), ( InvocationHandler ) callback);
++ }
+ }
+
+ /**
+Index: libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/WrappedConnection.java
+===================================================================
+--- libproxool-java-0.9.1.orig/src/java/org/logicalcobwebs/proxool/WrappedConnection.java 2009-12-17 15:16:22.379183811 +0100
++++ libproxool-java-0.9.1/src/java/org/logicalcobwebs/proxool/WrappedConnection.java 2009-12-17 15:16:34.889198202 +0100
+@@ -5,13 +5,13 @@
+ */
+ package org.logicalcobwebs.proxool;
+
+-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;
+
++import java.lang.reflect.InvocationHandler;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.InvocationTargetException;
+ import java.sql.Statement;
+@@ -25,7 +25,7 @@
+ * @author $Author: billhorsman $ (current maintainer)
+ * @since Proxool 0.9
+ */
+-public class WrappedConnection implements MethodInterceptor {
++public class WrappedConnection implements MethodInterceptor, InvocationHandler {
+
+ private static final Log LOG = LogFactory.getLog(WrappedConnection.class);
+
Modified: trunk/libproxool-java/debian/patches/series
===================================================================
--- trunk/libproxool-java/debian/patches/series 2010-05-08 10:48:22 UTC (rev 12348)
+++ trunk/libproxool-java/debian/patches/series 2010-05-08 11:25:27 UTC (rev 12349)
@@ -1,2 +1,4 @@
+testsuite.diff
missing-methods.diff
cglib.diff
+proxool-detect-cglib-enhancer.diff
Added: trunk/libproxool-java/debian/patches/testsuite.diff
===================================================================
--- trunk/libproxool-java/debian/patches/testsuite.diff (rev 0)
+++ trunk/libproxool-java/debian/patches/testsuite.diff 2010-05-08 11:25:27 UTC (rev 12349)
@@ -0,0 +1,50 @@
+Index: libproxool-java-0.9.1/src/java-test/org/logicalcobwebs/proxool/AllTests.java
+===================================================================
+--- libproxool-java-0.9.1.orig/src/java-test/org/logicalcobwebs/proxool/AllTests.java 2009-12-18 12:00:23.242162589 +0100
++++ libproxool-java-0.9.1/src/java-test/org/logicalcobwebs/proxool/AllTests.java 2009-12-18 12:00:28.502184731 +0100
+@@ -30,24 +30,24 @@
+ suite.addTestSuite(ConnectionInfoTest.class);
+ suite.addTestSuite(ConnectionListenerTest.class);
+ suite.addTestSuite(ConnectionResetterTest.class);
+- suite.addTestSuite(ProxoolDataSourceTest.class);
++/* suite.addTestSuite(ProxoolDataSourceTest.class);*/
+ suite.addTestSuite(DriverTest.class);
+ suite.addTestSuite(ConnectionPoolTest.class);
+- suite.addTestSuite(FatalSqlExceptionTest.class);
+- suite.addTestSuite(HibernateTest.class);
++/* suite.addTestSuite(FatalSqlExceptionTest.class);*/
++/* suite.addTestSuite(HibernateTest.class);*/
+ suite.addTestSuite(HouseKeeperTest.class);
+ suite.addTestSuite(HypersonicTest.class);
+- suite.addTestSuite(KillTest.class);
++/* suite.addTestSuite(KillTest.class);*/
+ suite.addTestSuite(ManyPoolsTest.class);
+ suite.addTestSuite(PropertyTest.class);
+ suite.addTestSuite(PrototyperTest.class);
+ suite.addTestSuite(ProxyConnectionTest.class);
+- suite.addTestSuite(ProxyDatabaseMetaDataTest.class);
+- suite.addTestSuite(ProxyStatementTest.class);
++/* suite.addTestSuite(ProxyDatabaseMetaDataTest.class);*/
++/* suite.addTestSuite(ProxyStatementTest.class);*/
+ suite.addTestSuite(RegistrationTest.class);
+ suite.addTestSuite(StateListenerTest.class);
+- suite.addTestSuite(UpdateDefinitionTest.class);
+- suite.addTestSuite(WrapperTest.class);
++/* suite.addTestSuite(UpdateDefinitionTest.class);*/
++/* suite.addTestSuite(WrapperTest.class);*/
+ // TODO Need more investigation into why this fails sometimes.
+ // suite.addTestSuite(PerformanceTest.class);
+
+Index: libproxool-java-0.9.1/src/java-test/org/logicalcobwebs/proxool/configuration/AllTests.java
+===================================================================
+--- libproxool-java-0.9.1.orig/src/java-test/org/logicalcobwebs/proxool/configuration/AllTests.java 2009-12-18 12:00:23.312168474 +0100
++++ libproxool-java-0.9.1/src/java-test/org/logicalcobwebs/proxool/configuration/AllTests.java 2009-12-18 12:00:28.502184731 +0100
+@@ -30,7 +30,7 @@
+ suite.addTestSuite(ConfiguratorTest.class);
+ suite.addTestSuite(PropertyConfiguratorTest.class);
+ suite.addTestSuite(JAXPConfiguratorTest.class);
+- suite.addTestSuite(AvalonConfiguratorTest.class);
++/* suite.addTestSuite(AvalonConfiguratorTest.class);*/
+
+ // create a wrapper for global initialization code.
+ TestSetup wrapper = new TestSetup(suite) {
Modified: trunk/libproxool-java/debian/rules
===================================================================
--- trunk/libproxool-java/debian/rules 2010-05-08 10:48:22 UTC (rev 12348)
+++ trunk/libproxool-java/debian/rules 2010-05-08 11:25:27 UTC (rev 12349)
@@ -7,7 +7,9 @@
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILD_TARGET := jar javadoc
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := commons-logging servlet-api jsp-api cglib avalon-framework
+DEB_JARS := commons-logging servlet-api jsp-api cglib avalon-framework junit log4j-1.2 logkit hsqldb
+DEB_ANT_ARGS := -Dbuild.sysclasspath=last
+DEB_ANT_CHECK_TARGET := test
install/libproxool-java::
install -m 644 -D proxool.jar $(DEB_DESTDIR)/usr/share/java/proxool-$(DEB_UPSTREAM_VERSION).jar
More information about the pkg-java-commits
mailing list