[Jpackage-commits] dist/hibernate3-entitymanager/devel .cvsignore, 1.1, 1.2 hibernate-entitymanager-build_xml.patch, NONE, 1.1 hibernate-entitymanager-common-build_xml.patch, NONE, 1.1 hibernate-entitymanager-jdstyle.css, NONE, 1.1 hibernate3-entitymanager.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:22:13 CEST 2008


Update of /home/projects/jpackage/cvs/dist/hibernate3-entitymanager/devel
In directory ryu.zarb.org:/tmp/cvs-serv12590/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hibernate-entitymanager-build_xml.patch 
	hibernate-entitymanager-common-build_xml.patch 
	hibernate-entitymanager-jdstyle.css 
	hibernate3-entitymanager.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hibernate3-entitymanager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:21:55 -0000	1.1
--- .cvsignore	28 May 2008 18:22:11 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ hibernate-entitymanager-3.2.0.CR1.tar.gz

--- NEW FILE: hibernate-entitymanager-jdstyle.css ---
/* Javadoc style sheet */

/* Define colors, fonts and other style attributes here to override the defaults  */

/* Page background color */
body { 	font-family: Arial;
	background-color: white;
	font-size: 10pt;
 }
td { 	font-family: Arial;
	font-size: 10pt;
 }
