August 2010 - hibernate-commits - Jboss List Archives

Hibernate SVN: r20121 - in validator/trunk/hibernate-validator-annotation-processor/src: main/java/org/hibernate/validator/ap/checks and 5 other directories.

by hibernate-commits＠lists.jboss.org

Author: gunnar.morling Date: 2010-08-08 06:04:21 -0400 (Sun, 08 Aug 2010) New Revision: 20121 Added: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/RetentionPolicyCheck.java validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ConstraintWithWrongRetentionPolicy.java validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ConstraintWithoutRetentionPolicy.java Removed: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/invalidcomposedconstraint/ Modified: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/ConstraintAnnotationVisitor.java validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/ConstraintCheckFactory.java validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/AnnotationApiHelper.java validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java validator/trunk/hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ValidCustomerNumber.java Log: HV-299: Check retention policy of constraint annotation types Modified: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/ConstraintAnnotationVisitor.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/ConstraintAnnotationVisitor.java 2010-08-08 09:53:03 UTC (rev 20120) +++ validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/ConstraintAnnotationVisitor.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -68,7 +68,9 @@ processingEnvironment.getElementUtils(), processingEnvironment.getTypeUtils(), annotationApiHelper ); - constraintCheckFactory = new ConstraintCheckFactory( constraintHelper ); + constraintCheckFactory = new ConstraintCheckFactory( + processingEnvironment.getTypeUtils(), constraintHelper, annotationApiHelper + ); } /** Modified: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/ConstraintCheckFactory.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/ConstraintCheckFactory.java 2010-08-08 09:53:03 UTC (rev 20120) +++ validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/ConstraintCheckFactory.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -20,7 +20,9 @@ import java.util.Map; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; +import javax.lang.model.util.Types; +import org.hibernate.validator.ap.util.AnnotationApiHelper; import org.hibernate.validator.ap.util.CollectionHelper; import org.hibernate.validator.ap.util.ConstraintHelper; import org.hibernate.validator.ap.util.ConstraintHelper.AnnotationType; @@ -57,7 +59,7 @@ private final static SingleValuedChecks NULL_CHECKS = new SingleValuedChecks(); - public ConstraintCheckFactory(ConstraintHelper constraintHelper) { + public ConstraintCheckFactory(Types typeUtils, ConstraintHelper constraintHelper, AnnotationApiHelper annotationApiHelper) { this.constraintHelper = constraintHelper; @@ -101,6 +103,12 @@ AnnotationType.MULTI_VALUED_CONSTRAINT_ANNOTATION, new MultiValuedChecks( constraintHelper, new AnnotationTypeCheck( constraintHelper ) ) ); + annotationTypeChecks.put( + AnnotationType.CONSTRAINT_META_ANNOTATION, + new SingleValuedChecks( + new RetentionPolicyCheck( annotationApiHelper ) + ) + ); annotationTypeChecks.put( AnnotationType.NO_CONSTRAINT_ANNOTATION, NULL_CHECKS ); nonAnnotationTypeChecks = CollectionHelper.newHashMap(); Added: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/RetentionPolicyCheck.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/RetentionPolicyCheck.java (rev 0) +++ validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/RetentionPolicyCheck.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -0,0 +1,69 @@ +// $Id: RetentionPolicyCheck.java 19310 2010-04-27 22:51:17Z gunnar.morling $ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat Middleware LLC, 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.ap.checks; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.Collections; +import java.util.Set; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.TypeElement; + +import org.hibernate.validator.ap.util.AnnotationApiHelper; +import org.hibernate.validator.ap.util.CollectionHelper; + +/** + * Checks, that {@link RetentionPolicy#RUNTIME} is declared for constraint annotation types. + * + * @author Gunnar Morling + */ +public class RetentionPolicyCheck extends AbstractConstraintCheck { + + private final AnnotationApiHelper annotationApiHelper; + + public RetentionPolicyCheck(AnnotationApiHelper annotationApiHelper) { + this.annotationApiHelper = annotationApiHelper; + } + + @Override + public Set<ConstraintCheckError> checkAnnotationType(TypeElement element, + AnnotationMirror annotation) { + + Retention retention = element.getAnnotation( Retention.class ); + + if ( retention == null ) { + return CollectionHelper.asSet( + new ConstraintCheckError( element, null, "CONSTRAINT_TYPE_WITH_MISSING_OR_WRONG_RETENTION" ) + ); + } + + if ( !retention.value().equals( RetentionPolicy.RUNTIME ) ) { + return CollectionHelper.asSet( + new ConstraintCheckError( + element, + annotationApiHelper.getMirror( element.getAnnotationMirrors(), Retention.class ), + "CONSTRAINT_TYPE_WITH_MISSING_OR_WRONG_RETENTION" + ) + ); + } + + + return Collections.emptySet(); + } + +} Modified: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/AnnotationApiHelper.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/AnnotationApiHelper.java 2010-08-08 09:53:03 UTC (rev 20120) +++ validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/AnnotationApiHelper.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -133,12 +133,22 @@ /** * Returns a TypeMirror for the given class. * - * @param clazz The class of interest. May not be a an array type. + * @param clazz The class of interest. * * @return A TypeMirror for the given class. */ public TypeMirror getMirrorForType(Class<?> clazz) { + if ( clazz.isArray() ) { + return typeUtils.getArrayType( getMirrorForNonArrayType( clazz.getComponentType() ) ); + } + else { + return getMirrorForNonArrayType( clazz ); + } + } + + private TypeMirror getMirrorForNonArrayType(Class<?> clazz) { + if ( clazz.isPrimitive() ) { return primitiveMirrors.get( clazz ); } Modified: validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java 2010-08-08 09:53:03 UTC (rev 20120) +++ validator/trunk/hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -116,6 +116,11 @@ GRAPH_VALIDATION_ANNOTATION, /** + * Given annotation is the @Constraint meta-annotation. + */ + CONSTRAINT_META_ANNOTATION, + + /** * Given annotation is not related to the BV API (e.g. @Resource). */ NO_CONSTRAINT_ANNOTATION @@ -224,6 +229,9 @@ else if ( isGraphValidationAnnotation( annotationMirror ) ) { return AnnotationType.GRAPH_VALIDATION_ANNOTATION; } + else if ( isConstraintMetaAnnotation( annotationMirror ) ) { + return AnnotationType.CONSTRAINT_META_ANNOTATION; + } else { return AnnotationType.NO_CONSTRAINT_ANNOTATION; } @@ -322,6 +330,19 @@ } /** + * Checks, whether the given annotation mirror represents the {@link javax.validation.Constraint} + * meta-annotation or not. + * + * @param annotationMirror The annotation mirror of interest. + * + * @return True, if the given mirror represents the @Constraint meta-annotation + * type, false otherwise. + */ + private boolean isConstraintMetaAnnotation(AnnotationMirror annotationMirror) { + return annotationMirror.getAnnotationType().asElement().getSimpleName().contentEquals( "Constraint" ); + } + + /** * Checks, whether the given annotation mirror represents a multi-valued * constraint such as {@link javax.validation.constraints.Pattern.List}. * That is the case if the annotation has an array-typed attribute with name @@ -596,14 +617,7 @@ Set<TypeMirror> mirrorsForAllowedTypes = CollectionHelper.newHashSet(); for ( Class<?> oneAllowedType : allowedTypes ) { - - if ( oneAllowedType.isArray() ) { - mirrorsForAllowedTypes.add( typeUtils.getArrayType( annotationApiHelper.getMirrorForType( oneAllowedType.getComponentType() ) ) ); - } - else { - mirrorsForAllowedTypes.add( annotationApiHelper.getMirrorForType( oneAllowedType ) ); - } - + mirrorsForAllowedTypes.add( annotationApiHelper.getMirrorForType( oneAllowedType ) ); } builtInConstraints.put( elementUtils.getName( annotation.getSimpleName() ), mirrorsForAllowedTypes ); Modified: validator/trunk/hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties 2010-08-08 09:53:03 UTC (rev 20120) +++ validator/trunk/hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties 2010-08-08 10:04:21 UTC (rev 20121) @@ -11,3 +11,4 @@ INVALID_DIAGNOSTIC_KIND_GIVEN=The given value {0} is no valid diagnostic kind. Kind.ERROR will be used. ATVALID_NOT_ALLOWED_AT_PRIMITIVE_FIELD=Fields of a primitive type must not annotated with @Valid. ATVALID_NOT_ALLOWED_AT_METHOD_RETURNING_PRIMITIVE_TYPE=Methods returning a primitive type must not annotated with @Valid. +CONSTRAINT_TYPE_WITH_MISSING_OR_WRONG_RETENTION=Constraint annotation types must be annotated with @Retention(RUNTIME). \ No newline at end of file Modified: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java 2010-08-08 09:53:03 UTC (rev 20120) +++ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -22,6 +22,8 @@ import org.testng.annotations.Test; +import org.hibernate.validator.ap.testmodel.constrainttypes.ConstraintWithWrongRetentionPolicy; +import org.hibernate.validator.ap.testmodel.constrainttypes.ConstraintWithoutRetentionPolicy; import org.hibernate.validator.ap.testmodel.constrainttypes.ValidCustomerNumber; import org.hibernate.validator.ap.util.DiagnosticExpectation; @@ -50,4 +52,28 @@ ); } + @Test + public void testThatConstraintAnnotationTypeWithoutRetentionPolicyCausesCompilationError() { + + File sourceFile = compilerHelper.getSourceFile( ConstraintWithoutRetentionPolicy.class ); + + boolean compilationResult = + compilerHelper.compile( new ConstraintValidationProcessor(), diagnostics, sourceFile ); + + assertFalse( compilationResult ); + assertThatDiagnosticsMatch( diagnostics, new DiagnosticExpectation( Kind.ERROR, 27 ) ); + } + + @Test + public void testThatConstraintAnnotationTypeWithWrongRetentionPolicyCausesCompilationError() { + + File sourceFile = compilerHelper.getSourceFile( ConstraintWithWrongRetentionPolicy.class ); + + boolean compilationResult = + compilerHelper.compile( new ConstraintValidationProcessor(), diagnostics, sourceFile ); + + assertFalse( compilationResult ); + assertThatDiagnosticsMatch( diagnostics, new DiagnosticExpectation( Kind.ERROR, 30 ) ); + } + } Copied: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes (from rev 20094, validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/invalidcomposedconstraint) Added: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ConstraintWithWrongRetentionPolicy.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ConstraintWithWrongRetentionPolicy.java (rev 0) +++ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ConstraintWithWrongRetentionPolicy.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -0,0 +1,31 @@ +// $Id: ConstraintWithWrongRetentionPolicy.java 19033 Aug 1, 2010 5:44:13 PM gunnar.morling $ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, Red Hat Middleware LLC, 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.ap.testmodel.constrainttypes; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import javax.validation.Constraint; + +/** + * @author Gunnar Morling + */ +@Constraint(validatedBy = { }) +(a)Retention(RetentionPolicy.CLASS) +public @interface ConstraintWithWrongRetentionPolicy { + +} Added: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ConstraintWithoutRetentionPolicy.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ConstraintWithoutRetentionPolicy.java (rev 0) +++ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ConstraintWithoutRetentionPolicy.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -0,0 +1,28 @@ +// $Id: ConstraintWithoutRetentionPolicy.java 19033 Aug 1, 2010 5:44:13 PM gunnar.morling $ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, Red Hat Middleware LLC, 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.ap.testmodel.constrainttypes; + +import javax.validation.Constraint; + +/** + * @author Gunnar Morling + */ +@Constraint(validatedBy = { }) +public @interface ConstraintWithoutRetentionPolicy { + +} Modified: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ValidCustomerNumber.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/invalidcomposedconstraint/ValidCustomerNumber.java 2010-07-30 21:29:10 UTC (rev 20094) +++ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/constrainttypes/ValidCustomerNumber.java 2010-08-08 10:04:21 UTC (rev 20121) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.validator.ap.testmodel.invalidcomposedconstraint; +package org.hibernate.validator.ap.testmodel.constrainttypes; import javax.validation.Payload; import javax.validation.constraints.NotNull;

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20120 - validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap.

