--- libhibernate3-java-3.3.1.GA.orig/debian/changelog +++ libhibernate3-java-3.3.1.GA/debian/changelog @@ -0,0 +1,51 @@ +libhibernate3-java (3.3.1.GA-2) unstable; urgency=low + + * Build all subprojects except jbosscache2. + + -- Torsten Werner Wed, 12 Nov 2008 23:00:41 +0100 + +libhibernate3-java (3.3.1.GA-1) unstable; urgency=low + + * New upstream release + * Add patch cglib.diff to revert cglib repackaging. + * Add patch asm.diff to revert asm repackaging. + + -- Torsten Werner Sun, 09 Nov 2008 20:39:16 +0100 + +libhibernate3-java (3.3.0.CR1-2) unstable; urgency=low + + [ Torsten Werner ] + * Simplify debian/watch. + + [ Varun Hiremath ] + * Include upstream provided *.dtd files in the jar (Closes: #496912) + + -- Varun Hiremath Thu, 18 Sep 2008 01:18:44 -0400 + +libhibernate3-java (3.3.0.CR1-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version to 3.8.0 + * Add new build.xml and ant.properties file to build jars + * Update debian/watch file + * Add libslf4j-java to Build-Depends + * Add missing dependencies (Closes: #488119) + * Remove debian/libhibernate3-java.install, not required + * Update orig-tar.sh and orig-tar.exclude files + * debian/copyright: remove the full text of Apache 2.0 license, as now + is included in common licenses + + -- Varun Hiremath Sat, 05 Jul 2008 01:07:59 +0530 + +libhibernate3-java (3.2.6-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version to 3.7.3 + + -- Varun Hiremath Sat, 16 Feb 2008 01:42:42 +0530 + +libhibernate3-java (3.2.5-1) unstable; urgency=low + + * Initial Release (closes: #385569). + + -- Torsten Werner Sun, 14 Oct 2007 14:43:34 +0200 --- libhibernate3-java-3.3.1.GA.orig/debian/control +++ libhibernate3-java-3.3.1.GA/debian/control @@ -0,0 +1,54 @@ +Source: libhibernate3-java +Section: contrib/libs +Priority: optional +Maintainer: Debian Java Maintainers +Uploaders: Torsten Werner , Varun Hiremath +Build-Depends: debhelper (>= 5), cdbs, quilt +Build-Depends-Indep: ant, ant-optional, antlr, glassfish-javaee, + junit, libasm-java, libcglib2.1-java, libcommons-collections3-java, + libcommons-logging-java, libc3p0-java, libdom4j-java, libehcache-java, + libjavassist-java, liboscache-java, libproxool-java, libswarmcache-java, + java-gcj-compat-dev, libjboss-jmx-java, libjboss-system-java, + libjboss-cache1-java, libslf4j-java +Standards-Version: 3.8.0 +Homepage: http://www.hibernate.org +Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libhibernate3-java +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhibernate3-java + +Package: libhibernate3-java +Architecture: all +Depends: java-gcj-compat | java2-runtime, antlr, glassfish-javaee, + junit, libasm-java, libcglib2.1-java, libcommons-collections3-java, + libcommons-logging-java, libc3p0-java, libdom4j-java, libehcache-java, + libjavassist-java, liboscache-java, libproxool-java, libswarmcache-java, + java-gcj-compat-dev, libjboss-jmx-java, libjboss-system-java, + libjboss-cache1-java, libslf4j-java +Description: Relational Persistence for Idiomatic Java + Hibernate is a powerful, high performance object/relational persistence + and query service. Hibernate lets you develop persistent classes + following object-oriented idiom - including association, inheritance, + polymorphism, composition, and collections. Hibernate allows you to + express queries in its own portable SQL extension (HQL), as well as in + native SQL, or with an object-oriented Criteria and Example API. + . + Unlike many other persistence solutions, Hibernate does not hide the + power of SQL from you and guarantees that your investment in relational + technology and knowledge is as valid as always. + +Package: libhibernate3-java-doc +Section: contrib/doc +Architecture: all +Suggests: libhibernate3-java +Description: Relational Persistence for Idiomatic Java (documentation) + Hibernate is a powerful, high performance object/relational persistence + and query service. Hibernate lets you develop persistent classes + following object-oriented idiom - including association, inheritance, + polymorphism, composition, and collections. Hibernate allows you to + express queries in its own portable SQL extension (HQL), as well as in + native SQL, or with an object-oriented Criteria and Example API. + . + Unlike many other persistence solutions, Hibernate does not hide the + power of SQL from you and guarantees that your investment in relational + technology and knowledge is as valid as always. + . + This package includes the documentation. --- libhibernate3-java-3.3.1.GA.orig/debian/compat +++ libhibernate3-java-3.3.1.GA/debian/compat @@ -0,0 +1 @@ +5 --- libhibernate3-java-3.3.1.GA.orig/debian/watch +++ libhibernate3-java-3.3.1.GA/debian/watch @@ -0,0 +1,4 @@ +version=3 +http://sf.net/hibernate/hibernate-distribution-(.+)-dist.tar.gz \ + debian debian/orig-tar.sh + --- libhibernate3-java-3.3.1.GA.orig/debian/libhibernate3-java-doc.docs +++ libhibernate3-java-3.3.1.GA/debian/libhibernate3-java-doc.docs @@ -0,0 +1 @@ +javadoc/* --- libhibernate3-java-3.3.1.GA.orig/debian/orig-tar.exclude +++ libhibernate3-java-3.3.1.GA/debian/orig-tar.exclude @@ -0,0 +1,3 @@ +*.jar +*/lib/* +*/documentation* --- libhibernate3-java-3.3.1.GA.orig/debian/copyright +++ libhibernate3-java-3.3.1.GA/debian/copyright @@ -0,0 +1,103 @@ +This package was debianized by Torsten Werner on +2007-10-14. The source code was downloaded from +. + +Authors: + + Daniel Bradby + Emmanuel Bernard + Max R. Andersen + Gavin King + Steve Ebersole + Christian Bauer + +Copyright: (C) 2006, 2007, Red Hat Middleware, LLC. + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + +On Debian GNU/Linux system you can find a copy of this license in +`/usr/share/common-licenses/LGPL'. + +-------- + +Files: + src/org/hibernate/exception/ExceptionUtils.java + src/org/hibernate/exception/Nestable.java + src/org/hibernate/exception/NestableDelegate.java + src/org/hibernate/exception/NestableException.java + src/org/hibernate/exception/NestableRuntimeException.java + src/org/hibernate/util/FastHashMap.java + src/org/hibernate/util/SerializationHelper.java + +Copyright (c) 2002-2003 The Apache Software Foundation. All rights reserved. + +License: + + The Apache Software License, Version 1.1 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + 3. The end-user documentation included with the redistribution, if + any, must include the following acknowledgement: + "This product includes software developed by the + Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgement may appear in the software itself, + if and wherever such third-party acknowledgements normally appear. + + 4. The names "The Jakarta Project", "Commons", and "Apache Software + Foundation" must not be used to endorse or promote products derived + from this software without prior written permission. For written + permission, please contact apache@apache.org. + + 5. Products derived from this software may not be called "Apache" + nor may "Apache" appear in their names without prior written + permission of the Apache Software Foundation. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +-------- + +Files: + src/org/hibernate/cache/EhCache.java + src/org/hibernate/cache/EhCacheProvider.java + +Copyright 2003-2006 Greg Luck, Jboss Inc + +License: Apache 2.0 + + On Debian GNU/Linux system you can find the complete text of the + Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0' + +The Debian packaging is (C) 2007, Torsten Werner +and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + --- libhibernate3-java-3.3.1.GA.orig/debian/rules +++ libhibernate3-java-3.3.1.GA/debian/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +JAVA_HOME := /usr/lib/jvm/java-gcj/ +DEB_ANT_BUILDFILE := debian/build.xml +DEB_ANT_BUILD_TARGET := jar javadoc +DEB_JARS := ant-antlr ant-junit antlr asm-attrs ehcache cglib commons-collections3 \ + commons-logging c3p0 dom4j javassist jboss-cache1 jboss-system jboss-jmx \ + glassfish-javaee junit oscache proxool swarmcache slf4j-api + +install/libhibernate3-java:: + install -m 644 -D hibernate3.jar \ + debian/libhibernate3-java/usr/share/java/hibernate3-$(DEB_UPSTREAM_VERSION).jar + dh_link /usr/share/java/hibernate3-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/hibernate3.jar + +get-orig-source: + uscan --upstream-version 0 --rename --- libhibernate3-java-3.3.1.GA.orig/debian/README.Debian-source +++ libhibernate3-java-3.3.1.GA/debian/README.Debian-source @@ -0,0 +1,13 @@ +libhibernate3-java +================== + +The upstream supplied source package contains binary jar files and +pre-built documentation. Currently no clean source distribution +exists. Therefore, the upstream sources were modified to comply with +the Debian Free Software Guidelines. + +Use the rules/get-orig-source target to create the orig.tar.gz. +For more details on repackaging of upstream sources please see the +debian/orig-tar.sh file. + + -- Varun Hiremath , Sat, 10 Nov 2007 15:31:20 +0530 --- libhibernate3-java-3.3.1.GA.orig/debian/orig-tar.sh +++ libhibernate3-java-3.3.1.GA/debian/orig-tar.sh @@ -0,0 +1,18 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' +TAR=$3 +DIR=libhibernate3-java-$2.orig + +# clean up the upstream tarball +tar -x -z -f $TAR +mv hibernate-* $DIR +tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi --- libhibernate3-java-3.3.1.GA.orig/debian/ant.properties +++ libhibernate3-java-3.3.1.GA/debian/ant.properties @@ -0,0 +1,16 @@ +project.name=hibernate3 +class.dir=build +antlr.dir=project/core/src/main/antlr/ +core.source.dir=project/core/src/main/java/ +ehcache.source.dir=project/cache-ehcache/src/main/java/ +jbosscache.source.dir=project/cache-jbosscache/src/main/java/ +jbosscache2.source.dir=project/cache-jbosscache2/src/main/java/ +oscache.source.dir=project/cache-oscache/src/main/java/ +swarmcache.source.dir=project/cache-swarmcache/src/main/java/ +c3p0.source.dir=project/cache-swarmcache/src/main/java/ +proxool.source.dir=project/cache-swarmcache/src/main/java/ +jmx.source.dir=project/core/src/main/java/ +resources.dir=project/core/src/main/resources/ +generate.dir=org/hibernate/hql/antlr +doc.dir=javadoc +jar=hibernate3.jar --- libhibernate3-java-3.3.1.GA.orig/debian/build.xml +++ libhibernate3-java-3.3.1.GA/debian/build.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- libhibernate3-java-3.3.1.GA.orig/debian/patches/cglib.diff +++ libhibernate3-java-3.3.1.GA/debian/patches/cglib.diff @@ -0,0 +1,218 @@ +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java 2008-11-09 20:20:12.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java 2008-11-09 20:20:18.000000000 +0100 +@@ -26,8 +26,8 @@ + + import org.hibernate.bytecode.ReflectionOptimizer; + import org.hibernate.PropertyAccessException; +-import org.hibernate.repackage.cglib.beans.BulkBean; +-import org.hibernate.repackage.cglib.beans.BulkBeanException; ++import net.sf.cglib.beans.BulkBean; ++import net.sf.cglib.beans.BulkBeanException; + + import java.io.Serializable; + import java.io.ObjectOutputStream; +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java 2008-11-09 20:19:56.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java 2008-11-09 20:20:00.000000000 +0100 +@@ -26,9 +26,9 @@ + + import java.lang.reflect.Modifier; + +-import org.hibernate.repackage.cglib.beans.BulkBean; +-import org.hibernate.repackage.cglib.beans.BulkBeanException; +-import org.hibernate.repackage.cglib.reflect.FastClass; ++import net.sf.cglib.beans.BulkBean; ++import net.sf.cglib.beans.BulkBeanException; ++import net.sf.cglib.reflect.FastClass; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.hibernate.bytecode.BytecodeProvider; +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2008-11-09 20:20:03.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2008-11-09 20:20:10.000000000 +0100 +@@ -29,25 +29,25 @@ + import java.io.IOException; + import java.io.ByteArrayOutputStream; + +-import org.hibernate.repackage.cglib.transform.ClassTransformer; +-import org.hibernate.repackage.cglib.transform.TransformingClassGenerator; +-import org.hibernate.repackage.cglib.transform.ClassReaderGenerator; +-import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled; +-import org.hibernate.repackage.cglib.transform.impl.InterceptFieldFilter; +-import org.hibernate.repackage.cglib.transform.impl.InterceptFieldTransformer; +-import org.hibernate.repackage.cglib.core.ClassNameReader; +-import org.hibernate.repackage.cglib.core.DebuggingClassWriter; ++import net.sf.cglib.transform.ClassTransformer; ++import net.sf.cglib.transform.TransformingClassGenerator; ++import net.sf.cglib.transform.ClassReaderGenerator; ++import net.sf.cglib.transform.impl.InterceptFieldEnabled; ++import net.sf.cglib.transform.impl.InterceptFieldFilter; ++import net.sf.cglib.transform.impl.InterceptFieldTransformer; ++import net.sf.cglib.core.ClassNameReader; ++import net.sf.cglib.core.DebuggingClassWriter; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.hibernate.bytecode.AbstractClassTransformerImpl; + import org.hibernate.bytecode.util.FieldFilter; + import org.hibernate.bytecode.util.ClassFilter; + import org.hibernate.HibernateException; +-import org.hibernate.repackage.cglib.asm.Attribute; +-import org.hibernate.repackage.cglib.asm.Type; +-import org.hibernate.repackage.cglib.asm.ClassReader; +-import org.hibernate.repackage.cglib.asm.ClassWriter; +-import org.hibernate.repackage.cglib.asm.attrs.Attributes; ++import net.sf.cglib.asm.Attribute; ++import net.sf.cglib.asm.Type; ++import net.sf.cglib.asm.ClassReader; ++import net.sf.cglib.asm.ClassWriter; ++import net.sf.cglib.asm.attrs.Attributes; + + /** + * Enhance the classes allowing them to implements InterceptFieldEnabled +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java 2008-11-09 20:19:18.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java 2008-11-09 20:19:31.000000000 +0100 +@@ -25,7 +25,7 @@ + package org.hibernate.bytecode.cglib; + + import org.hibernate.bytecode.ReflectionOptimizer; +-import org.hibernate.repackage.cglib.reflect.FastClass; ++import net.sf.cglib.reflect.FastClass; + import org.hibernate.InstantiationException; + + import java.io.Serializable; +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java 2008-11-09 20:19:46.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java 2008-11-09 20:19:53.000000000 +0100 +@@ -30,13 +30,13 @@ + import org.hibernate.proxy.pojo.cglib.CGLIBProxyFactory; + import org.hibernate.AssertionFailure; + import org.hibernate.HibernateException; +-import org.hibernate.repackage.cglib.proxy.Enhancer; +-import org.hibernate.repackage.cglib.proxy.CallbackFilter; +-import org.hibernate.repackage.cglib.proxy.MethodInterceptor; +-import org.hibernate.repackage.cglib.proxy.MethodProxy; +-import org.hibernate.repackage.cglib.proxy.NoOp; +-import org.hibernate.repackage.cglib.proxy.Callback; +-import org.hibernate.repackage.cglib.proxy.Factory; ++import net.sf.cglib.proxy.Enhancer; ++import net.sf.cglib.proxy.CallbackFilter; ++import net.sf.cglib.proxy.MethodInterceptor; ++import net.sf.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.NoOp; ++import net.sf.cglib.proxy.Callback; ++import net.sf.cglib.proxy.Factory; + + import java.lang.reflect.Method; + import java.util.HashMap; +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java 2008-11-09 20:20:21.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java 2008-11-09 20:20:33.000000000 +0100 +@@ -50,7 +50,7 @@ + public static boolean isInstrumented(Class entityClass) { + Class[] definedInterfaces = entityClass.getInterfaces(); + for ( int i = 0; i < definedInterfaces.length; i++ ) { +- if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ++ if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) + || "org.hibernate.bytecode.javassist.FieldHandled".equals( definedInterfaces[i].getName() ) ) { + return true; + } +@@ -68,7 +68,7 @@ + } + Class[] definedInterfaces = entity.getClass().getInterfaces(); + for ( int i = 0; i < definedInterfaces.length; i++ ) { +- if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ) { ++ if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ) { + // we have a CGLIB enhanced entity + return CGLIBHelper.extractFieldInterceptor( entity ); + } +@@ -88,7 +88,7 @@ + if ( entity != null ) { + Class[] definedInterfaces = entity.getClass().getInterfaces(); + for ( int i = 0; i < definedInterfaces.length; i++ ) { +- if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ) { ++ if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ) { + // we have a CGLIB enhanced entity + return CGLIBHelper.injectFieldInterceptor( entity, entityName, uninitializedFieldNames, session ); + } +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java 2008-11-09 20:20:42.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java 2008-11-09 20:20:50.000000000 +0100 +@@ -26,7 +26,7 @@ + + import org.hibernate.intercept.FieldInterceptor; + import org.hibernate.engine.SessionImplementor; +-import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled; ++import net.sf.cglib.transform.impl.InterceptFieldEnabled; + + import java.util.Set; + +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java 2008-11-09 20:20:36.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java 2008-11-09 20:20:40.000000000 +0100 +@@ -27,7 +27,7 @@ + import java.io.Serializable; + import java.util.Set; + +-import org.hibernate.repackage.cglib.transform.impl.InterceptFieldCallback; ++import net.sf.cglib.transform.impl.InterceptFieldCallback; + + import org.hibernate.intercept.AbstractFieldInterceptor; + import org.hibernate.engine.SessionImplementor; +@@ -167,4 +167,4 @@ + ')'; + } + +-} +\ No newline at end of file ++} +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java 2008-11-09 20:20:53.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java 2008-11-09 20:21:00.000000000 +0100 +@@ -28,11 +28,11 @@ + import java.lang.reflect.InvocationTargetException; + import java.lang.reflect.Method; + +-import org.hibernate.repackage.cglib.proxy.Callback; +-import org.hibernate.repackage.cglib.proxy.CallbackFilter; +-import org.hibernate.repackage.cglib.proxy.Enhancer; +-import org.hibernate.repackage.cglib.proxy.InvocationHandler; +-import org.hibernate.repackage.cglib.proxy.NoOp; ++import net.sf.cglib.proxy.Callback; ++import net.sf.cglib.proxy.CallbackFilter; ++import net.sf.cglib.proxy.Enhancer; ++import net.sf.cglib.proxy.InvocationHandler; ++import net.sf.cglib.proxy.NoOp; + + import org.hibernate.HibernateException; + import org.hibernate.LazyInitializationException; +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2008-11-09 20:18:35.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2008-11-09 20:19:44.000000000 +0100 +@@ -29,12 +29,12 @@ + import org.hibernate.bytecode.cglib.BytecodeProviderImpl; + import org.hibernate.bytecode.ClassTransformer; + import org.hibernate.tool.instrument.BasicInstrumentationTask; +-import org.hibernate.repackage.cglib.asm.ClassReader; ++import net.sf.cglib.asm.ClassReader; + + import java.io.ByteArrayInputStream; + +-import org.hibernate.repackage.cglib.core.ClassNameReader; +-import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled; ++import net.sf.cglib.core.ClassNameReader; ++import net.sf.cglib.transform.impl.InterceptFieldEnabled; + + /** + * An Ant task for instrumenting persistent classes in order to enable --- libhibernate3-java-3.3.1.GA.orig/debian/patches/asm.diff +++ libhibernate3-java-3.3.1.GA/debian/patches/asm.diff @@ -0,0 +1,34 @@ +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2008-11-09 20:34:59.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2008-11-09 20:35:44.000000000 +0100 +@@ -43,11 +43,11 @@ + import org.hibernate.bytecode.util.FieldFilter; + import org.hibernate.bytecode.util.ClassFilter; + import org.hibernate.HibernateException; +-import net.sf.cglib.asm.Attribute; +-import net.sf.cglib.asm.Type; +-import net.sf.cglib.asm.ClassReader; +-import net.sf.cglib.asm.ClassWriter; +-import net.sf.cglib.asm.attrs.Attributes; ++import org.objectweb.asm.Attribute; ++import org.objectweb.asm.Type; ++import org.objectweb.asm.ClassReader; ++import org.objectweb.asm.ClassWriter; ++import org.objectweb.asm.attrs.Attributes; + + /** + * Enhance the classes allowing them to implements InterceptFieldEnabled +Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java +=================================================================== +--- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2008-11-09 20:35:47.000000000 +0100 ++++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2008-11-09 20:35:52.000000000 +0100 +@@ -29,7 +29,7 @@ + import org.hibernate.bytecode.cglib.BytecodeProviderImpl; + import org.hibernate.bytecode.ClassTransformer; + import org.hibernate.tool.instrument.BasicInstrumentationTask; +-import net.sf.cglib.asm.ClassReader; ++import org.objectweb.asm.ClassReader; + + import java.io.ByteArrayInputStream; + --- libhibernate3-java-3.3.1.GA.orig/debian/patches/series +++ libhibernate3-java-3.3.1.GA/debian/patches/series @@ -0,0 +1,2 @@ +cglib.diff +asm.diff