/* Table colors */
.TableHeadingColor     { background: #F4F4F4 }
.TableSubHeadingColor  { background: #F4F4F4 }
.TableRowColor         { background: #FFFFFF }

/* Font used in left-hand frame lists */
.FrameTitleFont   { font-size: normal; font-family: Arial }
.FrameHeadingFont { font-size: normal; font-family: Arial }
.FrameItemFont    { font-size: normal; font-family: Arial }

/* Example of smaller, sans-serif font in frames */
/* .FrameItemFont  { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */

/* Navigation bar fonts and colors */
.NavBarCell1    { background-color:#F4F4F4;}
.NavBarCell1Rev { background-color:silver;}

.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}

.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}

A {
    color: #003399;
}

A:active {
    color: #003399;
}

A:visited {
    color: #888888;
}

P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
    color: #000000;
}

TD, TH, SPAN {
    color: #000000;
}

BLOCKQUOTE {
    margin-right: 0px;
}


/*H1, H2, H3, H4, H5, H6    {
    color: #000000;
    font-weight:500;
    margin-top:10px;
    padding-top:15px;
}

H1 { font-size: 150%; }
H2 { font-size: 140%; }
H3 { font-size: 110%; font-weight: bold; }
H4 { font-size: 110%; font-weight: bold;}
H5 { font-size: 100%; font-style: italic; }
H6 { font-size: 100%; font-style: italic; }*/

TT {
font-size: 90%;
    font-family: "Courier New", Courier, monospace;
    color: #000000;
}

PRE {
font-size: 90%;
    padding: 5px;
    border-style: solid;
    border-width: 1px;
    border-color: #CCCCCC;
    background-color: #F4F4F4;
}

UL, OL, LI {
    list-style: disc;
}

HR  {
    width: 100%;
    height: 1px;
    background-color: #CCCCCC;
    border-width: 0px;
    padding: 0px;
    color: #CCCCCC;
}

.variablelist { 
    padding-top: 10; 
    padding-bottom:10; 
    margin:0;
}

.itemizedlist, UL { 
    padding-top: 0; 
    padding-bottom:0; 
    margin:0; 
}

.term { 
    font-weight:bold;
}

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hibernate3-entitymanager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:21:55 -0000	1.1
--- sources	28 May 2008 18:22:11 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 8f165e85a555f197a753408e3fe1d3a2  hibernate-entitymanager-3.2.0.CR1.tar.gz

--- NEW FILE: hibernate-entitymanager-common-build_xml.patch ---
--- common-build.xml.sav	2006-05-13 13:58:40.000000000 -0400
+++ common-build.xml	2006-08-02 13:49:55.000000000 -0400
@@ -211,8 +211,8 @@
 			value="org.eclipse.jdt.core.JDTCompilerAdapter"
 			classpath="${java.class.path}"/>
 		<javac
-            target="1.4"
-            source="1.4"   
+            target="1.5"
+            source="1.5"   
 			destdir="${testclasses.dir}"
 			classpathref="junit.classpath"
 			debug="${javac.debug}"
@@ -225,14 +225,14 @@
     <target name="instrument" depends="compiletest"
 			description="Instrument the persistent classes"> <!-- depends="jar" -->
 
-		<taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask">
+		<taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
 			<classpath path="${classes.dir}"/>
             <classpath path="${testclasses.dir}"/>         
 			<classpath refid="lib.class.path"/>
 		</taskdef>
 
 		<instrument verbose="true">
-			<fileset dir="${testclasses.dir}/org/hibernate/test">
+			<fileset dir="${testclasses.dir}/org/hibernate/ejb/test">
 				<include name="**/*.class"/>
 				<exclude name="**/*Test$*.class"/>
 				<exclude name="**/*Test.class"/>
@@ -322,7 +322,7 @@
         	windowtitle="${Name} API Documentation"
         	Overview="${doc.api.dir}/package.html"
         	doctitle="${Name} API Documentation"
-        	stylesheetfile="${hibernate-core.doc.api}/jdstyle.css"
+        	stylesheetfile="doc/api/jdstyle.css"
         	link="${javadoc}">
         	<packageset dir="${src.dir}" defaultexcludes="yes" >
 		      <include name="**/*" />
@@ -443,4 +443,4 @@
 		<cvs command="-q diff -u -N" output="patch.txt"/>
 	</target>
 
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: hibernate-entitymanager-build_xml.patch ---
--- build.xml.sav	2006-05-13 13:58:24.000000000 -0400
+++ build.xml	2006-08-02 13:45:08.000000000 -0400
@@ -107,7 +107,7 @@
         </antcall>
     </target>
 
-    <target name="compiletest" depends="compile" description="Compile the tests">
+    <!-- target name="compiletest" depends="compile" description="Compile the tests">
         <available
                 classname="org.eclipse.core.launcher.Main"
                 property="build.compiler"
@@ -116,7 +116,7 @@
         <javac
                 source="1.5"
                 srcdir="${test.dir}"
-                destdir="${classes.dir}"
+                destdir="${testclasses.dir}"
                 debug="${javac.debug}"
                 optimize="${javac.optimize}"
                 nowarn="on">
@@ -124,9 +124,18 @@
                 <path refid="lib.class.path"/>
             </classpath>
         </javac>
-    </target>
+    </target -->
+
+    <path id="junit.moduleclasspath">
+           <pathelement location="${src.dir}"/>
+           <pathelement location="${test.dir}"/>
+           <pathelement location="lib/testlibs/org.eclipse.jdt.core_3.1.0.jar"/>           <fileset dir="${jdbc.dir}">
+                       <include name="**/*.jar"/>
+                           <include name="**/*.zip"/>
+           </fileset>
+    </path>
 
-    <target name="junit" depends="compiletest,test-resources">
+    <!-- target name="junit" depends="compiletest,test-resources">
         <mkdir dir="test_output"/>
         <mkdir dir="${classes.dir}/META-INF/services"/>
         <copy todir="${classes.dir}">
@@ -150,16 +159,12 @@
                     <include name="**/*.par"/>
                 </fileset>
                 <path refid="lib.class.path"/>
-                <!-- pathelement path="${classes.dir}"/ -->
                 <dirset dir="${classes.dir}">
                     <exclude name="**/pack/**.*"/>
                 </dirset>
 
-                <!-- pathelement path="build/test.par"/ -->
                 <pathelement path="${src.dir}"/>
-                <!-- pick up properties from here -->
                 <pathelement path="${test.dir}"/>
-                <!-- pick up mappings from here -->
             </classpath>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -169,7 +174,7 @@
                 </fileset>
             </batchtest>
         </junit>
-    </target>
+    </target -->
 
     <!-- Run a single unit test. -->
     <target name="junitsingle" depends="compiletest"

--- NEW FILE: hibernate3-entitymanager.spec ---
# Copyright (c) 2000-2005, 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 hname hibernate-entitymanager

Summary:        Relational persistence and query service
Name:           hibernate3-entitymanager
Version:        3.2.0
Release:        0.cr1.2jpp
Epoch:          0
License:        LGPL
URL:            http://annotations.hibernate.org/
Group:          Database
Vendor:         JPackage Project
Distribution:   JPackage
Source0:        http://prdownloads.sourceforge.net/hibernate/hibernate-entitymanager-3.2.0.CR1.tar.gz
Source1:	hibernate-entitymanager-jdstyle.css
Patch1:		hibernate-entitymanager-build_xml.patch
Patch0:		hibernate-entitymanager-common-build_xml.patch
BuildRequires:  jpackage-utils >= 0:1.6
BuildRequires:  java-devel >= 0:1.5
BuildRequires:  ant
BuildRequires:  antlr
BuildRequires:  asm
BuildRequires:  cglib
BuildRequires:  dom4j
BuildRequires:  geronimo-jta-1.0.1B-api
BuildRequires:  hibernate3 >= 0:3.2
BuildRequires:  hibernate3-annotations >= 0:3.2
BuildRequires:  hibernate3-ejb-persistence-3.0-api
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-logging
BuildRequires:  javassist
BuildRequires:  jboss4-common
#BuildRequires:  jboss-archive-browsing

Requires:  java >= 0:1.5
Requires:  hibernate3 >= 0:3.2
Requires:  hibernate3-annotations >= 0:3.2
Requires:  javassist
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
EJB3 standardizes the basic APIs and the metadata needed for
any object/relational persistence mechanism. Hibernate
EntityManager implements the programming interfaces,
lifecycle rules and packaging archive support as defined by
the EJB3 persistence specification.
Together with Hibernate Annotations, this wrapper implements
a complete (and standalone) EJB3 persistence provider, as
defined by the JSR-220 public final draft, on top of the
mature Hibernate3 core.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

%prep
%setup -q -n %{hname}-%{version}.CR1
# remove all binary libs
for j in $(find . -name "*.jar"); do
	mv $j $j.no
done
mkdir test_output
cp %{SOURCE1} doc/api/jdstyle.css

%patch0 -b .sav
%patch1 -b .sav

%build
export JAVA_HOME=/usr/lib/jvm/java-1.5.0
build-jar-repository -s -p . \
hibernate3

mkdir jdbc
build-jar-repository -s -p jdbc hsqldb

build-jar-repository -s -p lib \
antlr \
asm/asm \
cglib-nodep \
commons-collections \
commons-logging \
dom4j \
javassist \
jboss4/jboss-common \
jta \
hibernate3 \
hibernate3-annotations \
hibernate3-ejb-persistence-3.0-api

ant \
	-Dhibernate-core.home=. \
	-Djdk15.home=/usr/lib/jvm/java-1.5.0 \
	jar javadoc junitinstrument junit

%install
rm -rf $RPM_BUILD_ROOT

# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}

cp -p target/%{hname}/%{hname}.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)

## 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

# manual
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p lgpl.txt $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

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

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


%changelog
* Tue Aug 02 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.2.0-0.cr1.2jpp
- Use rpm packaged hibernate3 and dependency libraries
- Activate unit tests

* Wed Jun 21 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.2.0-0.cr1.1jpp
- First JPP-5.0 release




More information about the JPackage-commits mailing list