August 2006 - hibernate-commits - Jboss List Archives

Hibernate SVN: r10280 - branches/Branch_3_2/Hibernate3

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2006-08-17 15:36:54 -0400 (Thu, 17 Aug 2006) New Revision: 10280 Modified: branches/Branch_3_2/Hibernate3/build.xml Log: disable forking on instrumentation tests; fix jar task to include DTDs Modified: branches/Branch_3_2/Hibernate3/build.xml =================================================================== --- branches/Branch_3_2/Hibernate3/build.xml 2006-08-17 19:35:41 UTC (rev 10279) +++ branches/Branch_3_2/Hibernate3/build.xml 2006-08-17 19:36:54 UTC (rev 10280) @@ -239,6 +239,7 @@  <target name="junitreport" depends="splash,junit" description="Run tests and create JUnit report (requires driver.jar property)"> + <delete dir="${dir.out.junit-reports}" /> <mkdir dir="${dir.out.junit-reports}" /> <junitreport todir="${dir.out.junit-reports}"> <fileset dir="${dir.out.junit}"> @@ -268,7 +269,7 @@ <pathelement path="${dir.props}"/> </path> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch"> + <junit printsummary="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch"> <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> <classpath> <fileset refid="fs.lib" /> @@ -297,7 +298,7 @@ <target name="junit.instrument.cglib" depends="instrument.cglib"> <mkdir dir="${dir.out.junit}"/> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes"> + <junit printsummary="yes" maxmemory="256M" fork="no"> <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> <classpath> <fileset refid="fs.lib" /> @@ -320,7 +321,7 @@ <target name="junit.instrument.javassist" depends="instrument.javassist"> <mkdir dir="${dir.out.junit}"/> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes"> + <junit printsummary="yes" maxmemory="256M" fork="no"> <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> <classpath> <fileset refid="fs.lib" /> @@ -557,6 +558,7 @@ <jar jarfile="${dir.build}/${jar.name}.jar" basedir="${dir.out.classes}"> <include name="org/hibernate/**/*.class" /> + <include name="org/hibernate/*.dtd"/> <manifest> <attribute name="Implementation-Title" value="Hibernate3"/> <attribute name="Implementation-Version" value="${version.full}"/> @@ -757,7 +759,7 @@ <copy todir="${targetdir}/lib"> <fileset dir="${dir.lib}" /> </copy> - + <copy todir="${targetdir}/doc/api" file="${dir.doc.api}/jdstyle.css"/> </target>

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10279 - trunk/Hibernate3

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2006-08-17 15:35:41 -0400 (Thu, 17 Aug 2006) New Revision: 10279 Modified: trunk/Hibernate3/build.xml Log: disable forking on instrumentation tests; fix jar task to include DTDs Modified: trunk/Hibernate3/build.xml =================================================================== --- trunk/Hibernate3/build.xml 2006-08-17 19:22:24 UTC (rev 10278) +++ trunk/Hibernate3/build.xml 2006-08-17 19:35:41 UTC (rev 10279) @@ -239,6 +239,7 @@  <target name="junitreport" depends="splash,junit" description="Run tests and create JUnit report (requires driver.jar property)"> + <delete dir="${dir.out.junit-reports}" /> <mkdir dir="${dir.out.junit-reports}" /> <junitreport todir="${dir.out.junit-reports}"> <fileset dir="${dir.out.junit}"> @@ -268,7 +269,7 @@ <pathelement path="${dir.props}"/> </path> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch"> + <junit printsummary="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch"> <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> <classpath> <fileset refid="fs.lib" /> @@ -297,7 +298,7 @@ <target name="junit.instrument.cglib" depends="instrument.cglib"> <mkdir dir="${dir.out.junit}"/> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes"> + <junit printsummary="yes" maxmemory="256M" fork="no"> <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> <classpath> <fileset refid="fs.lib" /> @@ -320,7 +321,7 @@ <target name="junit.instrument.javassist" depends="instrument.javassist"> <mkdir dir="${dir.out.junit}"/> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes"> + <junit printsummary="yes" maxmemory="256M" fork="no"> <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/> <classpath> <fileset refid="fs.lib" /> @@ -557,6 +558,7 @@ <jar jarfile="${dir.build}/${jar.name}.jar" basedir="${dir.out.classes}"> <include name="org/hibernate/**/*.class" /> + <include name="org/hibernate/*.dtd"/> <manifest> <attribute name="Implementation-Title" value="Hibernate3"/> <attribute name="Implementation-Version" value="${version.full}"/> @@ -757,7 +759,7 @@ <copy todir="${targetdir}/lib"> <fileset dir="${dir.lib}" /> </copy> - + <copy todir="${targetdir}/doc/api" file="${dir.doc.api}/jdstyle.css"/> </target>

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10278 - in trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations: . duplicatedgenerator id

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2006-08-17 15:22:24 -0400 (Thu, 17 Aug 2006) New Revision: 10278 Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml Removed: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java Log: ANN-410 remove package-info with standard javax.persistence classes Deleted: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -1,38 +0,0 @@ -//$Id$ -package org.hibernate.test.annotations; - -import org.hibernate.Session; - -/** - * @author Emmanuel Bernard - */ -public class PackageLevelTest extends TestCase { - - /** - * @param x - */ - public PackageLevelTest(String x) { - super( x ); - } - - /** - * @see org.hibernate.test.annotations.TestCase#getMappings() - */ - protected Class[] getMappings() { - return new Class[]{}; - } - - protected String[] getAnnotatedPackages() { - return new String[]{ - "org.hibernate.test.annotations", - "org.hibernate.test.annotations.duplicatedgenerator", - "org.hibernate.test.annotations.wrongoremptypackage", - }; - } - - public void testDuplicatedGenerator() throws Exception { - Session s = openSession(); - s.close(); - } - -} Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -16,6 +16,8 @@ try { cfg.addAnnotatedClass( Flight.class ); cfg.addAnnotatedClass( org.hibernate.test.annotations.Flight.class ); + cfg.addResource( "org/hibernate/test/annotations/orm.xml"); + cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml"); cfg.buildSessionFactory(); fail( "Should not be able to map the same entity name twice" ); } Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml 2006-08-17 19:22:24 UTC (rev 10278) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + > + <table-generator name="EMP_GEN" table="GENERATOR_TABLE" + pk-column-name="pkey" pk-column-value="EMP" + value-column-name="hi" allocation-size="20"/> +</entity-mappings> \ No newline at end of file Deleted: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -1,13 +0,0 @@ -/** - * Test package for metatata facilities - * It contains an example of package level metadata - */ -(a)javax.persistence.TableGenerator( - name = "EMP_GEN", - table = "GENERATOR_TABLE", - pkColumnName = "pkey", - valueColumnName = "hi", - pkColumnValue = "EMP", - allocationSize = 20 -) package org.hibernate.test.annotations.duplicatedgenerator; - Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -278,4 +278,11 @@ }; } + @Override + protected String[] getXmlFiles() { + return new String[] { + "org/hibernate/test/annotations/orm.xml" + }; + } + } Added: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml 2006-08-17 19:22:24 UTC (rev 10278) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + > + <sequence-generator name="SEQ_GEN" sequence-name="my_sequence"/> + <table-generator name="EMP_GEN" table="GENERATOR_TABLE" + pk-column-name="pkey" pk-column-value="EMP" + value-column-name="hi" allocation-size="20"/> +</entity-mappings> \ No newline at end of file Deleted: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java 2006-08-17 16:32:56 UTC (rev 10277) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java 2006-08-17 19:22:24 UTC (rev 10278) @@ -1,21 +0,0 @@ -/** - * Test package for metatata facilities - * It contains an example of package level metadata - */ - -@TableGenerator( - name = "EMP_GEN", - table = "GENERATOR_TABLE", - pkColumnName = "pkey", - valueColumnName = "hi", - pkColumnValue = "EMP", - allocationSize = 20 -) -@SequenceGenerator( - name = "SEQ_GEN", - sequenceName = "my_sequence" -) package org.hibernate.test.annotations; - -import javax.persistence.SequenceGenerator; -import javax.persistence.TableGenerator; -

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10277 - trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2006-08-17 12:32:56 -0400 (Thu, 17 Aug 2006) New Revision: 10277 Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java Log: javadoc Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java =================================================================== --- trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java 2006-08-17 16:07:03 UTC (rev 10276) +++ trunk/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java 2006-08-17 16:32:56 UTC (rev 10277) @@ -18,9 +18,12 @@ * @author Sylvain Vieujot */ public interface DirectoryProvider<TDirectory extends Directory> { - /** get the information toi initialize the directory and build its hashCode */ + /** get the information to initialize the directory and build its hashCode */ void initialize(Class<?> entity, Configuration cfg, Properties properties); + /** + * Returns an initialized Lucene Directory. This method call <b>must</b> be threadsafe + */ TDirectory getDirectory(); }

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10276 - in trunk/HibernateExt/metadata/src: java/org/hibernate/cfg java/org/hibernate/cfg/annotations test/org/hibernate/test/annotations test/org/hibernate/test/annotations/duplicatedgenerator test/org/hibernate/test/annotations/id

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2006-08-17 12:07:03 -0400 (Thu, 17 Aug 2006) New Revision: 10276 Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java Log: ANN-369 replace key by mapkey for the default column value Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -1347,7 +1347,7 @@ collectionBinder.setPropertyAccessorName( inferredData.getDefaultAccess() ); Ejb3Column[] elementColumns = null; - PropertyData wrappedInferredData = new WrappedInferredData( inferredData, "element" ); + PropertyData mapKeyVirtualProperty = new WrappedInferredData( inferredData, "element" ); if ( property.isAnnotationPresent( Column.class ) || property.isAnnotationPresent( Formula.class ) ) { @@ -1358,7 +1358,7 @@ formulaAnn, nullability, propertyHolder, - wrappedInferredData, + mapKeyVirtualProperty, entityBinder.getSecondaryTables(), mappings ); @@ -1366,7 +1366,7 @@ else if ( property.isAnnotationPresent( Columns.class ) ) { Columns anns = property.getAnnotation( Columns.class ); elementColumns = Ejb3Column.buildColumnFromAnnotation( - anns.columns(), null, nullability, propertyHolder, wrappedInferredData, + anns.columns(), null, nullability, propertyHolder, mapKeyVirtualProperty, entityBinder.getSecondaryTables(), mappings ); } @@ -1376,7 +1376,7 @@ null, nullability, propertyHolder, - wrappedInferredData, + mapKeyVirtualProperty, entityBinder.getSecondaryTables(), mappings ); @@ -1385,13 +1385,13 @@ org.hibernate.annotations.MapKey hibMapKeyAnn = property.getAnnotation( org.hibernate.annotations.MapKey.class ); - wrappedInferredData = new WrappedInferredData( inferredData, "key" ); + mapKeyVirtualProperty = new WrappedInferredData( inferredData, "mapkey" ); Ejb3Column[] mapColumns = Ejb3Column.buildColumnFromAnnotation( hibMapKeyAnn != null && hibMapKeyAnn.columns().length > 0 ? hibMapKeyAnn.columns() : null, null, Nullability.FORCED_NOT_NULL, propertyHolder, - wrappedInferredData, + mapKeyVirtualProperty, entityBinder.getSecondaryTables(), mappings ); @@ -1401,7 +1401,7 @@ Ejb3JoinColumn[] mapJoinColumns = Ejb3JoinColumn.buildJoinColumns( mapKeyManyToMany != null ? mapKeyManyToMany.joinColumns() : null, null, entityBinder.getSecondaryTables(), - propertyHolder, wrappedInferredData.getPropertyName(), mappings + propertyHolder, mapKeyVirtualProperty.getPropertyName(), mappings ); collectionBinder.setMapKeyManyToManyColumns( mapJoinColumns ); Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java =================================================================== --- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -6,6 +6,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.AnnotationException; import org.hibernate.MappingException; +import org.hibernate.util.StringHelper; import org.hibernate.annotations.OrderBy; import org.hibernate.annotations.Sort; import org.hibernate.cfg.CollectionSecondPass; @@ -74,7 +75,7 @@ if ( indexColumn.isImplicit() == false ) { PropertyHolder valueHolder = PropertyHolderBuilder.buildPropertyHolder( this.collection, - this.collection.getRole() + "key", + StringHelper.qualify( this.collection.getRole(), "key" ), (XClass) null, (XProperty) null, mappings ); Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java =================================================================== --- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -146,7 +146,7 @@ holder = PropertyHolderBuilder.buildPropertyHolder( mapValue, - mapValue.getRole() + "key", + StringHelper.qualify( mapValue.getRole(), "mapkey" ), elementClass, property, mappings ); Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -5,7 +5,7 @@ @javax.persistence.TableGenerator( name = "EMP_GEN", table = "GENERATOR_TABLE", - pkColumnName = "key", + pkColumnName = "pkey", valueColumnName = "hi", pkColumnValue = "EMP", allocationSize = 20 Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -14,7 +14,7 @@ * * @author Emmanuel Bernard */ -@TableGenerator(name = "EMP_GEN", table = "GENERATOR_TABLE", pkColumnName = "key", +@TableGenerator(name = "EMP_GEN", table = "GENERATOR_TABLE", pkColumnName = "pkey", valueColumnName = "hi", pkColumnValue = "Ball", allocationSize = 10) @Entity public class Ball implements Serializable { Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -16,7 +16,7 @@ */ @Entity @Table(name = "tbl_dog") -@TableGenerator(name = "DogGen", table = "GENERATOR_TABLE", pkColumnName = "key", +@TableGenerator(name = "DogGen", table = "GENERATOR_TABLE", pkColumnName = "pkey", valueColumnName = "hi", pkColumnValue = "Dog", allocationSize = 10) public class Dog { private Integer id; Modified: trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java =================================================================== --- trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java 2006-08-17 10:49:50 UTC (rev 10275) +++ trunk/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java 2006-08-17 16:07:03 UTC (rev 10276) @@ -6,7 +6,7 @@ @TableGenerator( name = "EMP_GEN", table = "GENERATOR_TABLE", - pkColumnName = "key", + pkColumnName = "pkey", valueColumnName = "hi", pkColumnValue = "EMP", allocationSize = 20

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10275 - trunk/Hibernate3

by hibernate-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2006-08-17 06:49:50 -0400 (Thu, 17 Aug 2006) New Revision: 10275 Modified: trunk/Hibernate3/build.xml Log: javadoc stylesheet copy and typo fix. Modified: trunk/Hibernate3/build.xml =================================================================== --- trunk/Hibernate3/build.xml 2006-08-17 10:49:46 UTC (rev 10274) +++ trunk/Hibernate3/build.xml 2006-08-17 10:49:50 UTC (rev 10275) @@ -50,7 +50,7 @@ <property name="dir.out.junit" value="${dir.build}/testout" /> <property name="dir.out.junit-reports" value="${dir.build}/test-reports" /> <property name="dir.out.perf-test" value="${dir.build}/testout-perf" /> - <property name="dir.out.clover" value="${{dir.build}/cloverout" /> + <property name="dir.out.clover" value="${dir.build}/cloverout" /> <property name="dir.out.dist" value="${dir.build}/cloverout" /> <property name="dir.out.db" value="${dir.build}/db" /> <property name="dir.out.doc" value="${dir.build}/doc" /> @@ -749,13 +749,16 @@ <target name="prepare-dir-up" depends="jar">  - <mkdir dir="../${name}-${version.major_minor}" /> - <mkdir dir="../${name}-${version.major_minor}/lib" /> + <property name="targetdir" value="../${name}-${version.major_minor}"/> + <mkdir dir="${targetdir}" /> + <mkdir dir="${targetdir}/lib" /> - <copy todir="../${name}-${version.major_minor}" file="${dir.build}/${jar.name}.jar" /> - <copy todir="../${name}-${version.major_minor}/lib"> + <copy todir="${targetdir}" file="${dir.build}/${jar.name}.jar" /> + <copy todir="${targetdir}/lib"> <fileset dir="${dir.lib}" /> </copy> + + <copy todir="${targetdir}/doc/api" file="${dir.doc.api}/jdstyle.css"/> </target> </project>

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10274 - branches/Branch_3_2/Hibernate3

by hibernate-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2006-08-17 06:49:46 -0400 (Thu, 17 Aug 2006) New Revision: 10274 Modified: branches/Branch_3_2/Hibernate3/build.xml Log: javadoc stylesheet copy and typo fix. Modified: branches/Branch_3_2/Hibernate3/build.xml =================================================================== --- branches/Branch_3_2/Hibernate3/build.xml 2006-08-16 02:33:16 UTC (rev 10273) +++ branches/Branch_3_2/Hibernate3/build.xml 2006-08-17 10:49:46 UTC (rev 10274) @@ -50,7 +50,7 @@ <property name="dir.out.junit" value="${dir.build}/testout" /> <property name="dir.out.junit-reports" value="${dir.build}/test-reports" /> <property name="dir.out.perf-test" value="${dir.build}/testout-perf" /> - <property name="dir.out.clover" value="${{dir.build}/cloverout" /> + <property name="dir.out.clover" value="${dir.build}/cloverout" /> <property name="dir.out.dist" value="${dir.build}/cloverout" /> <property name="dir.out.db" value="${dir.build}/db" /> <property name="dir.out.doc" value="${dir.build}/doc" /> @@ -749,13 +749,16 @@ <target name="prepare-dir-up" depends="jar">  - <mkdir dir="../${name}-${version.major_minor}" /> - <mkdir dir="../${name}-${version.major_minor}/lib" /> + <property name="targetdir" value="../${name}-${version.major_minor}"/> + <mkdir dir="${targetdir}" /> + <mkdir dir="${targetdir}/lib" /> - <copy todir="../${name}-${version.major_minor}" file="${dir.build}/${jar.name}.jar" /> - <copy todir="../${name}-${version.major_minor}/lib"> + <copy todir="${targetdir}" file="${dir.build}/${jar.name}.jar" /> + <copy todir="${targetdir}/lib"> <fileset dir="${dir.lib}" /> </copy> + + <copy todir="${targetdir}/doc/api" file="${dir.doc.api}/jdstyle.css"/> </target> </project>

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10273 - trunk/Hibernate3/test/org/hibernate/test/instrument/buildtime

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2006-08-15 22:33:16 -0400 (Tue, 15 Aug 2006) New Revision: 10273 Modified: trunk/Hibernate3/test/org/hibernate/test/instrument/buildtime/InstrumentTest.java Log: corrected execution Modified: trunk/Hibernate3/test/org/hibernate/test/instrument/buildtime/InstrumentTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/instrument/buildtime/InstrumentTest.java 2006-08-15 21:20:44 UTC (rev 10272) +++ trunk/Hibernate3/test/org/hibernate/test/instrument/buildtime/InstrumentTest.java 2006-08-16 02:33:16 UTC (rev 10273) @@ -14,6 +14,7 @@ import org.hibernate.test.instrument.cases.TestInjectFieldInterceptorExecutable; import org.hibernate.test.instrument.cases.TestIsPropertyInitializedExecutable; import org.hibernate.test.instrument.cases.TestManyToOneProxyExecutable; +import org.hibernate.test.instrument.cases.Executable; /** * @author Gavin King @@ -25,33 +26,43 @@ } public void testDirtyCheck() { - new TestDirtyCheckExecutable().execute(); + execute( new TestDirtyCheckExecutable() ); } public void testFetchAll() throws Exception { - new TestFetchAllExecutable().execute(); + execute( new TestFetchAllExecutable() ); } public void testLazy() throws Exception { - new TestLazyExecutable().execute(); + execute( new TestLazyExecutable() ); } public void testLazyManyToOne() { - new TestLazyManyToOneExecutable().execute(); + execute( new TestLazyManyToOneExecutable() ); } public void testSetFieldInterceptor() { - new TestInjectFieldInterceptorExecutable().execute(); + execute( new TestInjectFieldInterceptorExecutable() ); } public void testPropertyInitialized() { - new TestIsPropertyInitializedExecutable().execute(); + execute( new TestIsPropertyInitializedExecutable() ); } public void testManyToOneProxy() { - new TestManyToOneProxyExecutable().execute(); + execute( new TestManyToOneProxyExecutable() ); } + private void execute(Executable executable) { + executable.prepare(); + try { + executable.execute(); + } + finally { + executable.complete(); + } + } + protected String[] getMappings() { return new String[] { "instrument/domain/Documents.hbm.xml" }; }

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10272 - branches/Branch_3_2/Hibernate3/etc

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2006-08-15 17:20:44 -0400 (Tue, 15 Aug 2006) New Revision: 10272 Modified: branches/Branch_3_2/Hibernate3/etc/hibernate.properties Log: HHH-2005 : port to 3.2 branch: new build script; build dir layout changes Modified: branches/Branch_3_2/Hibernate3/etc/hibernate.properties =================================================================== --- branches/Branch_3_2/Hibernate3/etc/hibernate.properties 2006-08-15 21:18:09 UTC (rev 10271) +++ branches/Branch_3_2/Hibernate3/etc/hibernate.properties 2006-08-15 21:20:44 UTC (rev 10272) @@ -30,15 +30,16 @@ hibernate.connection.driver_class org.hsqldb.jdbcDriver hibernate.connection.username sa hibernate.connection.password +hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate #hibernate.connection.url jdbc:hsqldb:hsql://localhost #hibernate.connection.url jdbc:hsqldb:test -hibernate.connection.url jdbc:hsqldb:. ## H2 (www.h2database.com) #hibernate.dialect org.hibernate.dialect.H2Dialect #hibernate.connection.driver_class org.h2.Driver #hibernate.connection.username sa -#hibernate.connection.password +#hibernate.connection.password +#hibernate.connection.url jdbc:h2:mem:./build/db/h2/hibernate #hibernate.connection.url jdbc:h2:testdb/h2test #hibernate.connection.url jdbc:h2:mem:imdb1 #hibernate.connection.url jdbc:h2:tcp://dbserv:8084/sample; @@ -115,7 +116,7 @@ #hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver #hibernate.connection.username #hibernate.connection.password -#hibernate.connection.url jdbc:derby:/test;create=true +#hibernate.connection.url jdbc:derby:build/db/derby/hibernate;create=true ## Sybase

17 years, 9 months

1
0
0 / 0

Hibernate SVN: r10271 - branches/Branch_3_2/Hibernate3/test/org/hibernate/test/instrument/buildtime

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2006-08-15 17:18:09 -0400 (Tue, 15 Aug 2006) New Revision: 10271 Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/instrument/buildtime/InstrumentTest.java Log: HHH-2005 : port to 3.2 branch: new build script; build dir layout changes Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/instrument/buildtime/InstrumentTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/instrument/buildtime/InstrumentTest.java 2006-08-15 21:17:26 UTC (rev 10270) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/instrument/buildtime/InstrumentTest.java 2006-08-15 21:18:09 UTC (rev 10271) @@ -14,12 +14,10 @@ import org.hibernate.test.instrument.cases.TestInjectFieldInterceptorExecutable; import org.hibernate.test.instrument.cases.TestIsPropertyInitializedExecutable; import org.hibernate.test.instrument.cases.TestManyToOneProxyExecutable; +import org.hibernate.test.instrument.cases.Executable; /** - * Tests for build-time instrumentation - * * @author Gavin King - * @author Steve Ebersole */ public class InstrumentTest extends TestCase { @@ -28,33 +26,43 @@ } public void testDirtyCheck() { - new TestDirtyCheckExecutable().execute(); + execute( new TestDirtyCheckExecutable() ); } public void testFetchAll() throws Exception { - new TestFetchAllExecutable().execute(); + execute( new TestFetchAllExecutable() ); } public void testLazy() throws Exception { - new TestLazyExecutable().execute(); + execute( new TestLazyExecutable() ); } public void testLazyManyToOne() { - new TestLazyManyToOneExecutable().execute(); + execute( new TestLazyManyToOneExecutable() ); } public void testSetFieldInterceptor() { - new TestInjectFieldInterceptorExecutable().execute(); + execute( new TestInjectFieldInterceptorExecutable() ); } public void testPropertyInitialized() { - new TestIsPropertyInitializedExecutable().execute(); + execute( new TestIsPropertyInitializedExecutable() ); } public void testManyToOneProxy() { - new TestManyToOneProxyExecutable().execute(); + execute( new TestManyToOneProxyExecutable() ); } + private void execute(Executable executable) { + executable.prepare(); + try { + executable.execute(); + } + finally { + executable.complete(); + } + } + protected String[] getMappings() { return new String[] { "instrument/domain/Documents.hbm.xml" }; } @@ -75,4 +83,5 @@ public static boolean isRunnable() { return FieldInterceptionHelper.isInstrumented( new Document() ); } -} \ No newline at end of file +} +

17 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits August 2006