[Jpackage-commits] dist/hibernate2/devel .cvsignore, 1.1, 1.2 hibernate-2.1.8.pom, NONE, 1.1 hibernate-FumTest.patch, NONE, 1.1 hibernate-build_xml.patch, NONE, 1.1 hibernate2-EhCache.patch, NONE, 1.1 hibernate2.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:19:27 CEST 2008


Update of /home/projects/jpackage/cvs/dist/hibernate2/devel
In directory ryu.zarb.org:/tmp/cvs-serv8514/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hibernate-2.1.8.pom hibernate-FumTest.patch 
	hibernate-build_xml.patch hibernate2-EhCache.patch 
	hibernate2.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hibernate2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:19:00 -0000	1.1
--- .cvsignore	28 May 2008 18:19:24 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ hibernate-2.1.8.tar.gz

--- NEW FILE: hibernate-build_xml.patch ---
--- build.xml.sav0	2005-01-30 08:48:51.000000000 +0100
+++ build.xml	2008-02-04 11:27:30.000000000 +0100
@@ -17,7 +17,7 @@
 	<property name="name" value="hibernate"/>
 	<property name="name2" value="hibernate2"/>
 	<property name="version" value="2.1"/>
-	<property name="patchlevel" value="7"/>
+	<property name="patchlevel" value="8"/>
 
 	<!-- set global properties for this build -->
 	<property name="src.dir" value="src"/>
@@ -30,7 +30,7 @@
 	<property name="testclasses.dir" value="${build.dir}/testclasses"/>
 	<property name="test.out.dir" value="testout"/>
 	<property name="clover.out.dir" value="cloverout"/>
-	<property name="dist.dir" value="../${name}"/>
+        <property name="dist.dir" value="dist"/>
 	<property name="doc.dir" value="doc"/>
 	<property name="doc.api.dir" value="${doc.dir}/api"/>
 	<property name="doc.ref.dir" value="${doc.dir}/reference"/>
@@ -150,6 +150,7 @@
 			value="org.eclipse.jdt.core.JDTCompilerAdapter"
 			classpath="${java.class.path}"/>		
 		<javac
+                        source="1.4"
 			srcdir="${src.dir}" 
 			destdir="${classes.dir}"
 			classpathref="lib.class.path" 
@@ -245,6 +246,7 @@
 		
 		<mkdir dir="${dist.api.dir}"/>
 		<javadoc
+                        source="1.4"
 			classpathref="lib.class.path"
 			destdir="${dist.api.dir}"
 			use="true"

--- NEW FILE: hibernate2-EhCache.patch ---
--- src/net/sf/hibernate/cache/EhCache.java.sav	2008-03-05 18:00:20.000000000 +0100
+++ src/net/sf/hibernate/cache/EhCache.java	2008-03-05 18:00:48.000000000 +0100
@@ -175,9 +175,9 @@
         catch (IllegalStateException e) {
             throw new CacheException(e);
         } 
