Hibernate SVN: r18809 - in validator/trunk/hibernate-validator: src/main/assembly and 1 other directory.
by hibernate-commitsï¼ lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-15 16:11:47 -0500 (Mon, 15 Feb 2010)
New Revision: 18809
Modified:
validator/trunk/hibernate-validator/readme.txt
validator/trunk/hibernate-validator/src/main/assembly/dist.xml
Log:
HV-286 Updated the assembly and readme
Modified: validator/trunk/hibernate-validator/readme.txt
===================================================================
--- validator/trunk/hibernate-validator/readme.txt 2010-02-15 20:17:20 UTC (rev 18808)
+++ validator/trunk/hibernate-validator/readme.txt 2010-02-15 21:11:47 UTC (rev 18809)
@@ -36,8 +36,10 @@
Using Hibernate Validator
-------------------------
- - In case you use the distribution archive from the download sire, copy hibernate-validator-*.jar together
- with all jar files from lib into the classpath of your application.
+ - In case you use the distribution archive from the download site, copy hibernate-validator-*.jar together
+ with all jar files from lib into the classpath of your application. You can switch the slf4j binding
+ jars for log4j (log4j-<version>.jar and slf4j-log4j12-<version>.jar) with the slf4j binding files of
+ your choice. See http://www.slf4j.org/manual.html
In case you are using Java 5 you have to also include all the jar files from the jdk5 subdirectory.
or
Modified: validator/trunk/hibernate-validator/src/main/assembly/dist.xml
===================================================================
--- validator/trunk/hibernate-validator/src/main/assembly/dist.xml 2010-02-15 20:17:20 UTC (rev 18808)
+++ validator/trunk/hibernate-validator/src/main/assembly/dist.xml 2010-02-15 21:11:47 UTC (rev 18809)
@@ -37,6 +37,7 @@
<exclude>com.sun.xml.bind:jaxb-impl</exclude>
<exclude>javax.xml.stream:stax-api</exclude>
<exclude>javax.activation:activation</exclude>
+ <exclude>org.hibernate.java-persistence:jpa-api</exclude>
</excludes>
</dependencySet>
<dependencySet>
@@ -49,7 +50,7 @@
<include>javax.xml.stream:stax-api</include>
<include>javax.activation:activation</include>
</includes>
- </dependencySet>
+ </dependencySet>
</dependencySets>
<files>
14Â years, 3Â months
Hibernate SVN: r18808 - validator/trunk/hibernate-validator/src/main/docbook/en-US/modules.
by hibernate-commitsï¼ lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-15 15:17:20 -0500 (Mon, 15 Feb 2010)
New Revision: 18808
Modified:
validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml
Log:
HV-285
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-02-15 19:24:58 UTC (rev 18807)
+++ validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml 2010-02-15 20:17:20 UTC (rev 18808)
@@ -436,7 +436,7 @@
<para>All the validation methods have a var-args parameter which can be
used to specify, which validation groups shall be considered when
performing the validation. If the parameter is not specified the default
- validation group (<classname>javax.validation.Default</classname>) will
+ validation group (<classname>javax.validation.groups.Default</classname>) will
be used. We will go into more detail on the topic of validation groups
in <xref linkend="validator-usingvalidator-validationgroups" /></para>
@@ -681,12 +681,12 @@
linkend="example-person" />) which has a <classname>@NotNull
</classname>constraint on <property>name</property>. Since no group is
specified for this annotation its default group is
- <classname>javax.validation.Default</classname>.</para>
+ <classname>javax.validation.groups.Default</classname>.</para>
<note>
<para>When more than one group is requested, the order in which the
groups are evaluated is not deterministic. If no group is specified the
- default group <classname>javax.validation.Default</classname> is
+ default group <classname>javax.validation.groups.Default</classname> is
assumed.</para>
</note>
14Â years, 3Â months
Hibernate SVN: r18807 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl.
by hibernate-commitsï¼ lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-15 14:24:58 -0500 (Mon, 15 Feb 2010)
New Revision: 18807
Removed:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/UrlValidator.java
Log:
Removed validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/UrlValidator.java
Deleted: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/UrlValidator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/UrlValidator.java 2010-02-15 19:23:35 UTC (rev 18806)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/UrlValidator.java 2010-02-15 19:24:58 UTC (rev 18807)
@@ -1,47 +0,0 @@
-// $Id: LengthValidator.java 17521 2009-09-16 12:50:41Z hardy.ferentschik $
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.constraints.impl;
-
-import java.net.MalformedURLException;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import org.hibernate.validator.constraints.URL;
-
-/**
- * Validate that the string is a valid URL.
- *
- * @author Hardy Ferentschik
- */
-public class URLValidator implements ConstraintValidator<URL, String> {
- public void initialize(URL url) {
- }
-
- public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
- if ( value == null ) {
- return true;
- }
- try {
- new java.net.URL( value );
- return true;
- }
- catch ( MalformedURLException e ) {
- return false;
- }
- }
-}
\ No newline at end of file
14Â years, 3Â months
Hibernate SVN: r18806 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints.
by hibernate-commitsï¼ lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-15 14:23:35 -0500 (Mon, 15 Feb 2010)
New Revision: 18806
Removed:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Url.java
Log:
Removed validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Url.java
Deleted: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Url.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Url.java 2010-02-15 19:04:40 UTC (rev 18805)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/Url.java 2010-02-15 19:23:35 UTC (rev 18806)
@@ -1,48 +0,0 @@
-// $Id: Length.java 17427 2009-08-27 09:47:28Z hardy.ferentschik $
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.constraints;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-import org.hibernate.validator.constraints.impl.URLValidator;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Validate that the string is a valid URL.
- *
- * @author Hardy Ferentschik
- */
-@Documented
-@Constraint(validatedBy = URLValidator.class)
-@Target({ METHOD, FIELD, TYPE })
-@Retention(RUNTIME)
-public @interface URL {
- public abstract String message() default "{org.hibernate.validator.constraints.URL.message}";
-
- public abstract Class<?>[] groups() default { };
-
- public abstract Class<? extends Payload>[] payload() default { };
-}
\ No newline at end of file
14Â years, 3Â months
Hibernate SVN: r18805 - validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl.
by hibernate-commitsï¼ lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-15 14:04:40 -0500 (Mon, 15 Feb 2010)
New Revision: 18805
Removed:
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/UrlValidatorTest.java
Log:
Removed validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/UrlValidatorTest.java
Capitalizayion problem. This file is a duplicate.
Deleted: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/UrlValidatorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/UrlValidatorTest.java 2010-02-15 18:57:50 UTC (rev 18804)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/UrlValidatorTest.java 2010-02-15 19:04:40 UTC (rev 18805)
@@ -1,48 +0,0 @@
-// $Id: LengthValidatorTest.java 17521 2009-09-16 12:50:41Z hardy.ferentschik $
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.constraints.impl;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
-
-import org.hibernate.validator.constraints.URL;
-import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor;
-import org.hibernate.validator.util.annotationfactory.AnnotationFactory;
-
-/**
- * Tests the {@code Url} constraint.
- *
- * @author Hardy Ferentschik
- */
-public class URLValidatorTest {
-
- @Test
- public void testIsValidUrl() {
- AnnotationDescriptor<URL> descriptor = new AnnotationDescriptor<URL>( URL.class );
- descriptor.setValue( "message", "{org.hibernate.validator.constraints.URL.message}" );
- URL url = AnnotationFactory.create( descriptor );
- URLValidator validator = new URLValidator();
- validator.initialize( url );
- assertTrue( validator.isValid( null, null ) );
- assertFalse( validator.isValid( "", null ) );
- assertFalse( validator.isValid( "http", null ) );
- assertFalse( validator.isValid( "ftp//abc.de", null ) );
- assertTrue( validator.isValid( "ftp://abc.de", null ) );
- }
-}
\ No newline at end of file
14Â years, 3Â months
Hibernate SVN: r18804 - validator/trunk/hibernate-validator/src/main/docbook/en-US/modules.
by hibernate-commitsï¼ lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-15 13:57:50 -0500 (Mon, 15 Feb 2010)
New Revision: 18804
Modified:
validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/integration.xml
Log:
HV-284
Modified: validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/integration.xml
===================================================================
--- validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/integration.xml 2010-02-15 16:09:26 UTC (rev 18803)
+++ validator/trunk/hibernate-validator/src/main/docbook/en-US/modules/integration.xml 2010-02-15 18:57:50 UTC (rev 18804)
@@ -105,19 +105,20 @@
<programlisting><hibernate-configuration>
<session-factory>
...
- <property name="javax.persistence.validation.group.pre-persist">javax.validation.Default</property>
- <property name="javax.persistence.validation.group.pre-update">javax.validation.Default</property>
+ <property name="javax.persistence.validation.group.pre-persist">javax.validation.groups.Default</property>
+ <property name="javax.persistence.validation.group.pre-update">javax.validation.groups.Default</property>
<property name="javax.persistence.validation.group.pre-remove"></property>
+ ...
+ <event type="pre-update">
+ <listener class="<classname>org.hibernate.cfg.beanvalidation.BeanValidationEventListener</classname>"/>
+ </event>
+ <event type="pre-insert">
+ <listener class="<classname>org.hibernate.cfg.beanvalidation.BeanValidationEventListener</classname>"/>
+ </event>
+ <event type="pre-delete">
+ <listener class="<classname>org.hibernate.cfg.beanvalidation.BeanValidationEventListener</classname>"/>
+ </event>
</session-factory>
- <event type="pre-update">
- <listener class="<classname>org.hibernate.cfg.beanvalidation.BeanValidationEventListener</classname>"/>
- </event>
- <event type="pre-insert">
- <listener class="<classname>org.hibernate.cfg.beanvalidation.BeanValidationEventListener</classname>"/>
- </event>
- <event type="pre-delete">
- <listener class="<classname>org.hibernate.cfg.beanvalidation.BeanValidationEventListener</classname>"/>
- </event>
</hibernate-configuration></programlisting>
</example>
</section>
14Â years, 3Â months
Hibernate SVN: r18803 - in jpamodelgen/trunk/src: main/java/org/hibernate/jpamodelgen/xml and 1 other directories.
by hibernate-commitsï¼ lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-15 11:09:26 -0500 (Mon, 15 Feb 2010)
New Revision: 18803
Modified:
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/StringUtil.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java
jpamodelgen/trunk/src/test/resources/org/hibernate/jpamodelgen/test/elementcollection/hostel.xml
Log:
METAGEN-25 - Ensure that the default package name gets used in all cases where class names can be specified
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/StringUtil.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/StringUtil.java 2010-02-15 14:35:46 UTC (rev 18802)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/StringUtil.java 2010-02-15 16:09:26 UTC (rev 18803)
@@ -29,12 +29,12 @@
private StringUtil() {
}
- public static String determineFullyQualifiedClassName(String packageName, String name) {
+ public static String determineFullyQualifiedClassName(String defaultPackage, String name) {
if ( isFullyQualified( name ) ) {
return name;
}
else {
- return packageName + NAME_SEPARATOR + name;
+ return defaultPackage + NAME_SEPARATOR + name;
}
}
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java 2010-02-15 14:35:46 UTC (rev 18802)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java 2010-02-15 16:09:26 UTC (rev 18803)
@@ -69,6 +69,7 @@
protected final String clazzName;
protected final String packageName;
+ protected final String defaultPackageName;
protected final ImportContext importContext;
protected final List<MetaAttribute> members = new ArrayList<MetaAttribute>();
protected final TypeElement element;
@@ -79,37 +80,42 @@
private EmbeddableAttributes embeddableAttributes;
protected AccessTypeInformation accessTypeInfo;
- public XmlMetaEntity(Entity ormEntity, String packageName, TypeElement element, Context context) {
- this( ormEntity.getClazz(), packageName, element, context, ormEntity.isMetadataComplete() );
+ public XmlMetaEntity(Entity ormEntity, String defaultPackageName, TypeElement element, Context context) {
+ this( ormEntity.getClazz(), defaultPackageName, element, context, ormEntity.isMetadataComplete() );
this.attributes = ormEntity.getAttributes();
this.embeddableAttributes = null;
// entities can be directly initialised
init();
}
- protected XmlMetaEntity(MappedSuperclass mappedSuperclass, String packageName, TypeElement element, Context context) {
- this( mappedSuperclass.getClazz(), packageName, element, context, mappedSuperclass.isMetadataComplete() );
+ protected XmlMetaEntity(MappedSuperclass mappedSuperclass, String defaultPackageName, TypeElement element, Context context) {
+ this(
+ mappedSuperclass.getClazz(), defaultPackageName, element, context, mappedSuperclass.isMetadataComplete()
+ );
this.attributes = mappedSuperclass.getAttributes();
this.embeddableAttributes = null;
// entities can be directly initialised
init();
}
- protected XmlMetaEntity(Embeddable embeddable, String packageName, TypeElement element, Context context) {
- this( embeddable.getClazz(), packageName, element, context, embeddable.isMetadataComplete() );
+ protected XmlMetaEntity(Embeddable embeddable, String defaultPackageName, TypeElement element, Context context) {
+ this( embeddable.getClazz(), defaultPackageName, element, context, embeddable.isMetadataComplete() );
this.attributes = null;
this.embeddableAttributes = embeddable.getAttributes();
}
- private XmlMetaEntity(String clazz, String packageName, TypeElement element, Context context, Boolean metaComplete) {
+ private XmlMetaEntity(String clazz, String defaultPackageName, TypeElement element, Context context, Boolean metaComplete) {
+ this.defaultPackageName = defaultPackageName;
String className = clazz;
+ String pkg = defaultPackageName;
if ( StringUtil.isFullyQualified( className ) ) {
- // we have to extract the package name from the fqcn. default package name gets ignored
- packageName = StringUtil.packageNameFromFqcn( className );
+ // if the class name is fully qualified we have to extract the package name from the fqcn.
+ // default package name gets ignored
+ pkg = StringUtil.packageNameFromFqcn( className );
className = StringUtil.classNameFromFqcn( clazz );
}
this.clazzName = className;
- this.packageName = packageName;
+ this.packageName = pkg;
this.context = context;
this.importContext = new ImportContextImpl( getPackageName() );
this.element = element;
@@ -389,14 +395,11 @@
String[] types;
XmlMetaCollection metaCollection;
ElementKind elementKind = getElementKind( collection.getAccess() );
- MapKeyClass mapKeyClass = collection.getMapKeyClass();
- String explicitMapKey = null;
- if ( mapKeyClass != null ) {
- explicitMapKey = mapKeyClass.getClazz();
- }
+ String explicitTargetClass = determineExplicitTargetEntity( collection.getTargetClass() );
+ String explicitMapKey = determineExplicitMapKeyClass( collection.getMapKeyClass() );
try {
types = getCollectionTypes(
- collection.getName(), collection.getTargetClass(), explicitMapKey, elementKind
+ collection.getName(), explicitTargetClass, explicitMapKey, elementKind
);
}
catch ( MetaModelGenerationException e ) {
@@ -415,17 +418,32 @@
return false;
}
+ private String determineExplicitTargetEntity(String targetClass) {
+ String explicitTargetClass = targetClass;
+ if ( explicitTargetClass != null ) {
+ explicitTargetClass = StringUtil.determineFullyQualifiedClassName(
+ defaultPackageName, targetClass
+ );
+ }
+ return explicitTargetClass;
+ }
+
+ private String determineExplicitMapKeyClass(MapKeyClass mapKeyClass) {
+ String explicitMapKey = null;
+ if ( mapKeyClass != null ) {
+ explicitMapKey = StringUtil.determineFullyQualifiedClassName( defaultPackageName, mapKeyClass.getClazz() );
+ }
+ return explicitMapKey;
+ }
+
private boolean parseOneToMany(OneToMany oneToMany) {
String[] types;
XmlMetaCollection metaCollection;
ElementKind elementKind = getElementKind( oneToMany.getAccess() );
- MapKeyClass mapKeyClass = oneToMany.getMapKeyClass();
- String explicitMapKey = null;
- if ( mapKeyClass != null ) {
- explicitMapKey = mapKeyClass.getClazz();
- }
+ String explicitTargetClass = determineExplicitTargetEntity( oneToMany.getTargetEntity() );
+ String explicitMapKey = determineExplicitMapKeyClass( oneToMany.getMapKeyClass() );
try {
- types = getCollectionTypes( oneToMany.getName(), oneToMany.getTargetEntity(), explicitMapKey, elementKind );
+ types = getCollectionTypes( oneToMany.getName(), explicitTargetClass, explicitMapKey, elementKind );
}
catch ( MetaModelGenerationException e ) {
logMetaModelException( oneToMany.getName(), e );
@@ -447,14 +465,11 @@
String[] types;
XmlMetaCollection metaCollection;
ElementKind elementKind = getElementKind( manyToMany.getAccess() );
- MapKeyClass mapKeyClass = manyToMany.getMapKeyClass();
- String explicitMapKey = null;
- if ( mapKeyClass != null ) {
- explicitMapKey = mapKeyClass.getClazz();
- }
+ String explicitTargetClass = determineExplicitTargetEntity( manyToMany.getTargetEntity() );
+ String explicitMapKey = determineExplicitMapKeyClass( manyToMany.getMapKeyClass() );
try {
types = getCollectionTypes(
- manyToMany.getName(), manyToMany.getTargetEntity(), explicitMapKey, elementKind
+ manyToMany.getName(), explicitTargetClass, explicitMapKey, elementKind
);
}
catch ( MetaModelGenerationException e ) {
Modified: jpamodelgen/trunk/src/test/resources/org/hibernate/jpamodelgen/test/elementcollection/hostel.xml
===================================================================
--- jpamodelgen/trunk/src/test/resources/org/hibernate/jpamodelgen/test/elementcollection/hostel.xml 2010-02-15 14:35:46 UTC (rev 18802)
+++ jpamodelgen/trunk/src/test/resources/org/hibernate/jpamodelgen/test/elementcollection/hostel.xml 2010-02-15 16:09:26 UTC (rev 18803)
@@ -5,9 +5,10 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
version="2.0"
>
+ <package>org.hibernate.jpamodelgen.test.elementcollection</package>
<entity class="org.hibernate.jpamodelgen.test.elementcollection.Hostel">
<attributes>
- <one-to-many name="cleaners" target-entity="org.hibernate.jpamodelgen.test.elementcollection.Cleaner">
+ <one-to-many name="cleaners" target-entity="Cleaner">
<map-key-class class="org.hibernate.jpamodelgen.test.elementcollection.Room"/>
</one-to-many>
<element-collection name="roomsByName"
14Â years, 3Â months
Hibernate SVN: r18802 - core/trunk/documentation/manual/src/main/docbook/de-DE.
by hibernate-commitsï¼ lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-15 09:35:46 -0500 (Mon, 15 Feb 2010)
New Revision: 18802
Removed:
core/trunk/documentation/manual/src/main/docbook/de-DE/Author_Group.po
Log:
Removed core/trunk/documentation/manual/src/main/docbook/de-DE/Author_Group.po
File conflicted with author_group.po on Mac
Deleted: core/trunk/documentation/manual/src/main/docbook/de-DE/Author_Group.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/de-DE/Author_Group.po 2010-02-15 13:02:33 UTC (rev 18801)
+++ core/trunk/documentation/manual/src/main/docbook/de-DE/Author_Group.po 2010-02-15 14:35:46 UTC (rev 18802)
@@ -1,420 +0,0 @@
-# translation of Collection_Mapping.po to
-# translation of Collection_Mapping.po to
-# translation of Collection_Mapping.po to
-# translation of Collection_Mapping.po to
-# translation of Collection_Mapping.po to
-# translation of Collection_Mapping.po to
-# Language /mnt/hgfs/base/Hibernate/Reference translations for PACKAGE package.
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-# Automatically generated, 2006.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-# , 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Collection_Mapping\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-02-10T07:25:34\n"
-"PO-Revision-Date: 2007-02-26 10:27+1000\n"
-"Last-Translator: \n"
-"Language-Team: <de(a)li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-
-#. Tag: firstname
-#, no-c-format
-msgid "Gavin"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Christian"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Max"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Emmanuel"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Steve"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "James"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Cheyenne"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Vincent"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Sebastien"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Michael"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Baptiste"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Anthony"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Alvaro"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Anderson"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Daniel Vieira"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Francisco"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Gamarra"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Luiz Carlos"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Marcel"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Paulo"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Pablo L."
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Renato"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Rogério"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Wanderson"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Cao"
-msgstr ""
-
-#. Tag: orgname
-#, no-c-format
-msgid "RedSaga"
-msgstr ""
-
-#. Tag: contrib
-#, no-c-format
-msgid "Translation Lead"
-msgstr ""
14Â years, 3Â months
Hibernate SVN: r18801 - core/trunk/entitymanager/src/main/docbook/en/modules.
by hibernate-commitsï¼ lists.jboss.org
Author: stliu
Date: 2010-02-15 08:02:33 -0500 (Mon, 15 Feb 2010)
New Revision: 18801
Modified:
core/trunk/entitymanager/src/main/docbook/en/modules/transactions.xml
Log:
correct spell
Modified: core/trunk/entitymanager/src/main/docbook/en/modules/transactions.xml
===================================================================
--- core/trunk/entitymanager/src/main/docbook/en/modules/transactions.xml 2010-02-15 01:32:56 UTC (rev 18800)
+++ core/trunk/entitymanager/src/main/docbook/en/modules/transactions.xml 2010-02-15 13:02:33 UTC (rev 18801)
@@ -110,7 +110,7 @@
injected (or looked up) entity managers share the same persistence
context for a particular JTA transaction. The beauty of EJB3 is that you
don't have to care about that anymore and just see data access through
- entity manager and demaraction of transaction scope on session beans as
+ entity manager and demarcation of transaction scope on session beans as
completely orthogonal.</para>
<para>The challenge is the implementation of this (and other) behavior
@@ -371,7 +371,7 @@
<sect1 id="transactions-demarcation">
<title>Database transaction demarcation</title>
- <para>Datatabase (or system) transaction boundaries are always necessary.
+ <para>Database (or system) transaction boundaries are always necessary.
No communication with the database can occur outside of a database
transaction (this seems to confuse many developers who are used to the
auto-commit mode). Always use clear transaction boundaries, even for
@@ -581,7 +581,7 @@
<literal>iterate()</literal>. You <emphasis>must</emphasis> release the
underlying database cursor by calling
<literal>ScrollableResults.close()</literal> or
- <literal>Hibernate.close(Iterator)</literal> explicity from a
+ <literal>Hibernate.close(Iterator)</literal> explicitly from a
<literal>finally</literal> block. (Of course, most applications can
easily avoid using <literal>scroll()</literal> or
<literal>iterate()</literal> at all from the CMT code.)</para>
@@ -638,8 +638,8 @@
<para>Hibernate wraps <literal>SQLException</literal>s thrown while
interacting with the database in a <literal>JDBCException</literal>. In
- fact, Hibernate will attempt to convert the eexception into a more
- meningful subclass of <literal>JDBCException</literal>. The underlying
+ fact, Hibernate will attempt to convert the exception into a more
+ meaningful subclass of <literal>JDBCException</literal>. The underlying
<literal>SQLException</literal> is always available via
<literal>JDBCException.getCause()</literal>. Hibernate converts the
<literal>SQLException</literal> into an appropriate
@@ -724,9 +724,9 @@
intermediate conversation work will be processed in methods not
involving transaction. The end of the conversation will be processed
inside a <literal>JTA</literal> transaction. Hence all queued operations
- will be executed to the database and commited. If you are interested in
+ will be executed to the database and committed. If you are interested in
the notion of conversation inside your application, have a look at JBoss
- Seam. Jboss Seam emphasizes the concept of conversation and entity
+ Seam. JBoss Seam emphasizes the concept of conversation and entity
manager lifecycle and bind EJB3 and JSF together.</para>
</sect2>
@@ -811,7 +811,7 @@
<para>Clearly, manual version checking is only feasible in very trivial
circumstances and not practical for most applications. Often not only
- single instances, but complete graphs of modified ojects have to be
+ single instances, but complete graphs of modified objects have to be
checked. Hibernate offers automatic version checking with either
detached instances or an extended entity manager and persistence context
as the design paradigm.</para>
14Â years, 3Â months
Hibernate SVN: r18800 - core/trunk/documentation/manual.
by hibernate-commitsï¼ lists.jboss.org
Author: rwilding
Date: 2010-02-14 20:32:56 -0500 (Sun, 14 Feb 2010)
New Revision: 18800
Modified:
core/trunk/documentation/manual/pom.xml
Log:
HHH-4918: updated pom with de-DE translation goal
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2010-02-15 00:41:59 UTC (rev 18799)
+++ core/trunk/documentation/manual/pom.xml 2010-02-15 01:32:56 UTC (rev 18800)
@@ -41,6 +41,7 @@
<sourceDocumentName>HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.xml</sourceDocumentName>
<masterTranslation>en-US</masterTranslation>
<translations>
+ <translation>de-DE</translation>
<translation>es-ES</translation>
<translation>fr-FR</translation>
<translation>ja-JP</translation>
14Â years, 3Â months