Hibernate SVN: r14669 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-05-16 12:27:59 -0400 (Fri, 16 May 2008)
New Revision: 14669
Added:
core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE/
Log:
Retagging with dependencies for building javadoc
Copied: core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE (from rev 14668, core/branches/Branch_3_2_4_SP1_CP)
16 years, 6 months
Hibernate SVN: r14668 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-05-16 11:59:01 -0400 (Fri, 16 May 2008)
New Revision: 14668
Removed:
core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE/
Log:
Removing the tag; it will be recreated with API dependencies
16 years, 6 months
Hibernate SVN: r14667 - in core/branches/Branch_3_2_4_SP1_CP: doc and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-05-16 11:55:53 -0400 (Fri, 16 May 2008)
New Revision: 14667
Added:
core/branches/Branch_3_2_4_SP1_CP/doc/
core/branches/Branch_3_2_4_SP1_CP/doc/api/
core/branches/Branch_3_2_4_SP1_CP/doc/api/jdstyle.css
core/branches/Branch_3_2_4_SP1_CP/doc/api/package.html
Log:
Adding doc/api back in
Added: core/branches/Branch_3_2_4_SP1_CP/doc/api/jdstyle.css
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/api/jdstyle.css (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/api/jdstyle.css 2008-05-16 15:55:53 UTC (rev 14667)
@@ -0,0 +1,117 @@
+/* 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;
+}
Added: core/branches/Branch_3_2_4_SP1_CP/doc/api/package.html
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/api/package.html (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/api/package.html 2008-05-16 15:55:53 UTC (rev 14667)
@@ -0,0 +1,39 @@
+<body>
+
+<h2>Hibernate API</h2>
+
+This documentation concentrates upon the following <b>Core API</b> interfaces:
+<li><tt>org.hibernate.Hibernate</tt></li>
+<li><tt>org.hibernate.Session</tt></li>
+<li><tt>org.hibernate.SessionFactory</tt></li>
+<li><tt>org.hibernate.Transaction</tt></li>
+<li><tt>org.hibernate.Query</tt></li>
+<li><tt>org.hibernate.Criteria</tt></li>
+<li><tt>org.hibernate.ScrollableResults</tt></li>
+<li><tt>org.hibernate.cfg.Configuration</tt></li>
+<li><tt>org.hibernate.expression.Expression</tt></li>
+<li><tt>org.hibernate.expression.Order</tt></li>
+<li><tt>org.hibernate.expression.Example</tt></li>
+These interfaces are fully intended to be exposed to application code.<br>
+<br>
+The <b>Extension API</b> is intended to be used by application programmers
+to extend Hibernate functionality. None of these interfaces are intended
+to be called by the application - they are called internally by Hibernate.
+This API is less stable than the Core API. The safest way to extend
+functionality is to contribute extensions back to the project; that way
+extensions will be updated when the Extension API changes.<br>
+<br>
+Full Hibernate documentation may be found at
+<a href="http://hibernate.org">hibernate.org</a>.
+@see org.hibernate.Hibernate
+@see org.hibernate.Session
+@see org.hibernate.SessionFactory
+@see org.hibernate.Transaction
+@see org.hibernate.Query
+@see org.hibernate.Criteria
+@see org.hibernate.ScrollableResults
+@see org.hibernate.cfg.Configuration
+@see org.hibernate.expression.Expression
+@see org.hibernate.expression.Order
+@see org.hibernate.expression.Example
+</body>
16 years, 6 months
Hibernate SVN: r14666 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-05-15 16:49:07 -0400 (Thu, 15 May 2008)
New Revision: 14666
Added:
core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE/
Log:
HIBERNATE-84 : tag for Hibernate 3.2.4.sp1.cp03 standalone
Copied: core/tags/JBOSS_EAP_3_2_4_SP1_CP03_STANDALONE (from rev 14665, core/branches/Branch_3_2_4_SP1_CP)
16 years, 6 months
Hibernate SVN: r14665 - in core/branches/Branch_3_2_4_SP1_CP: test/org/hibernate/test/legacy and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-05-15 16:04:42 -0400 (Thu, 15 May 2008)
New Revision: 14665
Modified:
core/branches/Branch_3_2_4_SP1_CP/build.xml
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/ConfigurationPerformanceTest.java
Log:
HIBERNATE-96 : Split distribution into separate source and binary distributions
Modified: core/branches/Branch_3_2_4_SP1_CP/build.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-05-15 18:10:32 UTC (rev 14664)
+++ core/branches/Branch_3_2_4_SP1_CP/build.xml 2008-05-15 20:04:42 UTC (rev 14665)
@@ -176,10 +176,7 @@
<delete dir="${dir.out.db}" />
</target>
-
- <!-- The ANTLR related targets -->
-
- <target name="init.antlr" depends="init" description="Check ANTLR dependencies.">
+ <target name="init.antlr" depends="init" unless="antlr.isUpToDate" description="Check ANTLR dependencies.">
<uptodate property="antlr.isUpToDate" targetfile="${dir.out.antlr-package}/.antlr_run">
<srcfiles dir="${dir.grammar}" includes="*.g"/>
</uptodate>
@@ -223,7 +220,7 @@
<!-- Compilation targets -->
- <target name="compile" depends="init,antlr" description="Compile the Java source code">
+ <target name="compile" depends="init,antlr" unless="classes.isUpToDate" description="Compile the Java source code">
<mkdir dir="${dir.out.classes}"/>
<available classname="org.eclipse.core.launcher.Main" property="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/>
@@ -246,7 +243,7 @@
</copy>
</target>
- <target name="compiletest" depends="compile" description="Compile the tests">
+ <target name="compiletest" depends="compile" unless="test-classes.isUpToDate" description="Compile the tests">
<mkdir dir="${dir.out.test-classes}"/>
<available classname="org.eclipse.core.launcher.Main" property="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/>
@@ -295,8 +292,19 @@
<unzip src="${basedir}/${jar.name}.jar" dest="${dir.out.classes}" />
<unzip src="${basedir}/${testjar.name}.jar" dest="${dir.out.test-classes}" />
<delete dir="${dir.out.generated-source}" />
- <mkdir dir="${dir.out.antlr-package}" />
- <touch file="${dir.out.antlr-package}/.antlr_run"/>
+ <available file="${dir.out.classes}/org/hibernate/hql/antlr"
+ type="dir"
+ property="antlr.isUpToDate"/>
+ <available file="${dir.out.classes}/org/hibernate"
+ type="dir"
+ property="classes.isUpToDate"/>
+ <available file="${dir.out.test-classes}/org/hibernate/test"
+ type="dir"
+ property="test-classes.isUpToDate"/>
+ <property name="test-classes.isFromJar" value="$test-classes.isUpToDate" />
+ <echo message="antlr.isUpToDate=${antlr.isUpToDate}" />
+ <echo message="classes.isUpToDate=${classes.isUpToDate}" />
+ <echo message="test-classes.isUpToDate=${test-classes.isUpToDate}" />
</target>
<target name="junit" depends="junit.prepare">
@@ -515,7 +523,7 @@
<!-- Instrumentation tasks -->
- <target name="instrument.prepare">
+ <target name="instrument.clean">
<delete>
<fileset dir="${dir.out.test-classes}">
<patternset refid="ps.instrument.domain" />
@@ -523,28 +531,35 @@
</delete>
</target>
- <target name="instrument.cglib" depends="instrument.prepare,compiletest" description="Performs cglib-based instrumentation">
- <taskdef name="instrument" classname="org.hibernate.tool.instrument.cglib.InstrumentTask">
- <classpath path="${dir.out.classes}"/>
- <classpath refid="path.lib"/>
- </taskdef>
- <available classname="org.eclipse.core.launcher.Main" property="build.compiler"
+ <target name="instrument.prepare-from-testjar" depends="instrument.clean" if="test-classes.isFromJar">
+ <unzip src="${basedir}/${testjar.name}.jar" dest="${dir.out.test-classes}" />
+ </target>
+
+ <target name="instrument.prepare" depends="instrument.prepare-from-testjar" unless="test-classes.isFromJar">
+ <available classname="org.eclipse.core.launcher.Main" property="build.compiler"
value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/>
- <javac destdir="${dir.out.test-classes}"
+ <javac destdir="${dir.out.test-classes}"
debug="${javac.debug}"
optimize="${javac.optimize}"
target="${javac.target}"
source="${javac.source}"
nowarn="on">
- <classpath>
- <path refid="path.lib" />
- <pathelement path="${dir.out.classes}" />
- </classpath>
+ <classpath>
+ <path refid="path.lib" />
+ <pathelement path="${dir.out.classes}" />
+ </classpath>
<src path="${dir.test}" />
<patternset refid="ps.instrument.domain" />
</javac>
+ </target>
+
+ <target name="instrument.cglib" depends="instrument.prepare,compiletest" description="Performs cglib-based instrumentation">
+ <taskdef name="instrument" classname="org.hibernate.tool.instrument.cglib.InstrumentTask">
+ <classpath path="${dir.out.classes}"/>
+ <classpath refid="path.lib"/>
+ </taskdef>
<instrument verbose="true">
<fileset dir="${dir.out.test-classes}">
<patternset refid="ps.instrument.domain" />
@@ -553,27 +568,10 @@
</target>
<target name="instrument.javassist" depends="instrument.prepare,compiletest" description="Performs javassist-based instrumentation">
- <taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
- <classpath path="${dir.out.classes}"/>
- <classpath refid="path.lib"/>
- </taskdef>
-
- <available classname="org.eclipse.core.launcher.Main" property="build.compiler"
- value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/>
- <javac destdir="${dir.out.test-classes}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- source="${javac.source}"
- nowarn="on">
- <classpath>
- <path refid="path.lib" />
- <pathelement path="${dir.out.classes}" />
- </classpath>
- <src path="${dir.test}" />
- <patternset refid="ps.instrument.domain" />
- </javac>
-
+ <taskdef name="instrument" classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
+ <classpath path="${dir.out.classes}"/>
+ <classpath refid="path.lib"/>
+ </taskdef>
<instrument verbose="true">
<fileset dir="${dir.out.test-classes}">
<patternset refid="ps.instrument.domain" />
@@ -581,7 +579,6 @@
</instrument>
</target>
-
<!-- Distribution related targets -->
<target name="versioncheck" description="Check version.properties up against lib directory">
@@ -672,11 +669,11 @@
</jar>
</target>
- <target name="dist" depends="init,versioncheck,jar,testjar,javadoc,refdoc,antlr.bnf"
- description="Build everything and package">
- <mkdir dir="${dir.dist}" />
+ <target name="dist" depends="init,versioncheck,jar,testjar"
+ description="Build everything and package">
+ <mkdir dir="${dir.dist}" />
- <!-- prepare build.xml -->
+ <!-- prepare build.xml -->
<copy file="${basedir}/build.xml" todir="${dir.dist}"/>
<replace file="${dir.dist}/build.xml">
<replacetoken><![CDATA[../${name}-${version}]]></replacetoken>
@@ -687,70 +684,45 @@
<replacevalue><![CDATA[name="dir.jdbc" value="lib"]]></replacevalue>
</replace>
- <zip zipfile="${dir.dist}/${fullname}.zip">
- <zipfileset prefix="${name}-${version.major_minor}/doc/reference" dir="${dir.doc.ref}/build" />
- <zipfileset prefix="${name}-${version.major_minor}/doc/tutorial" dir="${dir.doc.ref}/tutorial" >
- <include name="src/**" />
- <include name="lib/**" />
- <include name="build.xml" />
- <include name="runCleanDatabase.sh" />
- <include name="web.xml" />
- </zipfileset>
- <zipfileset prefix="${name}-${version.major_minor}/doc/other" dir="${dir.doc}/other" />
- <zipfileset prefix="${name}-${version.major_minor}/doc" dir="${dir.out.doc}" />
- <zipfileset prefix="${name}-${version.major_minor}/eg" dir="${dir.eg}"/>
- <zipfileset prefix="${name}-${version.major_minor}/etc" dir="${dir.etc}"/>
- <zipfileset prefix="${name}-${version.major_minor}/grammar" dir="${dir.grammar}"/>
+ <zip zipfile="${dir.dist}/${fullname}.zip">
+ <zipfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${jar.name}.jar" />
<zipfileset prefix="${name}-${version.major_minor}/lib" dir="${dir.build}/versioncheck-dist"/>
- <zipfileset prefix="${name}-${version.major_minor}/src" dir="${dir.src}"/>
- <zipfileset prefix="${name}-${version.major_minor}/test" dir="${dir.test}"/>
- <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/readme.txt" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/lgpl.txt" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/JBossORG-EULA.txt" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/changelog.txt" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.bat" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.sh" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/hibernate_logo.gif" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${dir.dist}/build.xml" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${jar.name}.jar" />
- <zipfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${testjar.name}.jar" />
- </zip>
- <checksum file="${dir.dist}/${fullname}.zip" algorithm="MD5" fileext=".md5.txt"/>
+ <zipfileset prefix="${name}-${version.major_minor}/eg" dir="${dir.eg}"/>
+ <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.bat" />
+ <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.sh" />
+ <zipfileset prefix="${name}-${version.major_minor}" file="${dir.dist}/build.xml" />
+ <zipfileset prefix="${name}-${version.major_minor}/etc" dir="${dir.etc}">
+ <exclude name="ehcache.xml" />
+ <exclude name="oscache.properties" />
+ </zipfileset>
+ <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/lgpl.txt" />
+ <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/JBossORG-EULA.txt" />
+ <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/readme.txt" />
+ <zipfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${testjar.name}.jar" />
+ <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/hibernate_logo.gif" />
+ </zip>
+ <checksum file="${dir.dist}/${fullname}.zip" algorithm="MD5" fileext=".md5.txt"/>
- <tar tarfile="${dir.dist}/${fullname}.tar">
- <tarfileset prefix="${name}-${version.major_minor}/doc/reference" dir="${dir.doc.ref}/build" />
- <tarfileset prefix="${name}-${version.major_minor}/doc/tutorial" dir="${dir.doc.ref}/tutorial" >
- <include name="src/**" />
- <include name="lib/**" />
- <include name="build.xml" />
- <include name="runCleanDatabase.sh" />
- <include name="web.xml" />
- </tarfileset>
- <tarfileset prefix="${name}-${version.major_minor}/doc/other" dir="${dir.doc}/other" />
- <tarfileset prefix="${name}-${version.major_minor}/doc" dir="${dir.out.doc}" />
- <tarfileset prefix="${name}-${version.major_minor}/eg" dir="${dir.eg}"/>
- <tarfileset prefix="${name}-${version.major_minor}/etc" dir="${dir.etc}"/>
- <tarfileset prefix="${name}-${version.major_minor}/grammar" dir="${dir.grammar}"/>
- <tarfileset prefix="${name}-${version.major_minor}/lib" dir="${dir.build}/versioncheck-dist"/>
- <tarfileset prefix="${name}-${version.major_minor}/src" dir="${dir.src}"/>
- <tarfileset prefix="${name}-${version.major_minor}/test" dir="${dir.test}"/>
- <tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/readme.txt" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/lgpl.txt" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/JBossORG-EULA.txt" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/changelog.txt" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.bat" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.sh" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/hibernate_logo.gif" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${dir.dist}/build.xml" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${jar.name}.jar" />
- <tarfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${testjar.name}.jar" />
- </tar>
- <gzip src="${dir.dist}/${fullname}.tar" zipfile="${dir.dist}/${fullname}.tar.gz"/>
- <checksum file="${dir.dist}/${fullname}.tar.gz" algorithm="MD5" fileext=".md5.txt"/>
+ <zip zipfile="${dir.dist}/${fullname}-src.zip">
+ <zipfileset prefix="${name}-${version.major_minor}-src/src" dir="${dir.src}"/>
+ <zipfileset prefix="${name}-${version.major_minor}-src/grammar" dir="${dir.grammar}"/>
+ <zipfileset prefix="${name}-${version.major_minor}-src/grammar/gensrc" dir="${dir.out.generated-source}"/>
+ <zipfileset prefix="${name}-${version.major_minor}-src/test" dir="${dir.test}"/>
+ <zipfileset prefix="${name}-${version.major_minor}-src/lib" dir="${dir.build}/versioncheck-dist"/>
+ <zipfileset prefix="${name}-${version.major_minor}-src/eg" dir="${dir.eg}"/>
+ <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/build.bat" />
+ <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/build.sh" />
+ <zipfileset prefix="${name}-${version.major_minor}-src" file="${dir.dist}/build.xml" />
+ <zipfileset prefix="${name}-${version.major_minor}-src/etc" dir="${dir.etc}">
+ <exclude name="ehcache.xml" />
+ <exclude name="oscache.properties" />
+ </zipfileset>
+ <zipfileset prefix="${name}-${version.major_minor}-src" file="${basedir}/hibernate_logo.gif" />
+ </zip>
+ <checksum file="${dir.dist}/${fullname}-src.zip" algorithm="MD5" fileext=".md5.txt"/>
- <delete file="${dir.dist}/${fullname}.tar"/>
- <delete file="${dir.dist}/build.xml"/>
- </target>
+ <delete file="${dir.dist}/build.xml"/>
+ </target>
<target name="dist.complete" depends="init,versioncheck,jar,javadoc,refdoc,antlr.bnf"
description="Build and package everything, and run test suite and eg example">
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/ConfigurationPerformanceTest.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/ConfigurationPerformanceTest.java 2008-05-15 18:10:32 UTC (rev 14664)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/legacy/ConfigurationPerformanceTest.java 2008-05-15 20:04:42 UTC (rev 14665)
@@ -83,7 +83,7 @@
public void testLoadingAndSerializationOfConfiguration() throws HibernateException, FileNotFoundException, IOException, ClassNotFoundException {
- String prefix = "./test/org/hibernate/test/";
+ String prefix = "./build/testclasses/org/hibernate/test/";
try {
// first time
System.err.println("###FIRST SAVELOAD###");
16 years, 6 months
Hibernate SVN: r14663 - core/branches/Branch_3_2/test/org/hibernate/test/hql.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-05-14 10:48:24 -0400 (Wed, 14 May 2008)
New Revision: 14663
Modified:
core/branches/Branch_3_2/test/org/hibernate/test/hql/BulkManipulationTest.java
Log:
HHH-3283 : protection on vm-based timestamps where dialect does not support params in INSERT ... SELECT
Modified: core/branches/Branch_3_2/test/org/hibernate/test/hql/BulkManipulationTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/hql/BulkManipulationTest.java 2008-05-14 14:48:07 UTC (rev 14662)
+++ core/branches/Branch_3_2/test/org/hibernate/test/hql/BulkManipulationTest.java 2008-05-14 14:48:24 UTC (rev 14663)
@@ -318,11 +318,16 @@
data.cleanup();
}
+ protected boolean supportsBulkInsertIdGeneration(Class entityClass) {
+ EntityPersister persister = sfi().getEntityPersister( entityClass.getName() );
+ IdentifierGenerator generator = persister.getIdentifierGenerator();
+ return HqlSqlWalker.supportsIdGenWithBulkInsertion( generator );
+ }
+
public void testInsertWithGeneratedId() {
// Make sure the env supports bulk inserts with generated ids...
- EntityPersister persister = sfi().getEntityPersister( PettingZoo.class.getName() );
- IdentifierGenerator generator = persister.getIdentifierGenerator();
- if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+ if ( !supportsBulkInsertIdGeneration( PettingZoo.class ) ) {
+ reportSkip( "bulk id generation not supported", "test bulk inserts with generated id and generated timestamp");
return;
}
@@ -351,7 +356,7 @@
s.close();
assertEquals( zoo.getName(), pz.getName() );
- assertTrue( zoo.getId() != pz.getId() );
+ assertTrue( !zoo.getId().equals( pz.getId() ) );
s = openSession();
t = s.beginTransaction();
@@ -362,9 +367,8 @@
public void testInsertWithGeneratedVersionAndId() {
// Make sure the env supports bulk inserts with generated ids...
- EntityPersister persister = sfi().getEntityPersister( IntegerVersioned.class.getName() );
- IdentifierGenerator generator = persister.getIdentifierGenerator();
- if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+ if ( !supportsBulkInsertIdGeneration( IntegerVersioned.class ) ) {
+ reportSkip( "bulk id generation not supported", "test bulk inserts with generated id and generated timestamp");
return;
}
@@ -407,11 +411,17 @@
public void testInsertWithGeneratedTimestampVersion() {
// Make sure the env supports bulk inserts with generated ids...
- EntityPersister persister = sfi().getEntityPersister( TimestampVersioned.class.getName() );
- IdentifierGenerator generator = persister.getIdentifierGenerator();
- if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+ if ( !supportsBulkInsertIdGeneration( TimestampVersioned.class ) ) {
+ reportSkip( "bulk id generation not supported", "test bulk inserts with generated id and generated timestamp");
return;
}
+ // dialects which do not allow a parameter in the select portion of an INSERT ... SELECT statement
+ // will also be problematic for this test because the timestamp here is vm-based as opposed to
+ // db-based.
+ if ( !getDialect().supportsParametersInInsertSelect() ) {
+ reportSkip( "dialect does not support parameter in INSERT ... SELECT", "test bulk inserts with generated id and generated timestamp");
+ return;
+ }
Session s = openSession();
Transaction t = s.beginTransaction();
16 years, 6 months
Hibernate SVN: r14662 - core/trunk/testsuite/src/test/java/org/hibernate/test/hql.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-05-14 10:48:07 -0400 (Wed, 14 May 2008)
New Revision: 14662
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
Log:
HHH-3283 : protection on vm-based timestamps where dialect does not support params in INSERT ... SELECT
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java 2008-05-14 14:08:23 UTC (rev 14661)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java 2008-05-14 14:48:07 UTC (rev 14662)
@@ -318,11 +318,16 @@
data.cleanup();
}
+ protected boolean supportsBulkInsertIdGeneration(Class entityClass) {
+ EntityPersister persister = sfi().getEntityPersister( entityClass.getName() );
+ IdentifierGenerator generator = persister.getIdentifierGenerator();
+ return HqlSqlWalker.supportsIdGenWithBulkInsertion( generator );
+ }
+
public void testInsertWithGeneratedId() {
// Make sure the env supports bulk inserts with generated ids...
- EntityPersister persister = sfi().getEntityPersister( PettingZoo.class.getName() );
- IdentifierGenerator generator = persister.getIdentifierGenerator();
- if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+ if ( !supportsBulkInsertIdGeneration( PettingZoo.class ) ) {
+ reportSkip( "bulk id generation not supported", "test bulk inserts with generated id and generated timestamp");
return;
}
@@ -351,7 +356,7 @@
s.close();
assertEquals( zoo.getName(), pz.getName() );
- assertTrue( zoo.getId() != pz.getId() );
+ assertTrue( !zoo.getId().equals( pz.getId() ) );
s = openSession();
t = s.beginTransaction();
@@ -362,9 +367,8 @@
public void testInsertWithGeneratedVersionAndId() {
// Make sure the env supports bulk inserts with generated ids...
- EntityPersister persister = sfi().getEntityPersister( IntegerVersioned.class.getName() );
- IdentifierGenerator generator = persister.getIdentifierGenerator();
- if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+ if ( !supportsBulkInsertIdGeneration( IntegerVersioned.class ) ) {
+ reportSkip( "bulk id generation not supported", "test bulk inserts with generated id and generated timestamp");
return;
}
@@ -407,11 +411,17 @@
public void testInsertWithGeneratedTimestampVersion() {
// Make sure the env supports bulk inserts with generated ids...
- EntityPersister persister = sfi().getEntityPersister( TimestampVersioned.class.getName() );
- IdentifierGenerator generator = persister.getIdentifierGenerator();
- if ( !HqlSqlWalker.supportsIdGenWithBulkInsertion( generator ) ) {
+ if ( !supportsBulkInsertIdGeneration( TimestampVersioned.class ) ) {
+ reportSkip( "bulk id generation not supported", "test bulk inserts with generated id and generated timestamp");
return;
}
+ // dialects which do not allow a parameter in the select portion of an INSERT ... SELECT statement
+ // will also be problematic for this test because the timestamp here is vm-based as opposed to
+ // db-based.
+ if ( !getDialect().supportsParametersInInsertSelect() ) {
+ reportSkip( "dialect does not support parameter in INSERT ... SELECT", "test bulk inserts with generated id and generated timestamp");
+ return;
+ }
Session s = openSession();
Transaction t = s.beginTransaction();
16 years, 6 months
Hibernate SVN: r14661 - core/trunk/core/src/main/java/org/hibernate/dialect.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-05-14 10:08:23 -0400 (Wed, 14 May 2008)
New Revision: 14661
Modified:
core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java
Log:
HHH-3282 : DB2Dialect#supportsLobValueChangePropogation == false
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java 2008-05-14 14:06:47 UTC (rev 14660)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/DB2Dialect.java 2008-05-14 14:08:23 UTC (rev 14661)
@@ -362,4 +362,8 @@
public boolean supportsEmptyInList() {
return false;
}
+
+ public boolean supportsLobValueChangePropogation() {
+ return false;
+ }
}
16 years, 6 months
Hibernate SVN: r14660 - core/branches/Branch_3_2/src/org/hibernate/dialect.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-05-14 10:06:47 -0400 (Wed, 14 May 2008)
New Revision: 14660
Modified:
core/branches/Branch_3_2/src/org/hibernate/dialect/DB2Dialect.java
Log:
HHH-3282 : DB2Dialect#supportsLobValueChangePropogation == false
Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/DB2Dialect.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/dialect/DB2Dialect.java 2008-05-12 21:50:14 UTC (rev 14659)
+++ core/branches/Branch_3_2/src/org/hibernate/dialect/DB2Dialect.java 2008-05-14 14:06:47 UTC (rev 14660)
@@ -362,4 +362,8 @@
public boolean supportsEmptyInList() {
return false;
}
+
+ public boolean supportsLobValueChangePropogation() {
+ return false;
+ }
}
16 years, 6 months