-        catch (IOException e) {
-            throw new CacheException(e);
-        }
+//      catch (IOException e) {
+//          throw new CacheException(e);
+//      }
     }
 
     /**
@@ -227,4 +227,4 @@
         return Timestamper.ONE_MS * 60000;
     }
 
-}
\ No newline at end of file
+}

--- NEW FILE: hibernate-FumTest.patch ---
*** test/org/hibernate/test/FumTest.java.orig	2004-06-05 12:31:06.000000000 -0400
--- test/org/hibernate/test/FumTest.java	2004-06-05 12:31:38.000000000 -0400
***************
*** 1,6 ****
--- 1,11 ----
  //$Id: FumTest.java,v 1.1.2.11 2004/06/02 02:24:49 steveebersole Exp $
  package org.hibernate.test;
  
+ import java.io.ByteArrayInputStream;
+ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
+ import java.io.ObjectInputStream;
+ import java.io.ObjectOutputStream;
  import java.io.Serializable;
  import java.util.ArrayList;
  import java.util.Date;
***************
*** 18,23 ****
--- 23,29 ----
  import junit.textui.TestRunner;
  import net.sf.hibernate.Criteria;
  import net.sf.hibernate.FetchMode;
+ import net.sf.hibernate.FlushMode;
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.LockMode;
  import net.sf.hibernate.Query;
***************
*** 33,41 ****
--- 39,53 ----
  import net.sf.hibernate.type.EntityType;
  import net.sf.hibernate.type.StringType;
  import net.sf.hibernate.type.Type;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+ 
  
  public class FumTest extends TestCase {
  	
+         private static final Log log = LogFactory.getLog(FumTest.class);
+ 
  	private static short fumKeyShort = 1;
  	
  	public FumTest(String arg) {

--- NEW FILE: hibernate-2.1.8.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>net.sf.hibernate</groupId>
  <artifactId>hibernate</artifactId>
  <version>2.1.8</version>
</project>
--- NEW FILE: hibernate2.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# 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. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS 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 COPYRIGHT
# OWNER OR 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.
#

%define section free
%define base_version 2.1
%define oname hibernate

Summary:        Relational persistence and query service
Name:           hibernate2
Version:        2.1.8
Release:        1jpp
Epoch:          0
License:        LGPL
URL:            http://www.hibernate.org/
Group:          Database
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Source0:        http://downloads.sourceforge.net/hibernate/hibernate-2.1.8.tar.gz
Source1:        http://repo1.maven.org/maven2/net/sf/hibernate/hibernate/2.1.8/hibernate-2.1.8.pom
Patch0:         hibernate-build_xml.patch
Patch1:         hibernate-FumTest.patch
Patch2:         hibernate2-EhCache.patch


BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  junit
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  ant-swing
BuildRequires:  ant-trax

BuildRequires:  asm
BuildRequires:  c3p0
BuildRequires:  cglib >= 0:2.0
BuildRequires:  jakarta-commons-collections >= 0:2.1
BuildRequires:  jakarta-commons-dbcp >= 0:1.2.1
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-commons-pool
BuildRequires:  odmg = 0:3.0
BuildRequires:  hsqldb >= 0:1.72
BuildRequires:  dom4j 
BuildRequires:  j2ee_connector_1_5_api
BuildRequires:  jta_1_0_1B_api
BuildRequires:  log4j
BuildRequires:  ehcache-bootstrap >= 0:1.3.0
BuildRequires:  oscache
BuildRequires:  proxool
BuildRequires:  swarmcache
BuildRequires:  jakarta-jcs
BuildRequires:  jboss-cache 
BuildRequires:  jboss4-system >= 0:4.0.0
BuildRequires:  xalan-j2
Requires:  java >= 0:1.5.0
Requires:  hibernate_jdbc_cache
Requires:  hibernate_in_process_cache	
Requires:  cglib >= 0:2.0
Requires:  jakarta-commons-collections >= 0:2.1
Requires:  jakarta-commons-logging
Requires:  odmg = 0:3.0
Requires:  dom4j
Requires:  jta_1_0_1B_api
Requires:  xalan-j2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Requires(post):    jpackage-utils >= 0:1.7.4
Requires(postun):  jpackage-utils >= 0:1.7.4

%description
Hibernate is a powerful, ultra-high performance 
object/relational persistence and query service 
for Java. Hibernate lets you develop persistent 
objects following common Java idiom - including 
association, inheritance, polymorphism, composition 
and the Java collections framework. Extremely 
fine-grained, richly typed object models are 
possible. The Hibernate Query Language, designed 
as a "minimal" object-oriented extension to SQL, 
provides an elegant bridge between the object and 
relational worlds. Hibernate is now the most 
popular ORM solution for Java.


%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}.

%package manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description manual
%{summary}.

%prep
%setup -q -n %{oname}-%{base_version}
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;

%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0
(cd lib
ln -s $(build-classpath hsqldb) hsqldb.jar
)
export CLASSPATH=$(build-classpath \
c3p0 \
cglib \
commons-collections \
commons-dbcp \
commons-logging \
commons-pool \
dom4j \
ehcache \
j2ee_connector_1_5_api \
jboss-cache \
jboss4/jboss4-system \
jcs \
jta_1_0_1B_api \
odmg \
oscache \
proxool \
swarmcache \
xalan-j2 \
xalan-j2-serializer \
hsqldb \
asm/asm \
)
CLASSPATH=$CLASSPATH:build/classes:build/testclasses:etc
export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer ant/ant-swing ant/ant-junit junit"
ant -Dbuild.sysclasspath=only jar extras junitreport javadoc 

%install
rm -rf $RPM_BUILD_ROOT

# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}

cp -p dist/%{name}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
%add_to_maven_depmap net.sf.hibernate %{oname} %{version} JPP %{name}

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc
cp -p etc/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
rm -rf doc/api

# manual
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p lgpl.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
  rm -f %{_javadocdir}/%{name}
fi

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/lgpl.txt
%{_javadir}/*.jar
%{_datadir}/%{name}-%{version}
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%files manual
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}

%changelog
* Wed Mar 05 2008 Ralph Apel <r.apel at r-apel.de> - 0:2.1.8-1jpp
- 2.1.8 and rename to hibernate2
- Adapt to current JPP50 environment
- Add pom and depmap frag

* Fri Sep 23 2005 Ralph Apel <r.apel at r-apel.de> - 0:2.1.6-2jpp
- Relax jboss4 requirements to >= 4.0.0

* Mon Sep 13 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.6-1jpp
- Drop saxpath requirements
- Require jaxen >= 0:1.1
- Upgrade to 2.1.6
- Activate clover task (clover10)

* Wed Aug 25 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.4-4jpp
- Build with ant-1.6.2
- Drop ant-optional BuildReq
- Relax some versioned dependencies

* Thu Jul 02 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.4-3jpp
- Relax some versioned build dependencies 
- Reduce runtime dependencies
- Require hibernate_in_process_cache and hibernate_jdbc_cache at runtime

* Thu Jun 17 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.4-2jpp
- Try avoid symlinking into lib

* Tue Jun 08 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.1.4-1jpp
- First JPackage release

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hibernate2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:19:00 -0000	1.1
--- sources	28 May 2008 18:19:25 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 6a0459c511ded947d01cc7de15a518ef  hibernate-2.1.8.tar.gz




More information about the JPackage-commits mailing list