by hibernate-commits＠lists.jboss.org

Author: gunnar.morling Date: 2010-08-08 05:53:03 -0400 (Sun, 08 Aug 2010) New Revision: 20120 Added: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTestBase.java Modified: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTest.java Log: HV-299: Extract separate test for test cases related to annotation type checking Added: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java (rev 0) +++ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java 2010-08-08 09:53:03 UTC (rev 20120) @@ -0,0 +1,53 @@ +// $Id: AnnotationTypeValidationTest.java 19525 2010-05-15 16:05:09Z gunnar.morling $ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, Red Hat Middleware LLC, 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.ap; + +import java.io.File; +import javax.tools.Diagnostic.Kind; + +import org.testng.annotations.Test; + +import org.hibernate.validator.ap.testmodel.constrainttypes.ValidCustomerNumber; +import org.hibernate.validator.ap.util.DiagnosticExpectation; + +import static org.hibernate.validator.ap.testutil.CompilerTestHelper.assertThatDiagnosticsMatch; +import static org.testng.Assert.assertFalse; + +/** + * Test cases for {@link ConstraintValidationProcessor} testing the checking of constraint + * annotation type declarations. + * + * @author Gunnar Morling. + */ +public class AnnotationTypeValidationTest extends ConstraintValidationProcessorTestBase { + + @Test + public void testThatSpecifyingConstraintAnnotationAtNonConstraintAnnotationTypeCausesCompilationError() { + + File sourceFile = compilerHelper.getSourceFile( ValidCustomerNumber.class ); + + boolean compilationResult = + compilerHelper.compile( new ConstraintValidationProcessor(), diagnostics, sourceFile ); + + assertFalse( compilationResult ); + assertThatDiagnosticsMatch( + diagnostics, new DiagnosticExpectation( Kind.ERROR, 28 ), new DiagnosticExpectation( Kind.ERROR, 29 ) + ); + } + +} Modified: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTest.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTest.java 2010-08-06 22:00:52 UTC (rev 20119) +++ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTest.java 2010-08-08 09:53:03 UTC (rev 20120) @@ -20,12 +20,7 @@ import java.io.File; import javax.tools.Diagnostic; import javax.tools.Diagnostic.Kind; -import javax.tools.DiagnosticCollector; -import javax.tools.JavaFileObject; -import javax.tools.ToolProvider; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.hibernate.validator.ap.testmodel.FieldLevelValidationUsingBuiltInConstraints; @@ -58,59 +53,25 @@ import org.hibernate.validator.ap.testmodel.inheritedvalidator.CustomConstraint; import org.hibernate.validator.ap.testmodel.inheritedvalidator.CustomConstraintValidator; import org.hibernate.validator.ap.testmodel.inheritedvalidator.FieldLevelValidationUsingInheritedValidator; -import org.hibernate.validator.ap.testmodel.invalidcomposedconstraint.ValidCustomerNumber; import org.hibernate.validator.ap.testmodel.nouniquevalidatorresolution.NoUniqueValidatorResolution; import org.hibernate.validator.ap.testmodel.nouniquevalidatorresolution.SerializableCollection; import org.hibernate.validator.ap.testmodel.nouniquevalidatorresolution.Size; import org.hibernate.validator.ap.testmodel.nouniquevalidatorresolution.SizeValidatorForCollection; import org.hibernate.validator.ap.testmodel.nouniquevalidatorresolution.SizeValidatorForSerializable; import org.hibernate.validator.ap.testmodel.nouniquevalidatorresolution.SizeValidatorForSet; -import org.hibernate.validator.ap.testutil.CompilerTestHelper; import org.hibernate.validator.ap.util.DiagnosticExpectation; import static org.hibernate.validator.ap.testutil.CompilerTestHelper.assertThatDiagnosticsMatch; import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; /** - * Test for {@link ConstraintValidationProcessor} using the Java compiler - * API as defined by JSR 199. + * Miscellaneous tests for {@link ConstraintValidationProcessor}. * * @author Gunnar Morling. */ -public class ConstraintValidationProcessorTest { +public class ConstraintValidationProcessorTest extends ConstraintValidationProcessorTestBase { - private static CompilerTestHelper compilerHelper; - - private DiagnosticCollector<JavaFileObject> diagnostics; - - @BeforeClass - public static void setUpCompilerHelper() { - - String testSourceBaseDir = System.getProperty( "testSourceBaseDir" ); - String pathToBeanValidationApiJar = System.getProperty( "pathToBeanValidationApiJar" ); - - assertNotNull( - testSourceBaseDir, - "The system property testSourceBaseDir has to be set and point to the base directory of the test java sources." - ); - assertNotNull( - pathToBeanValidationApiJar, - "The system property pathToBeanValidationApiJar has to be set and point to the BV API Jars." - ); - - compilerHelper = - new CompilerTestHelper( - ToolProvider.getSystemJavaCompiler(), testSourceBaseDir, pathToBeanValidationApiJar - ); - } - - @BeforeMethod - public void setUp() { - diagnostics = new DiagnosticCollector<JavaFileObject>(); - } - @Test public void fieldLevelValidationUsingBuiltInConstraints() { @@ -302,20 +263,6 @@ } @Test - public void testThatSpecifyingConstraintAnnotationAtNonConstraintAnnotationTypeCausesCompilationError() { - - File sourceFile = compilerHelper.getSourceFile( ValidCustomerNumber.class ); - - boolean compilationResult = - compilerHelper.compile( new ConstraintValidationProcessor(), diagnostics, sourceFile ); - - assertFalse( compilationResult ); - assertThatDiagnosticsMatch( - diagnostics, new DiagnosticExpectation( Kind.ERROR, 28 ), new DiagnosticExpectation( Kind.ERROR, 29 ) - ); - } - - @Test public void testThatNonUniqueValidatorResolutionCausesCompilationError() { File sourceFile1 = compilerHelper.getSourceFile( NoUniqueValidatorResolution.class ); Added: validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTestBase.java =================================================================== --- validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTestBase.java (rev 0) +++ validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTestBase.java 2010-08-08 09:53:03 UTC (rev 20120) @@ -0,0 +1,69 @@ +// $Id: ConstraintValidationProcessorTestBase.java 19033 Aug 8, 2010 11:14:14 AM gunnar.morling $ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat Middleware LLC, 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.ap; + +import javax.tools.DiagnosticCollector; +import javax.tools.JavaFileObject; +import javax.tools.ToolProvider; + +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; + +import org.hibernate.validator.ap.testutil.CompilerTestHelper; + +import static org.testng.Assert.assertNotNull; + +/** + * Base class providing common functionality for all tests for the constraint validation processor using the Java compiler + * API as defined by JSR 199. + * + * @author Gunnar Morling + */ +public abstract class ConstraintValidationProcessorTestBase { + + protected static CompilerTestHelper compilerHelper; + + protected DiagnosticCollector<JavaFileObject> diagnostics; + + @BeforeClass + public static void setUpCompilerHelper() { + + String testSourceBaseDir = System.getProperty( "testSourceBaseDir" ); + String pathToBeanValidationApiJar = System.getProperty( "pathToBeanValidationApiJar" ); + + assertNotNull( + testSourceBaseDir, + "The system property testSourceBaseDir has to be set and point to the base directory of the test java sources." + ); + assertNotNull( + pathToBeanValidationApiJar, + "The system property pathToBeanValidationApiJar has to be set and point to the BV API Jars." + ); + + compilerHelper = + new CompilerTestHelper( + ToolProvider.getSystemJavaCompiler(), testSourceBaseDir, pathToBeanValidationApiJar + ); + } + + @BeforeMethod + public void setUpDiagnostics() { + diagnostics = new DiagnosticCollector<JavaFileObject>(); + } + +} \ No newline at end of file

