Hibernate SVN: r19779 - core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-06-22 12:00:31 -0400 (Tue, 22 Jun 2010)
New Revision: 19779
Modified:
core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/pom.xml
Log:
JBPAPP-4511 update jbc to 3.2.5.GA in hibernate-jbosscache2
Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/pom.xml 2010-06-21 13:50:17 UTC (rev 19778)
+++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/pom.xml 2010-06-22 16:00:31 UTC (rev 19779)
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.1.0.GA</version>
+ <version>3.2.5.GA</version>
</dependency>
<!-- test dependencies -->
13 years, 10 months
Hibernate SVN: r19778 - validator/trunk/hibernate-validator/src/main/docbook/en-US/modules.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-06-21 09:50:17 -0400 (Mon, 21 Jun 2010)
New Revision: 19778
Modified:
validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml
Log:
HV-337
Modified: validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml
===================================================================
--- validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml 2010-06-21 13:35:31 UTC (rev 19777)
+++ validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml 2010-06-21 13:50:17 UTC (rev 19778)
@@ -1152,7 +1152,7 @@
<parameter>min</parameter> and <parameter>max</parameter>
included.</entry>
- <entry>none</entry>
+ <entry>Column length will be set to max.</entry>
</row>
<row>
13 years, 10 months
Hibernate SVN: r19777 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/messageinterpolation.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-06-21 09:35:31 -0400 (Mon, 21 Jun 2010)
New Revision: 19777
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/messageinterpolation/ResourceBundleMessageInterpolator.java
Log:
HV-336
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/messageinterpolation/ResourceBundleMessageInterpolator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/messageinterpolation/ResourceBundleMessageInterpolator.java 2010-06-21 13:30:26 UTC (rev 19776)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/messageinterpolation/ResourceBundleMessageInterpolator.java 2010-06-21 13:35:31 UTC (rev 19777)
@@ -79,25 +79,9 @@
private final boolean cacheMessages;
public ResourceBundleMessageInterpolator() {
- this( ( ResourceBundleLocator ) null );
+ this( null );
}
- /**
- * @param resourceBundle the resource bundle to use
- *
- * @deprecated Use {@link ResourceBundleMessageInterpolator#ResourceBundleMessageInterpolator(ResourceBundleLocator)} instead.
- */
- @Deprecated
- public ResourceBundleMessageInterpolator(final ResourceBundle resourceBundle) {
- this(
- new PlatformResourceBundleLocator( USER_VALIDATION_MESSAGES ) {
- public ResourceBundle getResourceBundle(Locale locale) {
- return locale == Locale.getDefault() ? resourceBundle : super.getResourceBundle( locale );
- }
- }
- );
- }
-
public ResourceBundleMessageInterpolator(ResourceBundleLocator userResourceBundleLocator) {
this( userResourceBundleLocator, true );
}
13 years, 10 months
Hibernate SVN: r19776 - in validator/trunk/hibernate-validator/src: test/java/org/hibernate/validator/test/constraints/impl and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-06-21 09:30:26 -0400 (Mon, 21 Jun 2010)
New Revision: 19776
Added:
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/DecimalMinMaxValidatorBoundaryTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/MinMaxValidatorBoundaryTest.java
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumber.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForNumber.java
Log:
HV-335
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java 2010-06-20 19:55:55 UTC (rev 19775)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java 2010-06-21 13:30:26 UTC (rev 19776)
@@ -38,12 +38,13 @@
this.maxValue = new BigDecimal( maxValue.value() );
}
catch ( NumberFormatException nfe ) {
- throw new IllegalArgumentException( maxValue.value() + " does not represent a valid BigDecimal format" );
+ throw new IllegalArgumentException(
+ maxValue.value() + " does not represent a valid BigDecimal format", nfe
+ );
}
}
public boolean isValid(Number value, ConstraintValidatorContext constraintValidatorContext) {
-
//null values are valid
if ( value == null ) {
return true;
@@ -56,7 +57,7 @@
return ( new BigDecimal( ( BigInteger ) value ) ).compareTo( maxValue ) != 1;
}
else {
- return ( new BigDecimal( value.doubleValue() ).compareTo( maxValue ) ) != 1;
+ return ( BigDecimal.valueOf( value.longValue() ).compareTo( maxValue ) ) != 1;
}
}
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java 2010-06-20 19:55:55 UTC (rev 19775)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java 2010-06-21 13:30:26 UTC (rev 19776)
@@ -37,7 +37,9 @@
this.maxValue = new BigDecimal( maxValue.value() );
}
catch ( NumberFormatException nfe ) {
- throw new IllegalArgumentException( maxValue.value() + " does not represent a valid BigDecimal format" );
+ throw new IllegalArgumentException(
+ maxValue.value() + " does not represent a valid BigDecimal format", nfe
+ );
}
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java 2010-06-20 19:55:55 UTC (rev 19775)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java 2010-06-21 13:30:26 UTC (rev 19776)
@@ -38,7 +38,9 @@
this.minValue = new BigDecimal( minValue.value() );
}
catch ( NumberFormatException nfe ) {
- throw new IllegalArgumentException( minValue.value() + " does not represent a valid BigDecimal format" );
+ throw new IllegalArgumentException(
+ minValue.value() + " does not represent a valid BigDecimal format", nfe
+ );
}
}
@@ -56,7 +58,7 @@
return ( new BigDecimal( ( BigInteger ) value ) ).compareTo( minValue ) != -1;
}
else {
- return ( new BigDecimal( value.doubleValue() ).compareTo( minValue ) ) != -1;
+ return ( BigDecimal.valueOf( value.longValue() ).compareTo( minValue ) ) != -1;
}
}
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java 2010-06-20 19:55:55 UTC (rev 19775)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java 2010-06-21 13:30:26 UTC (rev 19776)
@@ -34,7 +34,9 @@
this.minValue = new BigDecimal( minValue.value() );
}
catch ( NumberFormatException nfe ) {
- throw new IllegalArgumentException( minValue.value() + " does not represent a valid BigDecimal format" );
+ throw new IllegalArgumentException(
+ minValue.value() + " does not represent a valid BigDecimal format", nfe
+ );
}
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumber.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumber.java 2010-06-20 19:55:55 UTC (rev 19775)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumber.java 2010-06-21 13:30:26 UTC (rev 19776)
@@ -1,7 +1,7 @@
// $Id$
/*
* JBoss, Home of Professional Open Source
-* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
+* Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -28,6 +28,7 @@
* value specified.
*
* @author Alaa Nassef
+ * @author Hardy Ferentschik
*/
public class MaxValidatorForNumber implements ConstraintValidator<Max, Number> {
@@ -49,8 +50,8 @@
return ( ( BigInteger ) value ).compareTo( BigInteger.valueOf( maxValue ) ) != 1;
}
else {
- double doubleValue = value.doubleValue();
- return doubleValue <= maxValue;
+ long longValue = value.longValue();
+ return longValue <= maxValue;
}
}
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForNumber.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForNumber.java 2010-06-20 19:55:55 UTC (rev 19775)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/MinValidatorForNumber.java 2010-06-21 13:30:26 UTC (rev 19776)
@@ -28,6 +28,7 @@
* value specified.
*
* @author Alaa Nassef
+ * @author Hardy Ferentschik
*/
public class MinValidatorForNumber implements ConstraintValidator<Min, Number> {
@@ -49,9 +50,8 @@
return ( ( BigInteger ) value ).compareTo( BigInteger.valueOf( minValue ) ) != -1;
}
else {
- double doubleValue = value.doubleValue();
- return doubleValue >= minValue;
+ long longValue = value.longValue();
+ return longValue >= minValue;
}
-
}
}
Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/DecimalMinMaxValidatorBoundaryTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/DecimalMinMaxValidatorBoundaryTest.java (rev 0)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/DecimalMinMaxValidatorBoundaryTest.java 2010-06-21 13:30:26 UTC (rev 19776)
@@ -0,0 +1,89 @@
+// $Id:$
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.validator.test.constraints.impl;
+
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+import javax.validation.constraints.DecimalMin;
+
+import org.testng.annotations.Test;
+
+import org.hibernate.validator.HibernateValidator;
+import org.hibernate.validator.HibernateValidatorConfiguration;
+import org.hibernate.validator.cfg.ConstraintMapping;
+import org.hibernate.validator.cfg.defs.DecimalMaxDef;
+import org.hibernate.validator.cfg.defs.DecimalMinDef;
+import org.hibernate.validator.test.util.TestUtil;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static org.hibernate.validator.test.util.TestUtil.assertCorrectConstraintTypes;
+import static org.hibernate.validator.test.util.TestUtil.assertNumberOfViolations;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class DecimalMinMaxValidatorBoundaryTest {
+ public double d;
+
+ @Test
+ public void testDecimalMinValue() {
+
+ // use programmatic mapping api to configure constraint
+ ConstraintMapping mapping = new ConstraintMapping();
+ mapping.type( DecimalMinMaxValidatorBoundaryTest.class )
+ .property( "d", FIELD )
+ .constraint( DecimalMinDef.class )
+ .value( "0.100000000000000005" );
+
+ HibernateValidatorConfiguration config = TestUtil.getConfiguration( HibernateValidator.class );
+ config.addMapping( mapping );
+
+ ValidatorFactory factory = config.buildValidatorFactory();
+ Validator validator = factory.getValidator();
+
+ this.d = 0.1;
+
+ Set<ConstraintViolation<DecimalMinMaxValidatorBoundaryTest>> constraintViolations = validator.validate( this );
+ assertNumberOfViolations( constraintViolations, 1 );
+ assertCorrectConstraintTypes( constraintViolations, DecimalMin.class );
+ }
+
+ @Test
+ public void testDecimalMaxValue() {
+
+ // use programmatic mapping api to configure constraint
+ ConstraintMapping mapping = new ConstraintMapping();
+ mapping.type( DecimalMinMaxValidatorBoundaryTest.class )
+ .property( "d", FIELD )
+ .constraint( DecimalMaxDef.class )
+ .value( "0.1" );
+
+ HibernateValidatorConfiguration config = TestUtil.getConfiguration( HibernateValidator.class );
+ config.addMapping( mapping );
+
+ ValidatorFactory factory = config.buildValidatorFactory();
+ Validator validator = factory.getValidator();
+
+ this.d = 0.1;
+
+ Set<ConstraintViolation<DecimalMinMaxValidatorBoundaryTest>> constraintViolations = validator.validate( this );
+ assertNumberOfViolations( constraintViolations, 0 );
+ }
+}
\ No newline at end of file
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/DecimalMinMaxValidatorBoundaryTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/MinMaxValidatorBoundaryTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/MinMaxValidatorBoundaryTest.java (rev 0)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/MinMaxValidatorBoundaryTest.java 2010-06-21 13:30:26 UTC (rev 19776)
@@ -0,0 +1,78 @@
+// $Id:$
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.validator.test.constraints.impl;
+
+import java.util.Set;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+import org.testng.annotations.Test;
+
+import org.hibernate.validator.test.util.TestUtil;
+
+import static junit.framework.Assert.assertFalse;
+import static org.hibernate.validator.test.util.TestUtil.assertCorrectConstraintTypes;
+import static org.hibernate.validator.test.util.TestUtil.assertNumberOfViolations;
+
+/**
+ * Check correct behaviour of {@link org.hibernate.validator.constraints.impl.MinValidatorForNumber} and
+ * {@link org.hibernate.validator.constraints.impl.MaxValidatorForNumber} on boundary values.
+ * <p/>
+ * The chosen numbers: 9223372036854775806l and 9223372036854775807l cast to
+ * the same double value.
+ *
+ * @author Carlos Vara
+ * @author Hardy Ferentschik
+ */
+public class MinMaxValidatorBoundaryTest {
+ @Min(value = 9223372036854775807l)
+ public long min;
+
+ @Max(value = 9223372036854775806l)
+ public long max;
+
+ @Test
+ public void testMinBoundaryValue() {
+ Validator validator = TestUtil.getValidator();
+
+ this.min = 9223372036854775806l;
+ this.max = 0l;
+
+ // Current min value is smaller, should fail, but it doesn't
+ Set<ConstraintViolation<MinMaxValidatorBoundaryTest>> constraintViolations = validator.validate( this );
+ assertNumberOfViolations( constraintViolations, 1 );
+ assertCorrectConstraintTypes( constraintViolations, Min.class );
+ }
+
+ @Test
+ public void testMaxBoundaryValue() {
+ Validator validator = TestUtil.getValidator();
+
+ this.min = Long.MAX_VALUE;
+ this.max = 9223372036854775807l;
+
+ // Current max value is bigger, should fail, but it doesn't
+ Set<ConstraintViolation<MinMaxValidatorBoundaryTest>> constraintViolations = validator.validate( this );
+ assertNumberOfViolations( constraintViolations, 1 );
+ assertCorrectConstraintTypes( constraintViolations, Max.class );
+ }
+}
+
+
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/MinMaxValidatorBoundaryTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
13 years, 10 months
Hibernate SVN: r19775 - in core/trunk: testsuite/src/test/java/org/hibernate/test/component/basic and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-06-20 15:55:55 -0400 (Sun, 20 Jun 2010)
New Revision: 19775
Modified:
core/trunk/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
Log:
HHH-5342 Testes fail on mysql
Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java 2010-06-20 19:49:59 UTC (rev 19774)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java 2010-06-20 19:55:55 UTC (rev 19775)
@@ -34,7 +34,7 @@
* @author Steve Ebersole
*/
public class ExplicitSqlResultSetMappingTest extends TestCase {
- private String queryString = "select t.\"NAME\" as \"QuotEd_nAMe\" from \"MY_ENTITY_TABLE\" t";
+ private String queryString = null;
@Override
protected Class<?>[] getAnnotatedClasses() {
@@ -47,6 +47,9 @@
}
private void prepareTestData() {
+ char open = getDialect().openQuote();
+ char close = getDialect().closeQuote();
+ queryString="select t."+open+"NAME"+close+" as "+open+"QuotEd_nAMe"+close+" from "+open+"MY_ENTITY_TABLE"+close+" t";
Session s = sfi().openSession();
s.beginTransaction();
s.save( new MyEntity( "mine" ) );
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java 2010-06-20 19:49:59 UTC (rev 19774)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java 2010-06-20 19:55:55 UTC (rev 19775)
@@ -200,9 +200,9 @@
.add( Property.forName("person.yob").between( new Integer(1999), new Integer(2002) ) )
.list();
if ( getDialect().supportsRowValueConstructorSyntax() ) {
- s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 'Peachtree Rd')")
+ s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')")
.setDate("dob", new Date("March 25, 1974")).list();
- s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 'Peachtree Rd')")
+ s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')")
.setDate("dob", new Date("March 25, 1974")).list();
}
t.commit();
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java 2010-06-20 19:49:59 UTC (rev 19774)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java 2010-06-20 19:55:55 UTC (rev 19775)
@@ -40,6 +40,8 @@
SchemaUpdate v2schemaUpdate = new SchemaUpdate( v2cfg );
v2schemaUpdate.execute( true, true );
assertEquals( 0, v2schemaUpdate.getExceptions().size() );
+
+ new SchemaExport( v2cfg ).drop( false, true );
}
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java 2010-06-20 19:49:59 UTC (rev 19774)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java 2010-06-20 19:55:55 UTC (rev 19775)
@@ -49,6 +49,7 @@
@Override
protected void prepareTest() throws Exception {
+ if(sfi()==null)return;
Session session = sfi().openSession();
session.beginTransaction();
session.save( new Person( "me" ) );
@@ -58,6 +59,7 @@
@Override
protected void cleanupTest() throws Exception {
+ if(sfi()==null)return;
Session session = sfi().openSession();
session.beginTransaction();
session.createQuery( "delete Person" ).executeUpdate();
13 years, 10 months
Hibernate SVN: r19774 - in core/branches/Branch_3_5: testsuite/src/test/java/org/hibernate/test/component/basic and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-06-20 15:49:59 -0400 (Sun, 20 Jun 2010)
New Revision: 19774
Modified:
core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java
core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java
core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
Log:
HHH-5342 Testes fail on mysql
Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java
===================================================================
--- core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java 2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java 2010-06-20 19:49:59 UTC (rev 19774)
@@ -34,7 +34,7 @@
* @author Steve Ebersole
*/
public class ExplicitSqlResultSetMappingTest extends TestCase {
- private String queryString = "select t.\"NAME\" as \"QuotEd_nAMe\" from \"MY_ENTITY_TABLE\" t";
+ private String queryString = null;
@Override
protected Class<?>[] getAnnotatedClasses() {
@@ -47,6 +47,9 @@
}
private void prepareTestData() {
+ char open = getDialect().openQuote();
+ char close = getDialect().closeQuote();
+ queryString = "select t."+open+"NAME"+close+" as "+open+"QuotEd_nAMe"+close+" from "+open+"MY_ENTITY_TABLE"+close+" t";
Session s = sfi().openSession();
s.beginTransaction();
s.save( new MyEntity( "mine" ) );
Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java
===================================================================
--- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java 2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java 2010-06-20 19:49:59 UTC (rev 19774)
@@ -200,9 +200,9 @@
.add( Property.forName("person.yob").between( new Integer(1999), new Integer(2002) ) )
.list();
if ( getDialect().supportsRowValueConstructorSyntax() ) {
- s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 'Peachtree Rd')")
+ s.createQuery("from User u where u.person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')")
.setDate("dob", new Date("March 25, 1974")).list();
- s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 'Peachtree Rd')")
+ s.createQuery("from User where person = ('gavin', :dob, 'Peachtree Rd', 'Karbarook Ave', 1974, 34, 'Peachtree Rd')")
.setDate("dob", new Date("March 25, 1974")).list();
}
t.commit();
Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java
===================================================================
--- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java 2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java 2010-06-20 19:49:59 UTC (rev 19774)
@@ -1280,11 +1280,12 @@
s = openSession();
t = s.beginTransaction();
try {
- Object result = s.createCriteria( CourseMeeting.class).setProjection( Projections.countDistinct( "id" ) ).list();
+ List result = s.createCriteria( CourseMeeting.class).setProjection( Projections.countDistinct( "id" ) ).list();
if ( ! getDialect().supportsTupleDistinctCounts() ) {
fail( "expected SQLGrammarException" );
}
- assertEquals( 1, ( ( Long ) result ).longValue() );
+ assertFalse(result.isEmpty());
+ assertEquals( 1, ((Long)result.get(0)).intValue() );
}
catch ( SQLGrammarException ex ) {
if ( ! getDialect().supportsTupleDistinctCounts() ) {
Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java
===================================================================
--- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java 2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java 2010-06-20 19:49:59 UTC (rev 19774)
@@ -40,7 +40,8 @@
SchemaUpdate v2schemaUpdate = new SchemaUpdate( v2cfg );
v2schemaUpdate.execute( true, true );
assertEquals( 0, v2schemaUpdate.getExceptions().size() );
-
+
+ new SchemaExport( v2cfg ).drop( false, true );
}
}
Modified: core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
===================================================================
--- core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java 2010-06-19 14:32:14 UTC (rev 19773)
+++ core/branches/Branch_3_5/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java 2010-06-20 19:49:59 UTC (rev 19774)
@@ -49,6 +49,7 @@
@Override
protected void prepareTest() throws Exception {
+ if(sfi() == null) return;
Session session = sfi().openSession();
session.beginTransaction();
session.save( new Person( "me" ) );
@@ -58,6 +59,7 @@
@Override
protected void cleanupTest() throws Exception {
+ if(sfi() == null) return;
Session session = sfi().openSession();
session.beginTransaction();
session.createQuery( "delete Person" ).executeUpdate();
13 years, 10 months
Hibernate SVN: r19773 - core/branches/Branch_3_5/parent.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-06-19 10:32:14 -0400 (Sat, 19 Jun 2010)
New Revision: 19773
Modified:
core/branches/Branch_3_5/parent/pom.xml
Log:
HHH-5323 correct jdbc driver version for testing
Modified: core/branches/Branch_3_5/parent/pom.xml
===================================================================
--- core/branches/Branch_3_5/parent/pom.xml 2010-06-19 14:26:24 UTC (rev 19772)
+++ core/branches/Branch_3_5/parent/pom.xml 2010-06-19 14:32:14 UTC (rev 19773)
@@ -683,7 +683,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.2-510</version>
+ <version>8.4-701.jdbc3</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -704,7 +704,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.3-605</version>
+ <version>8.4-701.jdbc3</version>
<scope>test</scope>
</dependency>
</dependencies>
13 years, 10 months
Hibernate SVN: r19772 - core/branches/Branch_3_5/parent.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-06-19 10:26:24 -0400 (Sat, 19 Jun 2010)
New Revision: 19772
Modified:
core/branches/Branch_3_5/parent/pom.xml
Log:
HHH-5323 correct jdbc driver version for testing
Modified: core/branches/Branch_3_5/parent/pom.xml
===================================================================
--- core/branches/Branch_3_5/parent/pom.xml 2010-06-19 00:14:57 UTC (rev 19771)
+++ core/branches/Branch_3_5/parent/pom.xml 2010-06-19 14:26:24 UTC (rev 19772)
@@ -852,8 +852,8 @@
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.1.0</version>
+ <artifactId>ojdbc5</artifactId>
+ <version>11.1.0.7.0</version>
<scope>test</scope>
</dependency>
</dependencies>
13 years, 10 months
Hibernate SVN: r19771 - core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-06-18 20:14:57 -0400 (Fri, 18 Jun 2010)
New Revision: 19771
Modified:
core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util/Jdk.java
Log:
helpers to handle mixed jdk versions
Modified: core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util/Jdk.java
===================================================================
--- core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util/Jdk.java 2010-06-19 00:03:29 UTC (rev 19770)
+++ core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util/Jdk.java 2010-06-19 00:14:57 UTC (rev 19771)
@@ -3,15 +3,10 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.LineNumberReader;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.util.FileUtils;
-import org.gradle.process.internal.DefaultExecHandle;
-import org.gradle.process.internal.ExecHandle;
-import org.gradle.process.internal.ExecHandleBuilder;
/**
* Models path information for a particular JDK install.
@@ -54,6 +49,10 @@
return new File( getJdkExecutable( "javadoc" ) );
}
+ public JavaVersion getVersion() {
+ return version;
+ }
+
protected String getJdkExecutable(String command) {
File executable = findInDir( jdkHome + "/bin", command );
@@ -102,12 +101,7 @@
String version = null;
final String key = "java version \"";
try {
- File javaCommand = getJavaExecutable();
- ExecHandleBuilder execHandleBuilder = new ExecHandleBuilder();
- execHandleBuilder.commandLine( javaCommand.getAbsolutePath(), "-version" );
- ExecHandle execHandle = execHandleBuilder.build();
- execHandle.start();
-// Process javaProcess = Runtime.getRuntime().exec( new String[] { javaCommand.getAbsolutePath(), "-version" } );
+ final File javaCommand = getJavaExecutable();
Process javaProcess = Runtime.getRuntime().exec( javaCommand.getAbsolutePath() + " -version" );
try {
@@ -118,6 +112,7 @@
version = line.substring( key.length(), line.length() - 1 );
}
}
+ br.close();
br = new BufferedReader( new InputStreamReader( javaProcess.getInputStream() ) );
while ( (line = br.readLine()) != null) {
@@ -125,6 +120,7 @@
version = line.substring( key.length(), line.length() - 1 );
}
}
+ br.close();
}
finally {
javaProcess.destroy();
13 years, 10 months
Hibernate SVN: r19770 - core/branches/gradle2.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-06-18 20:03:29 -0400 (Fri, 18 Jun 2010)
New Revision: 19770
Modified:
core/branches/gradle2/settings.gradle
Log:
helpers to handle mixed jdk versions
Modified: core/branches/gradle2/settings.gradle
===================================================================
--- core/branches/gradle2/settings.gradle 2010-06-18 23:22:21 UTC (rev 19769)
+++ core/branches/gradle2/settings.gradle 2010-06-19 00:03:29 UTC (rev 19770)
@@ -1,26 +1,71 @@
-Properties properties = new Properties()
-properties.load(new FileInputStream(new File(gradle.gradleUserHomeDir, 'gradle.properties')))
-
-if (properties.jdk16_home) {
- include 'hibernate-infinispan'
-}
-
+include 'hibernate-core'
include 'hibernate-entitymanager'
include 'hibernate-envers'
-include 'hibernate-core'
-include 'hibernate-testing' // todo : merge this and testsuite into hibernate-core
include 'hibernate-jmx' // todo : merge into hibernate-core
include 'hibernate-annotations' // todo : merge into hibernate-core
include 'hibernate-c3p0'
include 'hibernate-proxool'
include 'hibernate-ehcache'
+include 'hibernate-infinispan'
include 'hibernate-jbosscache'
include 'hibernate-oscache'
include 'hibernate-swarmcache'
include 'hibernate-release'
+Properties properties = new Properties()
+properties.load(new FileInputStream(new File(gradle.gradleUserHomeDir, 'gradle.properties')))
-rootProject.children.each {project ->
+// handle JDK 1.5 and JDK 1.6 evaluations
+org.gradle.util.Jvm jvm = org.gradle.util.Jvm.current();
+if ( !jvm.isJava5Compatible() ) {
+ logger.error( "Must use a 1.5 or higher version of JDK to run build." );
+ throw new RuntimeException( "Cannot proceed; JDK version < 1.5" );
+}
+
+JdkBuildListener buildListener = new JdkBuildListener();
+
+if ( properties.jdk16_home ) {
+ buildListener.java6Home = new org.hibernate.gradle.util.Jdk( properties.jdk16_home );
+}
+else if ( jvm.isJava6Compatible() ) {
+ // the build is being run with JDK 1.6, use its reported home
+ buildListener.java6Home = new org.hibernate.gradle.util.Jdk( System.getProperty( "java.home" ) );
+}
+else {
+ logger.error( "'jdk16_home' was not specified and Gradle jvm was 1.5." );
+ throw new RuntimeException( "Cannot proceed; unable to determine JDK 1.6 home" );
+}
+
+if ( properties.jdk15_home ) {
+ buildListener.java5Home = new org.hibernate.gradle.util.Jdk( properties.jdk15_home );
+}
+else if ( ! jvm.isJava6Compatible() ) {
+ // the build is being run with JDK 1.5, use its reported home
+ buildListener.java5Home = new org.hibernate.gradle.util.Jdk( System.getProperty( "java.home" ) );
+}
+else {
+ logger.error( "'jdk15_home' was not specified and Gradle jvm was 1.6" );
+ throw new RuntimeException( "Cannot proceed; unable to determine JDK 1.5 home" );
+}
+
+gradle.addListener( buildListener )
+
+class JdkBuildListener extends BuildAdapter {
+ org.hibernate.gradle.util.Jdk java5Home;
+ org.hibernate.gradle.util.Jdk java6Home;
+
+ def JdkBuildListener() {
+ }
+
+ void projectsLoaded(Gradle gradle) {
+ gradle.rootProject.allprojects {
+ project.java5Home = java5Home
+ project.java6Home = java6Home
+ }
+ }
+}
+
+rootProject.children.each { project ->
project.buildFileName = "${project.name}.gradle"
assert project.projectDir.isDirectory()
assert project.buildFile.isFile()
13 years, 10 months