13 years, 8 months

1
0
0 / 0

hibernate-commits@lists.jboss.org 52% OFF on Pfizer!

by hibernate-commits＠lists.jboss.org

http://groups.yahoo.com/group/grenvillephunguk/message ch sehr gut lernte, sonst aber ziemlich schwierig zu behandeln war. Da ich in meiner freien Zeit im Chor {004 Kriegsbegeisterung} herrenstift zu Lambach Gesangsunterricht erhielt, hatte ich beste Gelegenheit, mich oft und oft am feierlichen Prunke der au.erst glanzvollen kirchlichen Feste zu berauschen. Was war naturlicher, als da., genau so wie einst dem Vater der kleine Herr Dorfpfarrer, nun mir der Herr Abt als hochst erstrebenswertes Ideal erschien? Wenigstens zeitweise war dies der Fall. Nachdem aber der Herr Vater bei seinem streitsuchtigen Jungen die rednerischen Talente aus begreiflichen Grunden nicht so zu schatzen vermochte, um au

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20119 - in core/trunk: distribution and 8 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-08-06 18:00:52 -0400 (Fri, 06 Aug 2010) New Revision: 20119 Modified: core/trunk/distribution/pom.xml core/trunk/documentation/envers/pom.xml core/trunk/documentation/jbosscache2/pom.xml core/trunk/documentation/manual/pom.xml core/trunk/documentation/pom.xml core/trunk/documentation/quickstart/pom.xml core/trunk/jdbc3-testing/pom.xml core/trunk/jdbc4-testing/pom.xml core/trunk/pom.xml core/trunk/testsuite/pom.xml Log: HHH-5438 - Skip deployment of "irrelevant" modules Modified: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/distribution/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -41,6 +41,11 @@ <name>Hibernate Distribution</name> <description>Builds the complete Hibernate distribution bundles</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <build> <plugins> <plugin> Modified: core/trunk/documentation/envers/pom.xml =================================================================== --- core/trunk/documentation/envers/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/documentation/envers/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -17,6 +17,11 @@ <name>Hibernate Envers Manual</name> <description>The Hibernate Envers reference manual</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <build> <plugins> <plugin> Modified: core/trunk/documentation/jbosscache2/pom.xml =================================================================== --- core/trunk/documentation/jbosscache2/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/documentation/jbosscache2/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -41,6 +41,11 @@ <name>Hibernate/JBoss Cache 3 Reference Manual</name> <description>The Hibernate / JBoss Cache 3 integration reference manual</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <build> <plugins> <plugin> Modified: core/trunk/documentation/manual/pom.xml =================================================================== --- core/trunk/documentation/manual/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/documentation/manual/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -17,6 +17,11 @@ <name>Hibernate Manual</name> <description>The Hibernate reference manual</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <build> <plugins> <plugin> Modified: core/trunk/documentation/pom.xml =================================================================== --- core/trunk/documentation/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/documentation/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -17,6 +17,11 @@ <name>Hibernate Core Documentation</name> <description>Grouping of Hibernate Core Project documentation modules</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <modules> <module>manual</module> <module>envers</module> Modified: core/trunk/documentation/quickstart/pom.xml =================================================================== --- core/trunk/documentation/quickstart/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/documentation/quickstart/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -41,6 +41,10 @@ <name>Hibernate QuickStart Guide</name> <description>A QuickStart guide for getting up and started quickly using Hibernate</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> <build> <plugins> Modified: core/trunk/jdbc3-testing/pom.xml =================================================================== --- core/trunk/jdbc3-testing/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/jdbc3-testing/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -38,6 +38,11 @@ <name>Hibernate JDBC3-JdbcSupport Testing</name> <description>Test support of JDBC3 through JdbcSupport</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> Modified: core/trunk/jdbc4-testing/pom.xml =================================================================== --- core/trunk/jdbc4-testing/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/jdbc4-testing/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -36,6 +36,11 @@ <name>Hibernate JDBC4-JdbcSupport Testing</name> <description>Test support of JDBC4 through JdbcSupport</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <build> <plugins> <plugin> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -17,6 +17,11 @@ <name>Hibernate Core Aggregator</name> <description>Aggregator of the Hibernate Core modules.</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <modules> <module>parent</module> <module>core</module> Modified: core/trunk/testsuite/pom.xml =================================================================== --- core/trunk/testsuite/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) +++ core/trunk/testsuite/pom.xml 2010-08-06 22:00:52 UTC (rev 20119) @@ -17,6 +17,11 @@ <name>Hibernate Testsuite</name> <description>The testsuite of Hibernate functionality</description> + <properties> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> + <dependencies> <dependency> <groupId>${groupId}</groupId>

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20118 - in core/trunk/documentation: quickstart and 5 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-08-06 17:34:44 -0400 (Fri, 06 Aug 2010) New Revision: 20118 Added: core/trunk/documentation/quickstart/ core/trunk/documentation/quickstart/pom.xml core/trunk/documentation/quickstart/src/ core/trunk/documentation/quickstart/src/main/ core/trunk/documentation/quickstart/src/main/docbook/ core/trunk/documentation/quickstart/src/main/docbook/en-US/ core/trunk/documentation/quickstart/src/main/docbook/en-US/Hibernate_QuickStart_Guide.ent core/trunk/documentation/quickstart/src/main/docbook/en-US/Hibernate_QuickStart_Guide.xml core/trunk/documentation/quickstart/src/main/docbook/en-US/images/ core/trunk/documentation/quickstart/src/main/docbook/en-US/images/hibernate_logo_a.png Modified: core/trunk/documentation/pom.xml Log: HHH-5442 - Create a "quick start" guide Modified: core/trunk/documentation/pom.xml =================================================================== --- core/trunk/documentation/pom.xml 2010-08-06 08:50:07 UTC (rev 20117) +++ core/trunk/documentation/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) @@ -20,7 +20,8 @@ <modules> <module>manual</module> <module>envers</module> - </modules> Property changes on: core/trunk/documentation/quickstart ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .settings .nbattrs *.log *.properties .clover Added: core/trunk/documentation/quickstart/pom.xml =================================================================== --- core/trunk/documentation/quickstart/pom.xml (rev 0) +++ core/trunk/documentation/quickstart/pom.xml 2010-08-06 21:34:44 UTC (rev 20118) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.6.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <artifactId>hibernate-quickstart</artifactId> + <packaging>jdocbook</packaging> + + <name>Hibernate QuickStart Guide</name> + <description>A QuickStart guide for getting up and started quickly using Hibernate</description> + + + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + + <executions> + <execution> +  + <phase>process-resources</phase> + <goals> + <goal>translate</goal> + </goals> + </execution> + </executions> + + <configuration> + <sourceDocumentName>Hibernate_QuickStart_Guide.xml</sourceDocumentName> + <masterTranslation>en-US</masterTranslation> + <translations> + <translation>de-DE</translation> + <translation>es-ES</translation> + <translation>fr-FR</translation> + <translation>ja-JP</translation> +  + <translation>pt-BR</translation> + <translation>zh-CN</translation> + </translations> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + </configuration> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Added: core/trunk/documentation/quickstart/src/main/docbook/en-US/Hibernate_QuickStart_Guide.ent =================================================================== --- core/trunk/documentation/quickstart/src/main/docbook/en-US/Hibernate_QuickStart_Guide.ent (rev 0) +++ core/trunk/documentation/quickstart/src/main/docbook/en-US/Hibernate_QuickStart_Guide.ent 2010-08-06 21:34:44 UTC (rev 20118) @@ -0,0 +1,5 @@ +<!ENTITY version "WORKING"> +<!ENTITY today "TODAY"> +<!ENTITY copyrightYear "2004"> +<!ENTITY copyrightHolder "Red Hat, Inc."> +<!ENTITY semi ";"> Added: core/trunk/documentation/quickstart/src/main/docbook/en-US/Hibernate_QuickStart_Guide.xml =================================================================== --- core/trunk/documentation/quickstart/src/main/docbook/en-US/Hibernate_QuickStart_Guide.xml (rev 0) +++ core/trunk/documentation/quickstart/src/main/docbook/en-US/Hibernate_QuickStart_Guide.xml 2010-08-06 21:34:44 UTC (rev 20118) @@ -0,0 +1,253 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ + <!ENTITY % BOOK_ENTITIES SYSTEM "Hibernate_QuickStart_Guide.ent"> + %BOOK_ENTITIES; +]> + +<book> + <bookinfo id="Hibernate_QuickStart_Guide"> + <title>Hibernate QuickStart Guide</title> + <releaseinfo>&version;</releaseinfo> + <edition>1.0</edition> + <pubsnumber>1</pubsnumber> + <productname>JBoss Hibernate Core</productname> + <productnumber>&version;</productnumber> + <pubdate>&today;</pubdate> + <issuenum>1</issuenum> + <mediaobject> + <imageobject role="fo"> + <imagedata fileref="images/hibernate_logo_a.png" align="center" /> + </imageobject> + <imageobject role="html"> + <imagedata fileref="images/hibernate_logo_a.png" depth="3cm" /> + </imageobject> + </mediaobject> + <copyright> + <year>&copyrightYear;</year> + <holder>&copyrightHolder;</holder> + </copyright> + </bookinfo> + +  + + <chapter id="hibernate-qs-setup"> + <title>Obtaining Hibernate</title> + + <para> + There are 2 very different ways to "obtain" Hibernate... + </para> + + <section id="hibernate-qs-setup-releaseBundle"> + <title>Release Bundle Downloads</title> + <para> + The Hibernate team provides release bundles hosted on the SourceForge File Release System, which contain + jars, documentation, source code, etc. To obtain the release bundles go to + <ulink url="http://sourceforge.net/projects/hibernate/files/hibernate3/">http://sourceforge.net/projects/hibernate/files/hibernate3/</ulink>, + navigate to the release in which you are interested and select whichever format you prefer. + </para> + <itemizedlist> + <listitem> + <para> + <filename>hibernate3.jar</filename> is an aggregation of all the Hibernate Core classes. + This would need to be part of your project classpath. + </para> + </listitem> + <listitem> + <para> + The <filename>lib/required</filename> directory contains jars that are + <emphasis>required</emphasis> for Hibernate to run. All the jars in this directory would need + to be part of your project classpath as well. + </para> + <important> + <para> + The slf4j jar is special in that you still need further jar file(s) for it to work correctly. + Which jar(s) depends on which logging back-end you want to use. See the + <ulink url="http://slf4j.org/">slf4j site</ulink> for details. + </para> + </important> + </listitem> + <listitem> + <para> + The <filename>/lib/jpa</filename> directory contains the + <ulink url="http://jcp.org/en/jsr/detail?id=317">JPA</ulink> API jar. If you want to use the + JPA APIs or JPA annotations, this jar will need to be part of your project classpath too. + </para> + </listitem> + <listitem> + <para> + The <filename>/lib/optional</filename> directory contains jar files needed when utilizing various + (optional) integrations with Hibernate. These are beyond the scope of this guide, but are + mentioned for completeness. If you were to use any of these features the appropriate jars from here + would need to also be part of your project's classpath (though generally speaking these are only needed + for runtime, not compile-time). + </para> + </listitem> + </itemizedlist> + </section> + + <section id="hibernate-qs-setup-mavenRepoArtifacts"> + <title>Maven Repository Artifacts</title> + <important> + <para> + The authoritative repository for Hibernate artifacts is the JBoss + Maven repository. The team responsible for the JBoss Maven repository maintains a number of wiki + pages that contain important information: + <itemizedlist> + <listitem> + <para> + <ulink url="http://community.jboss.org/docs/DOC-14900">http://community.jboss.org/docs/DOC-14900</ulink> - + contains general information about the repository + </para> + </listitem> + <listitem> + <para> + <ulink url="http://community.jboss.org/docs/DOC-15170">http://community.jboss.org/docs/DOC-15170</ulink> - + contains information about setting up access to the repository for <emphasis>developers</emphasis> + (aka, developers working on Hibernate or JBoss projects). + </para> + </listitem> + <listitem> + <para> + <ulink url="http://community.jboss.org/docs/DOC-15169">http://community.jboss.org/docs/DOC-15169</ulink> - + contains information about setting up access to the repository for <emphasis>users</emphasis> + (aka, consumers of Hibernate or JBoss projects). + </para> + </listitem> + </itemizedlist> + </para> + </important> + <para> + Hibernate produces a number of artifacts (all under the org.hibernate groupId): + <itemizedlist> + <listitem> + <para> + <emphasis>hibernate-core</emphasis> - This is the main artifact. It contains all the + Hibernate classes (<package>org.hibernate</package>) needed to build applications using + the native Hibernate APIs. It includes capabilities for using native Hibernate mapping + (<filename>hbm.xml</filename>) files as well as annotations. + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-entitymanager</emphasis> - Hibernate provides an implementation of + <ulink url="http://jcp.org/en/jsr/detail?id=317">JPA</ulink>. This is the artifact that + represents this JPA implementation. + </para> + <para> + This artifact depends on <emphasis>hibernate-core</emphasis>. + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-envers</emphasis> - Envers is an optional module that + provides historical auditing of changes to your entities. + </para> + <para> + This artifact depends on both <emphasis>hibernate-core</emphasis> and + <emphasis>hibernate-entitymanager</emphasis>. + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-c3p0</emphasis> - Represents the integration between Hibernate + and the <ulink url="http://sourceforge.net/projects/c3p0/">C3P0</ulink> connection pool + library. + </para> + <para> + This artifact depends on <emphasis>hibernate-core</emphasis>; however it would generally + be included in a project as a runtime dependency (rarely would you need to bind against + these classes at compile time). It also pulls in the C3P0 dependencies. + be + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-proxool</emphasis> - Represents the integration between Hibernate + and the <ulink url="http://proxool.sourceforge.net/">Proxool</ulink> connection pool + library. + </para> + <para> + This artifact depends on <emphasis>hibernate-core</emphasis>; however it would generally + be included in a project as a runtime dependency (rarely would you need to bind against + these classes at compile time). It also pulls in the Proxool dependencies. + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-ehcache</emphasis> - Represents the integration between Hibernate + and <ulink url="http://ehcache.sourceforge.net/">EhCache</ulink> as a second level cache + implementation. + </para> + <para> + This artifact depends on <emphasis>hibernate-core</emphasis>; however it would generally + be included in a project as a runtime dependency (rarely would you need to bind against + these classes at compile time). It also pulls in the Ehcache dependencies. + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-infinispan</emphasis> - Represents the integration between Hibernate + and <ulink url="http://jboss.org/infinispan">Infinispan</ulink> as a second level cache + implementation. + </para> + <para> + This artifact depends on <emphasis>hibernate-core</emphasis>; however it would generally + be included in a project as a runtime dependency (rarely would you need to bind against + these classes at compile time). It also pulls in the Infinispan dependencies. + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-jbosscache</emphasis> - Represents the integration between Hibernate + and <ulink url="http://jboss.org/jbosscache">JBossCache</ulink> as a second level cache + implementation. + </para> + <para> + This artifact depends on <emphasis>hibernate-core</emphasis>; however it would generally + be included in a project as a runtime dependency (rarely would you need to bind against + these classes at compile time). It also pulls in the JBossCache dependencies + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-oscache</emphasis> - Represents the integration between Hibernate + and <ulink url="http://www.opensymphony.com/oscache/">OSCache</ulink> as a second level cache + implementation. + </para> + <para> + This artifact depends on <emphasis>hibernate-core</emphasis>; however it would generally + be included in a project as a runtime dependency (rarely would you need to bind against + these classes at compile time). It also pulls in the OSCache dependencies. + </para> + </listitem> + <listitem> + <para> + <emphasis>hibernate-swarmcache</emphasis> - Represents the integration between Hibernate + and <ulink url="http://swarmcache.sourceforge.net/">SwarmCache</ulink> as a second level cache + implementation. + </para> + <para> + This artifact depends on <emphasis>hibernate-core</emphasis>; however it would generally + be included in a project as a runtime dependency (rarely would you need to bind against + these classes at compile time). It also pulls in the SwarmCache dependencies. + </para> + </listitem> + </itemizedlist> + </para> + </section> + </chapter> + + <chapter id="hibernate-qs-keyConcepts"> + <title>Key Concepts</title> + <para> + Discuss some key concepts such as Configuration, SessionFactory, Session (?and Transaction?). + </para> + </chapter> + + <chapter id="hibernate-qs-nextSteps"> + <title>Next Steps</title> + <para> + go on to tutorials; community links + </para> + </chapter> +</book> \ No newline at end of file Copied: core/trunk/documentation/quickstart/src/main/docbook/en-US/images/hibernate_logo_a.png (from rev 20114, core/trunk/documentation/manual/src/main/docbook/en-US/images/hibernate_logo_a.png) =================================================================== (Binary files differ)

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20117 - in annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate: cfg/annotations and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2010-08-06 04:50:07 -0400 (Fri, 06 Aug 2010) New Revision: 20117 Modified: annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/annotations/Tables.java annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/EntityBinder.java Log: JBPAPP-4716 ANN-555 fix breaks backward compatibility Modified: annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/annotations/Tables.java =================================================================== --- annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/annotations/Tables.java 2010-08-05 15:52:56 UTC (rev 20116) +++ annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/annotations/Tables.java 2010-08-06 08:50:07 UTC (rev 20117) @@ -15,4 +15,7 @@ @Retention(RUNTIME) public @interface Tables { Table[] value(); + //this methon was removed due to ANN-555, to keep the compatibility, add it back + @Deprecated + Table[] values() default {}; } Modified: annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/EntityBinder.java =================================================================== --- annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2010-08-05 15:52:56 UTC (rev 20116) +++ annotations/branches/v3_3_1_GA_CP/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2010-08-06 08:50:07 UTC (rev 20117) @@ -549,6 +549,13 @@ break; } } + //JBPAPP-4716 + for (org.hibernate.annotations.Table current : tables.values()) { + if ( tableName.equals( current.appliesTo() ) ) { + matchingTable = current; + break; + } + } } } return matchingTable; @@ -777,6 +784,10 @@ for (org.hibernate.annotations.Table table : tables.value()) { processComplementaryTableDefinitions( table ); } + //JBPAPP-4716 + for (org.hibernate.annotations.Table table : tables.values()) { + processComplementaryTableDefinitions( table ); + } } public void setPropertyAnnotated(boolean propertyAnnotated) {

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20116 - core/trunk/distribution/src/site.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-08-05 11:52:56 -0400 (Thu, 05 Aug 2010) New Revision: 20116 Modified: core/trunk/distribution/src/site/site.xml Log: HHH-5439 - Deployment of site.xml Modified: core/trunk/distribution/src/site/site.xml =================================================================== --- core/trunk/distribution/src/site/site.xml 2010-08-05 15:51:28 UTC (rev 20115) +++ core/trunk/distribution/src/site/site.xml 2010-08-05 15:52:56 UTC (rev 20116) @@ -1,4 +1,4 @@ -<project name="Hibernate Core"> +<project name="Hibernate Core ${project.version}"> <bannerLeft> <name>Hibernate Core Project</name> @@ -7,7 +7,7 @@ </bannerLeft> <version position="left"/> - <publishDate position="navigation-bottom" format="yyyy-MM-dd"/> + <publishDate position="navigation-bottom" format="yyyy.MM.dd"/> <!-- <poweredBy> <logo name="Maven" href="http://maven.apache.org/" img="images/maven-button-4.png"/>

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20115 - core/branches/Branch_3_5/distribution/src/site.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-08-05 11:51:28 -0400 (Thu, 05 Aug 2010) New Revision: 20115 Modified: core/branches/Branch_3_5/distribution/src/site/site.xml Log: HHH-5439 - Deployment of site.xml Modified: core/branches/Branch_3_5/distribution/src/site/site.xml =================================================================== --- core/branches/Branch_3_5/distribution/src/site/site.xml 2010-08-04 15:53:09 UTC (rev 20114) +++ core/branches/Branch_3_5/distribution/src/site/site.xml 2010-08-05 15:51:28 UTC (rev 20115) @@ -1,4 +1,4 @@ -<project name="Hibernate Core"> +<project name="Hibernate Core ${project.version}"> <bannerLeft> <name>Hibernate Core Project</name>

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20114 - in core/trunk: cache-ehcache and 22 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-08-04 11:53:09 -0400 (Wed, 04 Aug 2010) New Revision: 20114 Modified: core/trunk/cache-ehcache/pom.xml core/trunk/cache-infinispan/pom.xml core/trunk/cache-jbosscache/pom.xml core/trunk/cache-oscache/pom.xml core/trunk/cache-swarmcache/pom.xml core/trunk/connection-c3p0/pom.xml core/trunk/connection-proxool/pom.xml core/trunk/core/pom.xml core/trunk/distribution/pom.xml core/trunk/documentation/envers/pom.xml core/trunk/documentation/jbosscache2/pom.xml core/trunk/documentation/manual/pom.xml core/trunk/documentation/pom.xml core/trunk/entitymanager/pom.xml core/trunk/envers/pom.xml core/trunk/jdbc3-testing/pom.xml core/trunk/jdbc4-testing/pom.xml core/trunk/parent/pom.xml core/trunk/pom.xml core/trunk/testing/pom.xml core/trunk/testsuite/pom.xml core/trunk/tutorials/eg/pom.xml core/trunk/tutorials/pom.xml core/trunk/tutorials/web/pom.xml Log: Updating pom versions to 3.6.0-SNAPSHOT for release tagging Modified: core/trunk/cache-ehcache/pom.xml =================================================================== --- core/trunk/cache-ehcache/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/cache-ehcache/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-infinispan/pom.xml =================================================================== --- core/trunk/cache-infinispan/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/cache-infinispan/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-jbosscache/pom.xml =================================================================== --- core/trunk/cache-jbosscache/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/cache-jbosscache/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -27,7 +27,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-oscache/pom.xml =================================================================== --- core/trunk/cache-oscache/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/cache-oscache/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-swarmcache/pom.xml =================================================================== --- core/trunk/cache-swarmcache/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/cache-swarmcache/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/connection-c3p0/pom.xml =================================================================== --- core/trunk/connection-c3p0/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/connection-c3p0/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/connection-proxool/pom.xml =================================================================== --- core/trunk/connection-proxool/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/connection-proxool/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/core/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/distribution/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -30,7 +30,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/envers/pom.xml =================================================================== --- core/trunk/documentation/envers/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/documentation/envers/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/jbosscache2/pom.xml =================================================================== --- core/trunk/documentation/jbosscache2/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/documentation/jbosscache2/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -30,7 +30,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/manual/pom.xml =================================================================== --- core/trunk/documentation/manual/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/documentation/manual/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/pom.xml =================================================================== --- core/trunk/documentation/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/documentation/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/entitymanager/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/envers/pom.xml =================================================================== --- core/trunk/envers/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/envers/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/jdbc3-testing/pom.xml =================================================================== --- core/trunk/jdbc3-testing/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/jdbc3-testing/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -28,7 +28,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/jdbc4-testing/pom.xml =================================================================== --- core/trunk/jdbc4-testing/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/jdbc4-testing/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -28,7 +28,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/parent/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -29,7 +29,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> <packaging>pom</packaging> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <name>Hibernate Core Parent POM</name> <description>The base POM for all Hibernate Core modules.</description> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>parent/pom.xml</relativePath> </parent> Modified: core/trunk/testing/pom.xml =================================================================== --- core/trunk/testing/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/testing/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/testsuite/pom.xml =================================================================== --- core/trunk/testsuite/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/testsuite/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/tutorials/eg/pom.xml =================================================================== --- core/trunk/tutorials/eg/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/tutorials/eg/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -30,7 +30,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-tutorials</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: core/trunk/tutorials/pom.xml =================================================================== --- core/trunk/tutorials/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/tutorials/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -29,7 +29,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/tutorials/web/pom.xml =================================================================== --- core/trunk/tutorials/web/pom.xml 2010-08-04 15:52:51 UTC (rev 20113) +++ core/trunk/tutorials/web/pom.xml 2010-08-04 15:53:09 UTC (rev 20114) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-tutorials</artifactId> - <version>3.6.0.Beta2</version> + <version>3.6.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20113 - core/tags.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2010-08-04 11:52:51 -0400 (Wed, 04 Aug 2010) New Revision: 20113 Added: core/tags/hibernate-3.6.0.Beta2/ Log: Tagging 3.6.0.Beta2 release Copied: core/tags/hibernate-3.6.0.Beta2 (from rev 20112, core/trunk)

13 years, 8 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 2010