October 2008 - hibernate-commits - Jboss List Archives

Hibernate SVN: r15417 - core/trunk/annotations/src.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-28 14:52:43 -0400 (Tue, 28 Oct 2008) New Revision: 15417 Added: core/trunk/annotations/src/main/ Log: HHH-3550 : import annotations into core

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15416 - in core/trunk: commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory and 5 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-28 14:43:14 -0400 (Tue, 28 Oct 2008) New Revision: 15416 Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/AssertionFailure.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/Version.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationDescriptor.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationFactory.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationProxy.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/AnnotationReader.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/Filter.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/ReflectionManager.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/ReflectionUtil.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XAnnotatedElement.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XClass.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XMember.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XMethod.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XPackage.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XProperty.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaAnnotationReader.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXAnnotatedElement.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXArrayType.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXClass.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXCollectionType.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXMember.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXMethod.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXPackage.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXProperty.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXSimpleType.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXType.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/Pair.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/ApproximatingTypeEnvironment.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/CompoundTypeEnvironment.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/IdentityTypeEnvironment.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/SimpleTypeEnvironment.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironment.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironmentFactory.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeFactory.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeSwitch.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeUtils.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/util/ReflectHelper.java core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/util/StringHelper.java core/trunk/core/src/main/java/org/hibernate/util/StringHelper.java Log: HHH-3549 : import commons-annotations into core Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/AssertionFailure.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/AssertionFailure.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/AssertionFailure.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,4 +1,26 @@ -//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common; import org.slf4j.LoggerFactory; @@ -7,11 +29,12 @@ /** * Indicates failure of an assertion: a possible bug in Hibernate. + * <p/> + * TODO : Copy from Hibernate Core, do some mutualization here? * * @author Gavin King * @auhor Emmanuel Bernard */ -//TODO Copy from Hibernate Core, do some mutualization here? public class AssertionFailure extends RuntimeException { private static final Logger log = LoggerFactory.getLogger(AssertionFailure.class); Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/Version.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/Version.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/Version.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common; import org.slf4j.Logger; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationDescriptor.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationDescriptor.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationDescriptor.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.annotationfactory; import java.lang.annotation.Annotation; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationFactory.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationFactory.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationFactory.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.annotationfactory; import java.lang.annotation.Annotation; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationProxy.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationProxy.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/annotationfactory/AnnotationProxy.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.annotationfactory; import java.lang.annotation.Annotation; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/AnnotationReader.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/AnnotationReader.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/AnnotationReader.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; import java.lang.annotation.Annotation; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/Filter.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/Filter.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/Filter.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; /** Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/ReflectionManager.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/ReflectionManager.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/ReflectionManager.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; import java.lang.reflect.AnnotatedElement; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/ReflectionUtil.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/ReflectionUtil.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/ReflectionUtil.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; import java.lang.reflect.Field; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XAnnotatedElement.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XAnnotatedElement.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XAnnotatedElement.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; import java.lang.annotation.Annotation; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XClass.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XClass.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XClass.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; import java.util.List; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XMember.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XMember.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XMember.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; import java.util.Collection; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XMethod.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XMethod.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XMethod.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; /** Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XPackage.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XPackage.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XPackage.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; /** Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XProperty.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XProperty.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/XProperty.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection; /** Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaAnnotationReader.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaAnnotationReader.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaAnnotationReader.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; import java.lang.annotation.Annotation; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaReflectionManager.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; import java.lang.reflect.AnnotatedElement; @@ -19,7 +42,7 @@ import org.hibernate.annotations.common.reflection.java.generics.TypeEnvironmentFactory; import org.hibernate.annotations.common.reflection.java.generics.TypeSwitch; import org.hibernate.annotations.common.reflection.java.generics.TypeUtils; -import org.hibernate.annotations.common.util.ReflectHelper; +import org.hibernate.util.ReflectHelper; import org.hibernate.annotations.common.Version; /** Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXAnnotatedElement.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXAnnotatedElement.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXAnnotatedElement.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; import java.lang.annotation.Annotation; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXArrayType.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXArrayType.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXArrayType.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; import java.lang.reflect.Array; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXClass.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXClass.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXClass.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; import java.lang.reflect.Field; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXCollectionType.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXCollectionType.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXCollectionType.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,4 +1,28 @@ -// $Id:$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + +// $Id$ package org.hibernate.annotations.common.reflection.java; import java.lang.reflect.ParameterizedType; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXMember.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXMember.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXMember.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,27 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + //$Id$ package org.hibernate.annotations.common.reflection.java; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXMethod.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXMethod.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXMethod.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,27 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + //$Id$ package org.hibernate.annotations.common.reflection.java; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXPackage.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXPackage.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXPackage.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; import org.hibernate.annotations.common.reflection.XPackage; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXProperty.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXProperty.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXProperty.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; import java.beans.Introspector; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXSimpleType.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXSimpleType.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXSimpleType.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; import java.lang.reflect.Type; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXType.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXType.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/JavaXType.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,27 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + //$Id: PropertyTypeExtractor.java 9316 2006-02-22 20:47:31Z epbernard $ package org.hibernate.annotations.common.reflection.java; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/Pair.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/Pair.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/Pair.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java; /** Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/ApproximatingTypeEnvironment.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/ApproximatingTypeEnvironment.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/ApproximatingTypeEnvironment.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.Array; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/CompoundTypeEnvironment.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/CompoundTypeEnvironment.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/CompoundTypeEnvironment.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.Type; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/IdentityTypeEnvironment.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/IdentityTypeEnvironment.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/IdentityTypeEnvironment.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.Type; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/SimpleTypeEnvironment.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/SimpleTypeEnvironment.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/SimpleTypeEnvironment.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.GenericArrayType; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironment.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironment.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironment.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.Type; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironmentFactory.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironmentFactory.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeEnvironmentFactory.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.ParameterizedType; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeFactory.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeFactory.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeFactory.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.Array; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeSwitch.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeSwitch.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeSwitch.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.GenericArrayType; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeUtils.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeUtils.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/reflection/java/generics/TypeUtils.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.reflection.java.generics; import java.lang.reflect.GenericArrayType; Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/util/ReflectHelper.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/util/ReflectHelper.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/util/ReflectHelper.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,122 +1,79 @@ -//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.util; import java.lang.reflect.Method; import java.lang.reflect.Member; -import java.lang.reflect.Modifier; -import org.hibernate.annotations.common.AssertionFailure; - /** + * Complete duplication of {@link org.hibernate.util.ReflectHelper}. + * * @author Emmanuel Bernard + * @deprecated Use {@link org.hibernate.util.ReflectHelper} instead. */ - public final class ReflectHelper { - - private static final Class[] OBJECT = new Class[] { Object.class }; - private static final Method OBJECT_EQUALS; - private static final Class[] NO_PARAM = new Class[] { }; - - private static final Method OBJECT_HASHCODE; - static { - Method eq; - Method hash; - try { - eq = Object.class.getMethod("equals", OBJECT); - hash = Object.class.getMethod("hashCode", NO_PARAM); - } - catch (Exception e) { - throw new AssertionFailure("Could not find Object.equals() or Object.hashCode()", e); - } - OBJECT_EQUALS = eq; - OBJECT_HASHCODE = hash; - } - public static boolean overridesEquals(Class clazz) { - Method equals; - try { - equals = clazz.getMethod("equals", OBJECT); - } - catch (NoSuchMethodException nsme) { - return false; //its an interface so we can't really tell anything... - } - return !OBJECT_EQUALS.equals(equals); + return org.hibernate.util.ReflectHelper.overridesEquals( clazz ); } public static boolean overridesHashCode(Class clazz) { - Method hashCode; - try { - hashCode = clazz.getMethod("hashCode", NO_PARAM); - } - catch (NoSuchMethodException nsme) { - return false; //its an interface so we can't really tell anything... - } - return !OBJECT_HASHCODE.equals(hashCode); + return org.hibernate.util.ReflectHelper.overridesHashCode( clazz ); } public static Class classForName(String name) throws ClassNotFoundException { - try { - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - if ( contextClassLoader != null ) { - return contextClassLoader.loadClass(name); - } - } - catch ( Throwable t ) { - } - return Class.forName( name ); + return org.hibernate.util.ReflectHelper.classForName( name ); } public static Class classForName(String name, Class caller) throws ClassNotFoundException { - try { - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - if ( contextClassLoader != null ) { - return contextClassLoader.loadClass( name ); - } - } - catch ( Throwable e ) { - } - return Class.forName( name, true, caller.getClassLoader() ); + return org.hibernate.util.ReflectHelper.classForName( name, caller ); } public static boolean isPublic(Class clazz, Member member) { - return Modifier.isPublic( member.getModifiers() ) && Modifier.isPublic( clazz.getModifiers() ); + return org.hibernate.util.ReflectHelper.isPublic( clazz, member ); } public static Object getConstantValue(String name) { - Class clazz; - try { - clazz = classForName( StringHelper.qualifier( name ) ); - } - catch ( Throwable t ) { - return null; - } - try { - return clazz.getField( StringHelper.unqualify( name ) ).get(null); - } - catch ( Throwable t ) { - return null; - } + return org.hibernate.util.ReflectHelper.getConstantValue( name ); } public static boolean isAbstractClass(Class clazz) { - int modifier = clazz.getModifiers(); - return Modifier.isAbstract(modifier) || Modifier.isInterface(modifier); + return org.hibernate.util.ReflectHelper.isAbstractClass( clazz ); } public static boolean isFinalClass(Class clazz) { - return Modifier.isFinal( clazz.getModifiers() ); + return org.hibernate.util.ReflectHelper.isFinalClass( clazz ); } public static Method getMethod(Class clazz, Method method) { - try { - return clazz.getMethod( method.getName(), method.getParameterTypes() ); - } - catch (Exception e) { - return null; - } + return org.hibernate.util.ReflectHelper.getMethod( clazz, method ); } - private ReflectHelper() {} + /** + * Direct instantiation of ReflectHelper disallowed. + */ + private ReflectHelper() { + } } Modified: core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/util/StringHelper.java =================================================================== --- core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/util/StringHelper.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/commons-annotations/src/main/java/org/hibernate/annotations/common/util/StringHelper.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -1,421 +1,198 @@ -//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.annotations.common.util; import java.util.Iterator; -import java.util.StringTokenizer; -import java.util.ArrayList; import java.util.Collection; /** + * Complete duplication of {@link org.hibernate.util.StringHelper}. + * * @author Emmanuel Bernard + * @deprecated Use {@link org.hibernate.util.StringHelper} instead. */ -//TODO copy from Hibernate Core, mutualization? public final class StringHelper { private static final int ALIAS_TRUNCATE_LENGTH = 10; public static final String WHITESPACE = " \n\r\f\t"; - private StringHelper() { /* static methods only - hide constructor */ + private StringHelper() { } public static int lastIndexOfLetter(String string) { - for ( int i=0; i<string.length(); i++ ) { - char character = string.charAt(i); - if ( !Character.isLetter(character) ) return i-1; - } - return string.length()-1; + return org.hibernate.util.StringHelper.lastIndexOfLetter( string ); } public static String join(String seperator, String[] strings) { - int length = strings.length; - if ( length == 0 ) return ""; - StringBuffer buf = new StringBuffer( length * strings[0].length() ) - .append( strings[0] ); - for ( int i = 1; i < length; i++ ) { - buf.append( seperator ).append( strings[i] ); - } - return buf.toString(); + return org.hibernate.util.StringHelper.join( seperator, strings ); } public static String join(String seperator, Iterator objects) { - StringBuffer buf = new StringBuffer(); - if ( objects.hasNext() ) buf.append( objects.next() ); - while ( objects.hasNext() ) { - buf.append( seperator ).append( objects.next() ); - } - return buf.toString(); + return org.hibernate.util.StringHelper.join( seperator, objects ); } public static String[] add(String[] x, String sep, String[] y) { - String[] result = new String[x.length]; - for ( int i = 0; i < x.length; i++ ) { - result[i] = x[i] + sep + y[i]; - } - return result; + return org.hibernate.util.StringHelper.add( x, sep, y ); } public static String repeat(String string, int times) { - StringBuffer buf = new StringBuffer( string.length() * times ); - for ( int i = 0; i < times; i++ ) buf.append( string ); - return buf.toString(); + return org.hibernate.util.StringHelper.repeat( string, times ); } public static String replace(String template, String placeholder, String replacement) { - return replace( template, placeholder, replacement, false ); + return org.hibernate.util.StringHelper.replace( template, placeholder, replacement ); } public static String[] replace(String templates[], String placeholder, String replacement) { - String[] result = new String[templates.length]; - for ( int i =0; i<templates.length; i++ ) { - result[i] = replace( templates[i], placeholder, replacement ); - } - return result; + return org.hibernate.util.StringHelper.replace( templates, placeholder, replacement ); } public static String replace(String template, String placeholder, String replacement, boolean wholeWords) { - int loc = template == null ? -1 : template.indexOf( placeholder ); - if ( loc < 0 ) { - return template; - } - else { - final boolean actuallyReplace = !wholeWords || - loc + placeholder.length() == template.length() || - !Character.isJavaIdentifierPart( template.charAt( loc + placeholder.length() ) ); - String actualReplacement = actuallyReplace ? replacement : placeholder; - return new StringBuffer( template.substring( 0, loc ) ) - .append( actualReplacement ) - .append( replace( template.substring( loc + placeholder.length() ), - placeholder, - replacement, - wholeWords ) ).toString(); - } + return org.hibernate.util.StringHelper.replace( template, placeholder, replacement, wholeWords ); } - public static String replaceOnce(String template, String placeholder, String replacement) { - int loc = template == null ? -1 : template.indexOf( placeholder ); - if ( loc < 0 ) { - return template; - } - else { - return new StringBuffer( template.substring( 0, loc ) ) - .append( replacement ) - .append( template.substring( loc + placeholder.length() ) ) - .toString(); - } + return org.hibernate.util.StringHelper.replaceOnce( template, placeholder, replacement ); } public static String[] split(String seperators, String list) { - return split( seperators, list, false ); + return org.hibernate.util.StringHelper.split( seperators, list ); } public static String[] split(String seperators, String list, boolean include) { - StringTokenizer tokens = new StringTokenizer( list, seperators, include ); - String[] result = new String[ tokens.countTokens() ]; - int i = 0; - while ( tokens.hasMoreTokens() ) { - result[i++] = tokens.nextToken(); - } - return result; + return org.hibernate.util.StringHelper.split( seperators, list, include ); } public static String unqualify(String qualifiedName) { - int loc = qualifiedName.lastIndexOf("."); - return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( qualifiedName.lastIndexOf(".") + 1 ); + return org.hibernate.util.StringHelper.unqualify( qualifiedName ); } - public static String qualifier(String qualifiedName) { - int loc = qualifiedName.lastIndexOf("."); - return ( loc < 0 ) ? "" : qualifiedName.substring( 0, loc ); + public static String qualify(String prefix, String name) { + return org.hibernate.util.StringHelper.qualify( prefix, name ); } - public static String[] suffix(String[] columns, String suffix) { - if ( suffix == null ) return columns; - String[] qualified = new String[columns.length]; - for ( int i = 0; i < columns.length; i++ ) { - qualified[i] = suffix( columns[i], suffix ); - } - return qualified; + public static String[] qualify(String prefix, String[] names) { + return org.hibernate.util.StringHelper.qualify( prefix, names ); } - private static String suffix(String name, String suffix) { - return ( suffix == null ) ? name : name + suffix; + public static String qualifier(String qualifiedName) { + return org.hibernate.util.StringHelper.qualifier( qualifiedName ); } + public static String[] suffix(String[] columns, String suffix) { + return org.hibernate.util.StringHelper.suffix( columns, suffix ); + } + public static String root(String qualifiedName) { - int loc = qualifiedName.indexOf( "." ); - return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( 0, loc ); + return org.hibernate.util.StringHelper.root( qualifiedName ); } public static String unroot(String qualifiedName) { - int loc = qualifiedName.indexOf( "." ); - return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( loc+1, qualifiedName.length() ); + return org.hibernate.util.StringHelper.unroot( qualifiedName ); } public static boolean booleanValue(String tfString) { - String trimmed = tfString.trim().toLowerCase(); - return trimmed.equals( "true" ) || trimmed.equals( "t" ); + return org.hibernate.util.StringHelper.booleanValue( tfString ); } public static String toString(Object[] array) { - int len = array.length; - if ( len == 0 ) return ""; - StringBuffer buf = new StringBuffer( len * 12 ); - for ( int i = 0; i < len - 1; i++ ) { - buf.append( array[i] ).append(", "); - } - return buf.append( array[len - 1] ).toString(); + return org.hibernate.util.StringHelper.toString( array ); } public static String[] multiply(String string, Iterator placeholders, Iterator replacements) { - String[] result = new String[]{string}; - while ( placeholders.hasNext() ) { - result = multiply( result, ( String ) placeholders.next(), ( String[] ) replacements.next() ); - } - return result; + return org.hibernate.util.StringHelper.multiply( string, placeholders, replacements ); } - private static String[] multiply(String[] strings, String placeholder, String[] replacements) { - String[] results = new String[replacements.length * strings.length]; - int n = 0; - for ( int i = 0; i < replacements.length; i++ ) { - for ( int j = 0; j < strings.length; j++ ) { - results[n++] = replaceOnce( strings[j], placeholder, replacements[i] ); - } - } - return results; - } - public static int countUnquoted(String string, char character) { - if ( '\'' == character ) { - throw new IllegalArgumentException( "Unquoted count of quotes is invalid" ); - } - if (string == null) - return 0; - // Impl note: takes advantage of the fact that an escpaed single quote - // embedded within a quote-block can really be handled as two seperate - // quote-blocks for the purposes of this method... - int count = 0; - int stringLength = string.length(); - boolean inQuote = false; - for ( int indx = 0; indx < stringLength; indx++ ) { - char c = string.charAt( indx ); - if ( inQuote ) { - if ( '\'' == c ) { - inQuote = false; - } - } - else if ( '\'' == c ) { - inQuote = true; - } - else if ( c == character ) { - count++; - } - } - return count; + return org.hibernate.util.StringHelper.countUnquoted( string, character ); } public static int[] locateUnquoted(String string, char character) { - if ( '\'' == character ) { - throw new IllegalArgumentException( "Unquoted count of quotes is invalid" ); - } - if (string == null) { - return new int[0]; - } - - ArrayList locations = new ArrayList( 20 ); - - // Impl note: takes advantage of the fact that an escaped single quote - // embedded within a quote-block can really be handled as two separate - // quote-blocks for the purposes of this method... - int stringLength = string.length(); - boolean inQuote = false; - for ( int indx = 0; indx < stringLength; indx++ ) { - char c = string.charAt( indx ); - if ( inQuote ) { - if ( '\'' == c ) { - inQuote = false; - } - } - else if ( '\'' == c ) { - inQuote = true; - } - else if ( c == character ) { - locations.add( new Integer( indx ) ); - } - } - return toIntArray( locations ); + return org.hibernate.util.StringHelper.locateUnquoted( string, character ); } public static boolean isNotEmpty(String string) { - return string != null && string.length() > 0; + return org.hibernate.util.StringHelper.isNotEmpty( string ); } public static boolean isEmpty(String string) { - return string == null || string.length() == 0; + return org.hibernate.util.StringHelper.isEmpty( string ); } - public static String qualify(String prefix, String name) { - if ( name == null || prefix == null ) { - throw new NullPointerException(); - } - return new StringBuffer( prefix.length() + name.length() + 1 ) - .append(prefix) - .append('.') - .append(name) - .toString(); - } - - public static String[] qualify(String prefix, String[] names) { - if ( prefix == null ) return names; - int len = names.length; - String[] qualified = new String[len]; - for ( int i = 0; i < len; i++ ) { - qualified[i] = qualify( prefix, names[i] ); - } - return qualified; - } - public static int firstIndexOfChar(String sqlString, String string, int startindex) { - int matchAt = -1; - for ( int i = 0; i < string.length(); i++ ) { - int curMatch = sqlString.indexOf( string.charAt( i ), startindex ); - if ( curMatch >= 0 ) { - if ( matchAt == -1 ) { // first time we find match! - matchAt = curMatch; - } - else { - matchAt = Math.min( matchAt, curMatch ); - } - } - } - return matchAt; + return org.hibernate.util.StringHelper.firstIndexOfChar( sqlString, string, startindex ); } public static String truncate(String string, int length) { - if ( string.length() <= length ) { - return string; - } - else { - return string.substring( 0, length ); - } + return org.hibernate.util.StringHelper.truncate( string, length ); } public static String generateAlias(String description) { - return generateAliasRoot(description) + '_'; + return org.hibernate.util.StringHelper.generateAlias( description ); } - /** - * Generate a nice alias for the given class name or collection role - * name and unique integer. Subclasses of Loader do <em>not</em> have - * to use aliases of this form. - * @return an alias of the form <tt>foo1_</tt> - */ public static String generateAlias(String description, int unique) { - return generateAliasRoot(description) + - Integer.toString(unique) + - '_'; + return org.hibernate.util.StringHelper.generateAlias( description, unique ); } - /** - * Generates a root alias by truncating the "root name" defined by - * the incoming description and removing/modifying any non-valid - * alias characters. - * - * @param description The root name from which to generate a root alias. - * @return The generated root alias. - */ - private static String generateAliasRoot(String description) { - String result = truncate( unqualifyEntityName(description), ALIAS_TRUNCATE_LENGTH ) - .toLowerCase() - .replace( '/', '_' ) // entityNames may now include slashes for the representations - .replace( '$', '_' ); //classname may be an inner class - result = cleanAlias( result ); - if ( Character.isDigit( result.charAt(result.length()-1) ) ) { - return result + "x"; //ick! - } - else { - return result; - } - } - - /** - * Clean the generated alias by removing any non-alpha characters from the - * beginning. - * - * @param alias The generated alias to be cleaned. - * @return The cleaned alias, stripped of any leading non-alpha characters. - */ - private static String cleanAlias(String alias) { - char[] chars = alias.toCharArray(); - // short cut check... - if ( !Character.isLetter( chars[0] ) ) { - for ( int i = 1; i < chars.length; i++ ) { - // as soon as we encounter our first letter, return the substring - // from that position - if ( Character.isLetter( chars[i] ) ) { - return alias.substring( i ); - } - } - } - return alias; - } - public static String unqualifyEntityName(String entityName) { - String result = unqualify(entityName); - int slashPos = result.indexOf( '/' ); - if ( slashPos > 0 ) { - result = result.substring( 0, slashPos - 1 ); - } - return result; + return org.hibernate.util.StringHelper.unqualifyEntityName( entityName ); } public static String toUpperCase(String str) { - return str==null ? null : str.toUpperCase(); + return org.hibernate.util.StringHelper.toUpperCase( str ); } public static String toLowerCase(String str) { - return str==null ? null : str.toLowerCase(); + return org.hibernate.util.StringHelper.toLowerCase( str ); } public static String moveAndToBeginning(String filter) { - if ( filter.trim().length()>0 ){ - filter += " and "; - if ( filter.startsWith(" and ") ) filter = filter.substring(4); - } - return filter; + return org.hibernate.util.StringHelper.moveAndToBeginning( filter ); } - //TODO Copy from ArrayHelper in Hibernate Core + /** + * Not a direct copy from {@link org.hibernate.util.StringHelper}, this is instead directly copied + * from {@link org.hibernate.util.ArrayHelper}. + * + * @param coll the collection + * @return The int array + * @deprecated Use {@link org.hibernate.util.ArrayHelper#toIntArray} instead. + */ public static int[] toIntArray(Collection coll) { - Iterator iter = coll.iterator(); - int[] arr = new int[ coll.size() ]; - int i=0; - while( iter.hasNext() ) { - arr[i++] = ( (Integer) iter.next() ).intValue(); - } - return arr; + return org.hibernate.util.ArrayHelper.toIntArray( coll ); } public static boolean isQuoted(String name) { - return name != null && name.length() != 0 && name.charAt( 0 ) == '`'; + return org.hibernate.util.StringHelper.isQuoted( name ); } public static String quote(String name) { - if ( name == null || name.length() == 0 || isQuoted( name ) ) { - return name; - } - else { - return new StringBuilder( name.length() + 2 ).append('`').append( name ).append( '`' ).toString(); - } + return org.hibernate.util.StringHelper.quote( name ); } public static String unquote(String name) { - if ( isQuoted( name ) ) { - return name.substring( 1, name.length() - 1 ); - } - else { - return name; - } + return org.hibernate.util.StringHelper.unquote( name ); } } \ No newline at end of file Modified: core/trunk/core/src/main/java/org/hibernate/util/StringHelper.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/util/StringHelper.java 2008-10-28 18:41:10 UTC (rev 15415) +++ core/trunk/core/src/main/java/org/hibernate/util/StringHelper.java 2008-10-28 18:43:14 UTC (rev 15416) @@ -412,5 +412,45 @@ } return filter; } - + + /** + * Determine if the given string is quoted (wrapped by '`' characters at beginning and end). + * + * @param name The name to check. + * @return True if the given string starts and ends with '`'; false otherwise. + */ + public static boolean isQuoted(String name) { + return name != null && name.length() != 0 && name.charAt( 0 ) == '`' && name.charAt( name.length() - 1 ) == '`'; + } + + /** + * Return a representation of the given name ensuring quoting (wrapped with '`' characters). If already wrapped + * return name. + * + * @param name The name to quote. + * @return The quoted version. + */ + public static String quote(String name) { + if ( name == null || name.length() == 0 || isQuoted( name ) ) { + return name; + } + else { + return new StringBuilder( name.length() + 2 ).append('`').append( name ).append( '`' ).toString(); + } + } + + /** + * Return the unquoted version of name (stripping the start and end '`' chanracters if present). + * + * @param name The name to be unquoted. + * @return The unquoted version. + */ + public static String unquote(String name) { + if ( isQuoted( name ) ) { + return name.substring( 1, name.length() - 1 ); + } + else { + return name; + } + } }

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15415 - core/trunk and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-28 14:41:10 -0400 (Tue, 28 Oct 2008) New Revision: 15415 Added: core/trunk/annotations/ Removed: annotations/trunk/ Log: HHH-3550 : import annotations into core Copied: core/trunk/annotations (from rev 15414, annotations/trunk)

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15414 - in core/trunk: commons-annotations and 7 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-28 13:17:35 -0400 (Tue, 28 Oct 2008) New Revision: 15414 Added: core/trunk/commons-annotations/src/main/ core/trunk/commons-annotations/src/main/java/ core/trunk/commons-annotations/src/main/javadoc/ core/trunk/commons-annotations/src/main/javadoc/jdstyle.css core/trunk/commons-annotations/src/main/javadoc/package.html core/trunk/commons-annotations/src/test/java/ core/trunk/commons-annotations/src/test/java/org/ Removed: core/trunk/commons-annotations/build.properties.dist core/trunk/commons-annotations/build.xml core/trunk/commons-annotations/common-build.xml core/trunk/commons-annotations/doc/ core/trunk/commons-annotations/ivy.xml core/trunk/commons-annotations/ivy/ core/trunk/commons-annotations/lgpl.txt core/trunk/commons-annotations/lib/ core/trunk/commons-annotations/src/java/ core/trunk/commons-annotations/src/test/org/ Modified: core/trunk/commons-annotations/pom.xml core/trunk/jmx/pom.xml core/trunk/parent/pom.xml core/trunk/pom.xml Log: HHH-3549 : import commons-annotations into core Deleted: core/trunk/commons-annotations/build.properties.dist =================================================================== --- core/trunk/commons-annotations/build.properties.dist 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/commons-annotations/build.properties.dist 2008-10-28 17:17:35 UTC (rev 15414) @@ -1,3 +0,0 @@ -common.dir=. -src.dir=src -test.dir=test Deleted: core/trunk/commons-annotations/build.xml =================================================================== --- core/trunk/commons-annotations/build.xml 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/commons-annotations/build.xml 2008-10-28 17:17:35 UTC (rev 15414) @@ -1,190 +0,0 @@ -<project name="Hibernate Commons Annotations" default="dist" basedir="." - xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> - -  - <property file="build.properties"/> - <property file="${user.home}/.ant.properties"/> - -  - <property name="Name" value="Hibernate Commons Annotations"/> - <property name="name" value="hibernate-commons-annotations"/> - <property name="version" value="3.1.0.GA"/> - <property name="javadoc.packagenames" value="org.hibernate.commons.annotations.*"/> - <property name="copy.test" value="true"/> - <property name="javac.source" value="1.5"/> - <property name="javac.target" value="1.5"/> - <property name="common.dir" value="${basedir}"/> - <property name="hibernate-core.jar.available" value="true"/> -  - <property name="ivy.dep.dir" value="${basedir}/build/lib" /> - - <import file="${common.dir}/common-build.xml"/> - - <path id="lib.moduleclass.path"> - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> - </path> - - <path id="junit.moduleclasspath"> - <pathelement location="${src.dir}"/> - <pathelement location="${test.dir}"/> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> - </path> - - <target name="init" description="Initialize the build"> - <antcall target="common-build.init"/> - <tstamp> - <format property="now" pattern="yyyyMMddhhmmss"/> - </tstamp> - <echo message="Build ${Name}-${version} (${subversion})"/> - <mkdir dir="${classes.dir}"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - - <copy todir="${build.dir}"> - <fileset dir="."> - <include name="readme.txt"/> - <include name="lgpl.txt"/> - </fileset> - </copy> - <mkdir dir="${ivy.dep.dir}/core"/> - <mkdir dir="${ivy.dep.dir}/test"/> - <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" /> - </target> - - <target name="compile" depends="init,get.deps.core" - description="Compile the Java source code"> - <available classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac target="${javac.target}" source="${javac.source}" - srcdir="${src.dir}" destdir="${classes.dir}" - classpathref="lib.class.path" debug="${javac.debug}" - optimize="${javac.optimize}" nowarn="on"> - </javac> - </target> - - <target name="compiletest" depends="compile,get.deps.test" description="Compile the tests"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac - target="${javac.target}" - source="${javac.source}" - destdir="${testclasses.dir}" - classpathref="junit.classpath" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on"> - <src refid="testsrc.path"/> - </javac> - </target> - - <target name="jar" depends="compile" description="Build the distribution .jar file"> - <mkdir dir="${classes.dir}/META-INF"/> - <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> - <attribute name="Implementation-Title" value="${Name}"/> - <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Implementation-Vendor" value="hibernate.org"/> - <attribute name="Implementation-Vendor-Id" value="hibernate.org"/> - <attribute name="Implementation-URL" value="http://annotations.hibernate.org"/> - </manifest> - <antcall target="common-build.jar"/> - <delete file="${dist.dir}/ivy.xml"/>  - <ivy:resolve conf="default"/> - <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" - resolver="local" - pubrevision="latest" - pubdate="${now}" - status="integration" - /> - </target> - - <target name="junit" depends="compiletest"> - <mkdir dir="${testreports.dir}"/> - <junit printsummary="yes" haltonfailure="yes" forkmode="once"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="${testreports.dir}" haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </target> - -  - <target name="junitsingle" depends="compiletest" description="Run a single test suite (requires testname and jdbc.driver properties)"> - <mkdir dir="${testreports.dir}"/> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <test fork="yes" todir="${testreports.dir}" haltonfailure="no" name="${testname}"/> - </junit> - </target> - -  - <target name="dist" depends="jar,get.deps.core,get.deps.test,javadoc,copysource,copytest,copylib,extras" description="Build everything"> - - <copy todir="${dist.dir}" failonerror="false"> - <fileset dir="${common.dir}"> - <include name="common-build.xml"/> - </fileset> - </copy> - <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> - </copy> - -  - <copy todir="${dist.lib.dir}" failonerror="false"> -  - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> - </copy> - <mkdir dir="${dist.lib.dir}/test"/> - <copy todir="${dist.lib.dir}/test" failonerror="false"> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> - </copy> - - <mkdir dir="${dist.lib.dir}/build"/> - <copy todir="${dist.lib.dir}/build" failonerror="false"> - <fileset file="${lib.dir}/build/*.jar"/> - </copy> - - <copy todir="${dist.dir}/ivy" failonerror="false"> - <fileset dir="${ivy.jar.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - - <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> - </copy> - - <antcall target="common-build.dist"/> - </target> - - <target name="zip-dist" description="zip the dist"> - <zip zipfile="${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> - </target> - - -</project> Deleted: core/trunk/commons-annotations/common-build.xml =================================================================== --- core/trunk/commons-annotations/common-build.xml 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/commons-annotations/common-build.xml 2008-10-28 17:17:35 UTC (rev 15414) @@ -1,456 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="common-build" default="dist" - xmlns:artifact="urn:maven-artifact-ant" xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> - <description>Common properties and targets for the HibernateExt - project</description> - - -  - <dirname property="common-build.basedir" file="${ant.file.common-build}"/> - -  - <property file="${common-build.basedir}/build.properties"/> - <property file="${user.home}/.ant.properties"/> - - <property name="src.dir" location="src/java"/> - <property name="test.dir" location="src/test"/> - <property name="test.resources.dir" location="src/test-resources"/> - <property name="filter.dir" location="src/filters"/> - <property name="lib.dir" location="lib"/> - <property name="build.dir" location="build"/> - <property name="classes.dir" location="${build.dir}/classes"/> - <property name="testclasses.dir" location="${build.dir}/testclasses"/> - <property name="testreports.dir" location="${build.dir}/test-reports"/> - <property name="dist.target.dir" location="target"/> - <property name="dist.dir" location="${dist.target.dir}/${name}"/> - <property name="instrumenttest.out.dir" value="${build.dir}/test-reports/instrument"/> - <property name="doc.dir" location="doc"/> - <property name="doc.api.dir" location="${doc.dir}/api"/> - <property name="doc.reference.dir" location="${doc.dir}/reference"/> - - <property name="dist.doc.dir" location="${dist.dir}/doc"/> - <property name="dist.api.dir" location="${dist.dir}/doc/api"/> - - <property name="dist.src.dir" location="${dist.dir}/src"/> - <property name="dist.test.dir" location="${dist.dir}/test"/> - <property name="dist.lib.dir" location="${dist.dir}/lib"/> - <property name="jar.name" value="${name}"/> - <property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/> - <property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/> - - <property name="javadoc" value="http://java.sun.com/j2se/1.4/docs/api"/> - <property name="javac.debug" value="on"/> - <property name="javac.optimize" value="off"/> - <property name="javac.source" value="1.4"/> - <property name="javac.target" value="1.4"/> - - <property name="pom.file" value="${build.dir}/pom.xml"/> - <property name="src.jar" value="${build.dir}/src.jar"/> - - <taskdef name="junit" - classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> -  - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <taskdef name="junitreport" - classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> -  - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> -  - <include name="ant-contrib-*.jar"/> - </fileset> - </classpath> - </taskdef> - -  - <property name="ivy.jar.dir" value="${common-build.basedir}/ivy"/> - <property name="ivy.conf.dir" value="${common-build.basedir}"/> - <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> - </path> - <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" - uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> - -  - <path id="maven-ant-tasks.path" path="${ivy.jar.dir}/maven-ant-tasks.jar"/> - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" - uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.path"/> - - <artifact:remoteRepository id="offline.repository.jboss.org" - url="file://${offline.repository.jboss.org}"/> - - <path id="lib.class.path"> - <path refid="lib.moduleclass.path"/> - <pathelement path="${clover.jar}"/> - </path> - -  - <path id="lib.moduleclass.path"/> - - <patternset id="support.files"> - <include name="**/*.jpg"/> - <include name="**/*.gif"/> - <include name="**/*.dtd"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - <include name="**/*.xslt"/> - -  - <exclude name="${build.dir}/**/*"/> - <exclude name="${doc.dir}/**/*"/> - <exclude name="classes/**/*"/> - <exclude name="build.xml"/> - <exclude name="**/*.properties"/> - <exclude name="**/*.ccf"/> - <exclude name="**/*.cfg.xml"/> - <exclude name="**/ehcache.xml"/> - </patternset> - - <patternset id="source.files"> - <include name="**/*.java"/> - <include name="**/*.properties"/> - </patternset> - -  - <fileset dir="${testclasses.dir}" id="junit.batchtestset"> - <include name="**/*Test.class"/> - </fileset> - - <path id="testsrc.path"> - <pathelement location="${test.dir}"/> - </path> - - <path id="junit.classpath"> - <pathelement path="${classes.dir}"/> - <pathelement path="${testclasses.dir}"/> - <path refid="lib.class.path"/> - <path refid="junit.moduleclasspath"/> - <path location="${clover.jar}"/> - </path> - -  - <if> - <equals arg1="${targetdb}" arg2="$${targetdb}"/> - <then> - <echo message="No target database specified using default HSQLDB"/> - <property name="targetdb" value="hsqldb"/> - </then> - </if> - -  - <target name="with.clover"> - <clover-setup initString="clover_coverage.db"/> - </target> - - <target name="cloverreport.html" depends="with.clover" - description="Generate a clover report from the current clover database."> - <clover-report> - <current outfile="${clover.out.dir}"> - <format type="html"/> - </current> - </clover-report> - </target> - - <target name="cloverreport" - depends="with.clover,junitreport,cloverreport.html" - description="Run the tests and generate a clover report"> - </target> - -  - <target name="clean" description="Cleans up build and dist directories"> - <delete dir="${build.dir}"/> - <delete dir="${dist.target.dir}"/> - <delete dir="${clover.out.dir}"/> - </target> - - <target name="init" description="Initialize the build"> - <tstamp> - <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> - </tstamp> - <tstamp> - <format property="releasedate" pattern="dd-MM-yyyy"/> - </tstamp> - <echo message="Build ${Name}-${version} (${subversion})"/> - <mkdir dir="${classes.dir}"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - <filter token="version" value="${version}"/> - <filter token="releasedate" value="${releasedate}"/> - <echo>filtering</echo> - <copy todir="${build.dir}" filtering="true"> - <fileset dir="."> - <include name="readme.txt"/> - <include name="lgpl.txt"/> - <include name="pom.xml"/> - </fileset> - </copy> - </target> - - <target name="get.deps.core" depends="init" - description="retrieve the core dependencies"> - <ivy:resolve conf="default"/> - <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" - conf="default"/> - </target> - - <target name="get.deps.test" depends="init" - description="retrieve the test dependencies"> - <ivy:resolve conf="test"/> - <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test"/> - </target> - - <target name="copytest" description="Copy tests to dist dir" if="copy.test"> - <mkdir dir="${dist.test.dir}"/> - <copy todir="${dist.test.dir}"> - <fileset dir="${test.dir}"/> - </copy> - </target> - - <target name="copysource" depends="copytest" - description="Copy sources to dist dir"> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - </target> - - <target name="copylib" description="Copy jars to lib dir"> - <mkdir dir="${dist.lib.dir}"/> - <copy todir="${dist.lib.dir}" verbose="true"> - <fileset dir="${lib.dir}"> - <include name="**/*.jar"/> - <exclude name="log4j.jar"/> - <exclude name="checkstyle*.jar"/> - <include name="*.txt"/> - </fileset> - </copy> - </target> - - <target name="copydoc" description="Copy doc to dist dir" if="copy.doc"> - <mkdir dir="${dist.doc.dir}"/> - <copy todir="${dist.doc.dir}"> - <fileset dir="${doc.dir}"> - <include name="**/*.html"/> - </fileset> - </copy> - </target> - - <target name="jar" depends="compile" - description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jar.file.name}" - basedir="${classes.dir}"/> - </target> - - <target name="jartest" depends="compiletest" - description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jartest.file.name}" - basedir="${testclasses.dir}"/> - </target> - -  - - <target name="javadoc" - description="Compile the Javadoc API documentation to dist dir"> - <mkdir dir="${dist.api.dir}"/> - <javadoc packagenames="${javadoc.packagenames}" - classpathref="lib.class.path" destdir="${dist.api.dir}" use="true" - protected="true" version="true" - windowtitle="${Name} API Documentation" - Overview="${doc.api.dir}/package.html" - doctitle="${Name} API Documentation" - stylesheetfile="${doc.api.dir}/jdstyle.css" link="${javadoc}"> - <packageset dir="${src.dir}" defaultexcludes="yes"> - <include name="**/*"/> - </packageset> - </javadoc> - </target> - - <target name="extras" description="Copies miscellaneous files to root dir"> - <copy todir="${dist.dir}/bin" failonerror="false"> - <fileset dir="bin"> - <include name="*.bat"/> - </fileset> - </copy> - <copy file="${build.dir}/readme.txt" todir="${dist.dir}"/> - <copy file="lgpl.txt" todir="${dist.dir}"/> - <copy file="changelog.txt" todir="${dist.dir}"/> - <copy file="build.xml" todir="${dist.dir}"/> - <replace file="${dist.dir}/build.xml"> - <replacetoken><![CDATA[../${name}-${version}]]> - </replacetoken> - <replacevalue><![CDATA[../${name}]]> - </replacevalue> - </replace> - </target> - - <target name="dist" depends="jar,javadoc,copysource,copydoc,extras" - description="Build everything"> - <zip zipfile="${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> - </target> - - <target name="info" description="Echoes useful system properties"> - <echo message="java.vm.info=${java.vm.info}"/> - <echo message="java.vm.name=${java.vm.name}"/> - <echo message="java.vm.vendor=${java.vm.vendor}"/> - <echo message="java.vm.version=${java.vm.version}"/> - <echo message="os.arch=${os.arch}"/> - <echo message="os.name=${os.name}"/> - <echo message="os.version=${os.version}"/> - <echo message="java.home = ${java.home}"/> - <echo message="java.class.path = ${java.class.path}"/> - <echo message="build.compiler = ${build.compiler}"/> - <echo message="file.encoding=${file.encoding}"/> - <echo message="user.home = ${user.home}"/> - <echo message="user.language=${user.language}"/> - </target> - - <target name="test-resources" description="Copies and filters test resources"> - <filter filtersfile="${filter.dir}/${db}.filter"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${testclasses.dir}" filtering="true" overwrite="true"> - <fileset dir="${test.resources.dir}"> - <include name="*.properties"/> - <include name="*.xml"/> - </fileset> - </copy> - </target> - - <target name="instrument" depends="compiletest" - description="Instrument the persistent classes">  - - <taskdef name="instrument" - classname="org.hibernate.tool.instrument.javassist.InstrumentTask"> - <classpath refid="junit.classpath"/> - </taskdef> - - <instrument verbose="true"> - <fileset dir="${testclasses.dir}/org/hibernate/test"> - <include name="**/*.class"/> - <exclude name="**/*Test$*.class"/> - <exclude name="**/*Test.class"/> - <exclude name="**/*Tests.class"/> - </fileset> - </instrument> - </target> - - <target name="junitinstrument" depends="compiletest,instrument" - description="Run the instrument test suite"> - <for list="${targetdb}" param="db"> - <sequential> - <antcall target="test-resources"> - <param name="db" value="@{db}"/> - </antcall> - <mkdir dir="${instrumenttest.out.dir}/@{db}"/> - <echo>Running against db: @{db}</echo> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" - maxmemory="256M" fork="yes" forkmode="perBatch"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest todir="${instrumenttest.out.dir}/@{db}" haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </sequential> - </for> - </target> - - <target name="junitreport" depends=""> - <junitreport todir="${testreports.dir}"> - <fileset dir="${testreports.dir}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${testreports.dir}"/> - </junitreport> - </target> - - <target name="checkstyle" description="Check coding style"> - <taskdef resource="checkstyletask.properties"> - <classpath> - <path refid="lib.class.path"/> - <fileset dir="${common-build.basedir}/lib"> - <include name="checkstyle*.jar"/> - </fileset> - </classpath> - </taskdef> - - <checkstyle config="${common-build.basedir}/checkstyle_checks.xml"> - <fileset dir="${src.dir}"> - <include name="**/*.java"/> - </fileset> - <formatter type="plain"/> - </checkstyle> - </target> - - <target name="patch" depends="checkstyle" description="Create a patch"> - <cvs command="-q diff -u -N" output="patch.txt"/> - </target> - -  - <target name="deploy" depends="jar"> - <fail unless="offline.repository.jboss.org" - message="offline.repository.jboss.org must be defined"/> - <jar jarfile="${src.jar}" basedir="${src.dir}"> - <include name="**/*.java"/> - <exclude name="**/test/*.java"/> -  - </jar> - - <artifact:pom id="maven.project" file="${pom.file}"/> - - <artifact:install file="${jar.file.name}"> - <pom refid="maven.project"/> - </artifact:install> - - <artifact:deploy file="${jar.file.name}"> - <pom refid="maven.project"/> - <remoteRepository refId="offline.repository.jboss.org"> - </remoteRepository> - <attach file="${src.jar}" classifier="sources"/> - <attach file="${jar.file.name}" classifier=""/> - </artifact:deploy> - </target> - -</project> \ No newline at end of file Deleted: core/trunk/commons-annotations/ivy.xml =================================================================== --- core/trunk/commons-annotations/ivy.xml 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/commons-annotations/ivy.xml 2008-10-28 17:17:35 UTC (rev 15414) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="1.3" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation= - "http://www.jayasoft.org/misc/ivy/ivy.xsd"> - <info organisation="org.hibernate" module="commons-annotations"/> - <configurations> - <conf name="default" description="Core module dependencies"/> - <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/> - </configurations> - <publications> - <artifact name="hibernate-commons-annotations" conf="default"/> - </publications> - <dependencies> -  - <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/> - -  - <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="test->default"/> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/> - <dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/> - <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/> - </dependencies> -</ivy-module> \ No newline at end of file Deleted: core/trunk/commons-annotations/lgpl.txt =================================================================== --- core/trunk/commons-annotations/lgpl.txt 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/commons-annotations/lgpl.txt 2008-10-28 17:17:35 UTC (rev 15414) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Modified: core/trunk/commons-annotations/pom.xml =================================================================== --- core/trunk/commons-annotations/pom.xml 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/commons-annotations/pom.xml 2008-10-28 17:17:35 UTC (rev 15414) @@ -1,28 +1,75 @@ <?xml version="1.0"?> + <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <packaging>jar</packaging> - <name>Hibernate Commons Annotations</name> - <version>@version@</version> - <licenses> - <license> - <name>GNU LESSER GENERAL PUBLIC LICENSE</name> - <url>http://www.gnu.org/licenses/lgpl.txt</url> - </license> - </licenses> - <description>Hibernate Commons Annotations is a utility project used by annotations based Hibernate sub-projects.</description> - <scm> - <url>scm:svn:http://anonsvn.jboss.org/repos/hibernate/commons-annotations</url> - </scm> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.4.2</version> + 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.4.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <packaging>jar</packaging> + + <name>Hibernate Commons Annotations</name> + <description>Common reflection code used in support of annotation processing</description> + + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> </dependency> - </dependencies> -</project> \ No newline at end of file + </dependencies> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + +</project> Copied: core/trunk/commons-annotations/src/main/java (from rev 15413, core/trunk/commons-annotations/src/java) Copied: core/trunk/commons-annotations/src/main/javadoc/jdstyle.css (from rev 15413, core/trunk/commons-annotations/doc/api/jdstyle.css) =================================================================== --- core/trunk/commons-annotations/src/main/javadoc/jdstyle.css (rev 0) +++ core/trunk/commons-annotations/src/main/javadoc/jdstyle.css 2008-10-28 17:17:35 UTC (rev 15414) @@ -0,0 +1,117 @@ +/* Javadoc style sheet */ + +/* Define colors, fonts and other style attributes here to override the defaults */ + +/* Page background color */ +body { font-family: Arial; + background-color: white; + font-size: 10pt; + } +td { font-family: Arial; + font-size: 10pt; + } +/* Table colors */ +.TableHeadingColor { background: #F4F4F4 } +.TableSubHeadingColor { background: #F4F4F4 } +.TableRowColor { background: #FFFFFF } + +/* Font used in left-hand frame lists */ +.FrameTitleFont { font-size: normal; font-family: Arial } +.FrameHeadingFont { font-size: normal; font-family: Arial } +.FrameItemFont { font-size: normal; font-family: Arial } + +/* Example of smaller, sans-serif font in frames */ +/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ + +/* Navigation bar fonts and colors */ +.NavBarCell1 { background-color:#F4F4F4;} +.NavBarCell1Rev { background-color:silver;} + +.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} +.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} + +.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} +.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} + +A { + color: #003399; +} + +A:active { + color: #003399; +} + +A:visited { + color: #888888; +} + +P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { + color: #000000; +} + +TD, TH, SPAN { + color: #000000; +} + +BLOCKQUOTE { + margin-right: 0px; +} + + +/*H1, H2, H3, H4, H5, H6 { + color: #000000; + font-weight:500; + margin-top:10px; + padding-top:15px; +} + +H1 { font-size: 150%; } +H2 { font-size: 140%; } +H3 { font-size: 110%; font-weight: bold; } +H4 { font-size: 110%; font-weight: bold;} +H5 { font-size: 100%; font-style: italic; } +H6 { font-size: 100%; font-style: italic; }*/ + +TT { +font-size: 90%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +PRE { +font-size: 90%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #F4F4F4; +} + +UL, OL, LI { + list-style: disc; +} + +HR { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; + color: #CCCCCC; +} + +.variablelist { + padding-top: 10; + padding-bottom:10; + margin:0; +} + +.itemizedlist, UL { + padding-top: 0; + padding-bottom:0; + margin:0; +} + +.term { + font-weight:bold; +} Copied: core/trunk/commons-annotations/src/main/javadoc/package.html (from rev 15413, core/trunk/commons-annotations/doc/api/package.html) =================================================================== --- core/trunk/commons-annotations/src/main/javadoc/package.html (rev 0) +++ core/trunk/commons-annotations/src/main/javadoc/package.html 2008-10-28 17:17:35 UTC (rev 15414) @@ -0,0 +1 @@ +<body></body> Copied: core/trunk/commons-annotations/src/test/java/org (from rev 15413, core/trunk/commons-annotations/src/test/org) Modified: core/trunk/jmx/pom.xml =================================================================== --- core/trunk/jmx/pom.xml 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/jmx/pom.xml 2008-10-28 17:17:35 UTC (rev 15414) @@ -1,4 +1,30 @@ -<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"> +<?xml version="1.0"?> + +<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> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/parent/pom.xml 2008-10-28 17:17:35 UTC (rev 15414) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> - +<?xml version="1.0"?>  +<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"> -<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> <groupId>org.hibernate</groupId> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2008-10-28 16:02:28 UTC (rev 15413) +++ core/trunk/pom.xml 2008-10-28 17:17:35 UTC (rev 15414) @@ -24,9 +24,10 @@ ~ Boston, MA 02110-1301 USA ~ --> +<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"> -<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> @@ -53,6 +54,7 @@ <module>cache-swarmcache</module> <module>connection-c3p0</module> <module>connection-proxool</module> + <module>commons-annotations</module> <module>envers</module> <module>jmx</module> <module>testing</module>

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15413 - core/trunk and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-28 12:02:28 -0400 (Tue, 28 Oct 2008) New Revision: 15413 Added: core/trunk/commons-annotations/ Removed: commons-annotations/trunk/ Log: HHH-3549 : import commons-annotations into core Copied: core/trunk/commons-annotations (from rev 15412, commons-annotations/trunk)

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15412 - in validator/trunk/hibernate-validator/src: main/java/org/hibernate/validation/util and 3 other directories.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2008-10-28 11:39:45 -0400 (Tue, 28 Oct 2008) New Revision: 15412 Removed: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java Log: Some more refactorings towards implementing composite constraints Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java 2008-10-28 15:02:46 UTC (rev 15411) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java 2008-10-28 15:39:45 UTC (rev 15412) @@ -239,29 +239,30 @@ private <A extends Annotation> List<ConstraintDescriptorImpl> findConstraintAnnotations(A annotation) { List<ConstraintDescriptorImpl> constraintDescriptors = new ArrayList<ConstraintDescriptorImpl>(); - List<Annotation> constraintCandidates = new ArrayList<Annotation>(); - constraintCandidates.add( annotation ); + List<Annotation> constraints = new ArrayList<Annotation>(); + if ( ReflectionHelper.isConstraintAnnotation( annotation ) || + ReflectionHelper.isBuiltInConstraintAnnotation( annotation) ) { + constraints.add( annotation ); + } // check if we have a multi value constraint - Annotation[] annotations = getMultiValueConstraintsCandidates( annotation ); - constraintCandidates.addAll( Arrays.asList( annotations ) ); + constraints.addAll( ReflectionHelper.getMultiValueConstraints( annotation ) ); - for ( Annotation constraintCandiate : constraintCandidates ) { - - if ( ReflectionHelper.isBuiltInConstraintAnnotation( constraintCandiate ) ) { - Class constraintClass = ReflectionHelper.getBuiltInConstraint( constraintCandiate ); + for ( Annotation constraint : constraints ) { + if ( ReflectionHelper.isBuiltInConstraintAnnotation( constraint ) ) { + Class constraintClass = ReflectionHelper.getBuiltInConstraint( constraint ); final ConstraintDescriptorImpl constraintDescriptor = buildConstraintDescriptor( - constraintCandiate, constraintClass + constraint, constraintClass ); constraintDescriptors.add( constraintDescriptor ); continue; } - if ( ReflectionHelper.isConstraintAnnotation( constraintCandiate ) ) { - ConstraintValidator constraintValidator = constraintCandiate.annotationType() + if ( ReflectionHelper.isConstraintAnnotation( constraint ) ) { + ConstraintValidator constraintValidator = constraint.annotationType() .getAnnotation( ConstraintValidator.class ); final ConstraintDescriptorImpl constraintDescriptor = buildConstraintDescriptor( - constraintCandiate, constraintValidator.value() + constraint, constraintValidator.value() ); constraintDescriptors.add( constraintDescriptor ); } @@ -298,31 +299,6 @@ } /** - * Checks whether the given annotation has a value parameter which returns an array of annotations. - * - * @param annotation the annotation to check. - * - * @return The list of potential constraint annotations or the empty array. - * - * @todo Not only check that the return type of value is an array, but an array of annotaitons. Need to check syntax. - */ - private <A extends Annotation> Annotation[] getMultiValueConstraintsCandidates(A annotation) { - try { - Method m = annotation.getClass().getMethod( "value" ); - Class returnType = m.getReturnType(); - if ( returnType.isArray() ) { - return ( Annotation[] ) m.invoke( annotation ); - } - else { - return new Annotation[0]; - } - } - catch ( Exception e ) { - return new Annotation[0]; - } - } - - /** * Finds all constraint annotations defined for the given class and returns them in a list of * constraint descriptors. * Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java 2008-10-28 15:02:46 UTC (rev 15411) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java 2008-10-28 15:39:45 UTC (rev 15412) @@ -34,10 +34,13 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.ArrayList; import javax.validation.ConstraintValidator; import javax.validation.ValidationException; import javax.validation.constraints.NotNull; +import org.slf4j.Logger; + import org.hibernate.validation.constraints.NotNullConstraint; /** @@ -47,6 +50,8 @@ */ public class ReflectionHelper { + private static final Logger log = LoggerFactory.make(); + /** * Private constructor in order to avoid instantiation. */ @@ -67,6 +72,13 @@ } } + /** + * Checks whether the given annotation is a builtin constraint annotation defined as defined by the specs. + * + * @param annotation the annotation to check + * + * @return <code>true</code> if the annotation is a builtin constraint, <code>false</code> otherwise. + */ public static boolean isBuiltInConstraintAnnotation(Annotation annotation) { boolean isBuiltInConstraintAnnotation = false; @@ -77,33 +89,80 @@ return isBuiltInConstraintAnnotation; } + /** + * Checks whehter the specified annotation is a valid constraint annotation. A constraint annotations has to + * fulfill the following conditions: + * <ul> + * <li>Has to contain a <code>ConstraintValidator</code> implementation.</li> + * <li>Defines a message parameter.</li> + * <li>Defines a group parameter.</li> + * </ul> + * + * @param annotation The annotation to test. + * + * @return <code>true</code> if the annotation fulfills the above condtions, <code>false</code> otherwise. + */ public static boolean isConstraintAnnotation(Annotation annotation) { - boolean isConstraintAnnotation = true; ConstraintValidator constraintValidator = annotation.annotationType() .getAnnotation( ConstraintValidator.class ); if ( constraintValidator == null ) { - isConstraintAnnotation = false; - return isConstraintAnnotation; + return false; } try { getAnnotationParameter( annotation, "message", String.class ); - } catch ( Exception e ) { - throw new ValidationException( "Constraint annotation has to define message element." ); } + catch ( Exception e ) { + String msg = annotation.annotationType().getName() + " contains ConstraintValidator annotation, but does " + + "not contain a message parameter. Annotation is getting ignored."; + log.warn( msg ); + return false; + } try { getAnnotationParameter( annotation, "groups", String[].class ); } catch ( Exception e ) { - throw new ValidationException( "Constraint annotation has to define groups element." ); + String msg = annotation.annotationType().getName() + " contains ConstraintValidator annotation, but does " + + "not contain a groups parameter. Annotation is getting ignored."; + log.warn( msg ); + return false; } - return isConstraintAnnotation; + return true; } + /** + * Checks whether a given annotation is a multi value constraint and returns the contained constraints if so. + * + * @param annotation the annotation to check. + * + * @return A list of constraint annotations or the empty list if <code>annotation</code> is not a multi constraint + * annotation. + * + */ + public static <A extends Annotation> List<Annotation> getMultiValueConstraints(A annotation) { + List<Annotation> annotationList = new ArrayList<Annotation>(); + try { + Method m = annotation.getClass().getMethod( "value" ); + Class returnType = m.getReturnType(); + if ( returnType.isArray() && returnType.getComponentType().isAnnotation() ) { + Annotation[] annotations = ( Annotation[] ) m.invoke( annotation ); + for (Annotation a : annotations) { + if( isConstraintAnnotation( a ) || isBuiltInConstraintAnnotation( a )) { + annotationList.add( a ); + } + } + } + } + catch ( Exception e ) { + // ignore + } + return annotationList; + } + @SuppressWarnings("unchecked") public static <T> T getAnnotationParameter(Annotation annotation, String parameterName, Class<T> type) { try { Deleted: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java 2008-10-28 15:02:46 UTC (rev 15411) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java 2008-10-28 15:39:45 UTC (rev 15412) @@ -1,51 +0,0 @@ -// $Id$ -/* -* 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.validation.eg; - -import org.hibernate.validation.eg.constraint.NoGroups; - -/** - * @author Hardy Ferentschik - */ -public class Female implements Person { - - // @NoGroups is an invalid annotation (missing group paramter) - @NoGroups - private String firstName; - private String lastName; - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public String getMiddleName() { - return null; - } -} \ No newline at end of file Deleted: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java 2008-10-28 15:02:46 UTC (rev 15411) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java 2008-10-28 15:39:45 UTC (rev 15412) @@ -1,50 +0,0 @@ -// $Id$ -/* -* 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.validation.eg; - -import org.hibernate.validation.eg.constraint.NoMessage; - -/** - * @author Hardy Ferentschik - */ -public class Male implements Person { - // @NoMessage is an invalid annotation (no message paramter) - @NoMessage - private String firstName; - private String lastName; - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public String getMiddleName() { - return null; - } -} \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2008-10-28 15:02:46 UTC (rev 15411) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2008-10-28 15:39:45 UTC (rev 15412) @@ -38,8 +38,6 @@ import org.hibernate.validation.eg.Dictonary; import org.hibernate.validation.eg.Engine; import org.hibernate.validation.eg.EnglishDictonary; -import org.hibernate.validation.eg.Female; -import org.hibernate.validation.eg.Male; import org.hibernate.validation.eg.Order; import org.hibernate.validation.eg.Unconstraint; @@ -50,39 +48,8 @@ */ public class ValidatorImplTest { - /** - * JSR 303: Constraint definition properties - message (2.1.1.1) - */ - @Test - public void testConstraintWithNoMessage() { - try { - new ValidatorImpl<Male>( Male.class ); - fail(); - } - catch ( ValidationException e ) { - assertEquals( - "Wrong error message", "Constraint annotation has to define message element.", e.getMessage() - ); - } - } /** - * JSR 303: Constraint definition properties - groups (2.1.1.2) - */ - @Test - public void testConstraintWithNoGroups() { - try { - new ValidatorImpl<Female>( Female.class ); - fail(); - } - catch ( ValidationException e ) { - assertEquals( - "Wrong error message", "Constraint annotation has to define groups element.", e.getMessage() - ); - } - } - - /** * JSR 303: Requirements on classes to be validates (3.1) */ @Test @@ -101,12 +68,12 @@ } - @Test( expected = IllegalArgumentException.class) + @Test(expected = IllegalArgumentException.class) public void testNullParamterToValidatorImplConstructor() { - new ValidatorImpl<Unconstraint>( null); + new ValidatorImpl<Unconstraint>( null ); } - @Test + @Test public void testUnconstraintClass() { Validator<Unconstraint> validator = new ValidatorImpl<Unconstraint>( Unconstraint.class ); assertTrue( "There should be no constraints", !validator.hasConstraints() ); Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java 2008-10-28 15:02:46 UTC (rev 15411) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java 2008-10-28 15:39:45 UTC (rev 15412) @@ -18,7 +18,7 @@ package org.hibernate.validation.util; import java.lang.annotation.Annotation; -import java.lang.reflect.Array; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -27,11 +27,20 @@ import javax.validation.constraints.NotNull; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import org.junit.Test; +import org.hibernate.validation.constraints.Pattern; +import org.hibernate.validation.constraints.Patterns; +import org.hibernate.validation.eg.Engine; +import org.hibernate.validation.eg.Order; +import org.hibernate.validation.eg.constraint.NoGroups; +import org.hibernate.validation.eg.constraint.NoMessage; + /** * Tests for the <code>ReflectionHelper</code>. * @@ -112,7 +121,76 @@ fail(); } catch ( ValidationException e ) { - assertTrue( "Wrong exception message", e.getMessage().startsWith( "The specified annotation defines no parameter" ) ); + assertTrue( + "Wrong exception message", + e.getMessage().startsWith( "The specified annotation defines no parameter" ) + ); } } + + /** + * JSR 303: Constraint definition properties - message (2.1.1.1) + */ + @Test + public void testConstraintWithNoMessage() { + Annotation annotation = new NoGroups() { + public String message() { + return ""; + } + + public Class<? extends Annotation> annotationType() { + return this.getClass(); + } + }; + assertFalse( + "The constraint annotation should not be valid", ReflectionHelper.isConstraintAnnotation( annotation ) + ); + } + + /** + * JSR 303: Constraint definition properties - groups (2.1.1.2) + */ + @Test + public void testConstraintWithNoGroups() { + Annotation annotation = new NoMessage() { + public String[] groups() { + return null; + } + + public Class<? extends Annotation> annotationType() { + return this.getClass(); + } + }; + assertFalse( + "The constraint annotation should not be valid", ReflectionHelper.isConstraintAnnotation( annotation ) + ); + } + + @Test + public void testGetMultiValueConstraints() throws Exception { + Engine engine = new Engine(); + Field[] fields = engine.getClass().getDeclaredFields(); + assertNotNull( fields ); + assertTrue( fields.length == 1 ); + ReflectionHelper.setAccessibility( fields[0] ); + + Annotation annotation = fields[0].getAnnotation( Patterns.class ); + assertNotNull( annotation ); + List<Annotation> multiValueConstraintAnnotations = ReflectionHelper.getMultiValueConstraints( annotation ); + assertTrue( "There should be two constraint annotations", multiValueConstraintAnnotations.size() == 2 ); + assertTrue( "Wrong constraint annotation", multiValueConstraintAnnotations.get( 0 ) instanceof Pattern ); + assertTrue( "Wrong constraint annotation", multiValueConstraintAnnotations.get( 1 ) instanceof Pattern ); + + + Order order = new Order(); + fields = order.getClass().getDeclaredFields(); + assertNotNull( fields ); + assertTrue( fields.length == 1 ); + ReflectionHelper.setAccessibility( fields[0] ); + + annotation = fields[0].getAnnotation( NotNull.class ); + assertNotNull( annotation ); + multiValueConstraintAnnotations = ReflectionHelper.getMultiValueConstraints( annotation ); + assertTrue( "There should be two constraint annotations", multiValueConstraintAnnotations.size() == 0 ); + } }

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15411 - search/trunk/src/java/org/hibernate/search/engine.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-10-28 11:02:46 -0400 (Tue, 28 Oct 2008) New Revision: 15411 Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java Log: HSEARCH-293 wrong queue was deleted Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java =================================================================== --- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-28 08:26:17 UTC (rev 15410) +++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-28 15:02:46 UTC (rev 15411) @@ -571,7 +571,7 @@ } } for (LuceneWork luceneWork : toDelete) { - toDelete.remove( luceneWork ); + queue.remove( luceneWork ); } if ( duplicateDelete ) return;

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15410 - branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate.

by hibernate-commits＠lists.jboss.org

Author: anthonyHib Date: 2008-10-28 04:26:17 -0400 (Tue, 28 Oct 2008) New Revision: 15410 Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd Log: HBX-524 Reverse of one-to-one relationships Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd 2008-10-27 21:28:59 UTC (rev 15409) +++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd 2008-10-28 08:26:17 UTC (rev 15410) @@ -98,6 +98,7 @@ <!ATTLIST many-to-one property CDATA #IMPLIED> <!ATTLIST many-to-one exclude (true|false) #IMPLIED> + <!ELEMENT one-to-one EMPTY > <!ATTLIST one-to-one property CDATA #IMPLIED> <!ATTLIST one-to-one exclude (true|false) #IMPLIED>

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15409 - in core/trunk: core/src/main/java/org/hibernate/tuple/entity and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-27 17:28:59 -0400 (Mon, 27 Oct 2008) New Revision: 15409 Added: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java Modified: core/trunk/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java core/trunk/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java Log: HHH-3351 : dynamic map entity-persister and subclassing Modified: core/trunk/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java 2008-10-27 21:28:22 UTC (rev 15408) +++ core/trunk/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java 2008-10-27 21:28:59 UTC (rev 15409) @@ -3690,7 +3690,14 @@ else { final String concreteEntityName = getTuplizer( entityMode ) .determineConcreteSubclassEntityName( instance, factory ); - return factory.getEntityPersister( concreteEntityName ); + if ( concreteEntityName == null || getEntityName().equals( concreteEntityName ) ) { + // the contract of EntityTuplizer.determineConcreteSubclassEntityName says that returning null + // is an indication that the specified entity-name (this.getEntityName) should be used. + return this; + } + else { + return factory.getEntityPersister( concreteEntityName ); + } } } Modified: core/trunk/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java 2008-10-27 21:28:22 UTC (rev 15408) +++ core/trunk/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java 2008-10-27 21:28:59 UTC (rev 15409) @@ -20,7 +20,6 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate.tuple.entity; @@ -57,6 +56,9 @@ super(entityMetamodel, mappedEntity); } + /** + * {@inheritDoc} + */ public EntityMode getEntityMode() { return EntityMode.MAP; } @@ -70,18 +72,30 @@ } } + /** + * {@inheritDoc} + */ protected Getter buildPropertyGetter(Property mappedProperty, PersistentClass mappedEntity) { return buildPropertyAccessor(mappedProperty).getGetter( null, mappedProperty.getName() ); } + /** + * {@inheritDoc} + */ protected Setter buildPropertySetter(Property mappedProperty, PersistentClass mappedEntity) { return buildPropertyAccessor(mappedProperty).getSetter( null, mappedProperty.getName() ); } + /** + * {@inheritDoc} + */ protected Instantiator buildInstantiator(PersistentClass mappingInfo) { return new DynamicMapInstantiator( mappingInfo ); } + /** + * {@inheritDoc} + */ protected ProxyFactory buildProxyFactory(PersistentClass mappingInfo, Getter idGetter, Setter idSetter) { ProxyFactory pf = new MapProxyFactory(); @@ -103,24 +117,38 @@ return pf; } + /** + * {@inheritDoc} + */ public Class getMappedClass() { return Map.class; } + /** + * {@inheritDoc} + */ public Class getConcreteProxyClass() { return Map.class; } + /** + * {@inheritDoc} + */ public boolean isInstrumented() { return false; } + /** + * {@inheritDoc} + */ public EntityNameResolver[] getEntityNameResolvers() { return new EntityNameResolver[] { BasicEntityNameResolver.INSTANCE }; } + /** + * {@inheritDoc} + */ public String determineConcreteSubclassEntityName(Object entityInstance, SessionFactoryImplementor factory) { - // TODO : do we need an explicit isInstance check here, or is that asserted prior to here? return extractEmbeddedEntityName( ( Map ) entityInstance ); } @@ -131,6 +159,9 @@ public static class BasicEntityNameResolver implements EntityNameResolver { public static final BasicEntityNameResolver INSTANCE = new BasicEntityNameResolver(); + /** + * {@inheritDoc} + */ public String resolveEntityName(Object entity) { final String entityName = extractEmbeddedEntityName( ( Map ) entity ); if ( entityName == null ) { @@ -139,10 +170,16 @@ return entityName; } + /** + * {@inheritDoc} + */ public boolean equals(Object obj) { return getClass().equals( obj.getClass() ); } + /** + * {@inheritDoc} + */ public int hashCode() { return getClass().hashCode(); } Added: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml (rev 0) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml 2008-10-27 21:28:59 UTC (rev 15409) @@ -0,0 +1,42 @@ +<?xml version="1.0"?> + + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + + <class entity-name="Superclass" discriminator-value="A"> + <id name="id" type="integer"><generator class="native"/></id> + <discriminator column="DISC" type="string" /> + <property name="dataA" type="string"/> + + <subclass entity-name="Subclass" discriminator-value="B"> + <property name="dataB" type="string"/> + </subclass> + </class> + +</hibernate-mapping> \ No newline at end of file Added: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java (rev 0) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java 2008-10-27 21:28:59 UTC (rev 15409) @@ -0,0 +1,58 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.entitymode.map.subclass; + +import java.util.HashMap; + +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.Session; + +/** + * TODO : javadoc + * + * @author Steve Ebersole + */ +public class SubclassDynamicMapTest extends FunctionalTestCase { + public SubclassDynamicMapTest(String string) { + super( string ); + } + + public String[] getMappings() { + return new String[] { "entitymode/map/subclass/Mappings.hbm.xml" }; + } + + public void testConcreateSubclassDeterminationOnEmptyDynamicMap() { + Session s = openSession(); + s.beginTransaction(); + s.persist( "Superclass", new HashMap() ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.createQuery( "delete Superclass" ).executeUpdate(); + s.getTransaction().commit(); + s.close(); + } +}

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15408 - in core/branches/Branch_3_3: core/src/main/java/org/hibernate/tuple/entity and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-27 17:28:22 -0400 (Mon, 27 Oct 2008) New Revision: 15408 Added: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java core/branches/Branch_3_3/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java Log: HHH-3351 : dynamic map entity-persister and subclassing Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java 2008-10-27 19:58:10 UTC (rev 15407) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java 2008-10-27 21:28:22 UTC (rev 15408) @@ -3642,7 +3642,14 @@ else { final String concreteEntityName = getTuplizer( entityMode ) .determineConcreteSubclassEntityName( instance, factory ); - return factory.getEntityPersister( concreteEntityName ); + if ( concreteEntityName == null || getEntityName().equals( concreteEntityName ) ) { + // the contract of EntityTuplizer.determineConcreteSubclassEntityName says that returning null + // is an indication that the specified entity-name (this.getEntityName) should be used. + return this; + } + else { + return factory.getEntityPersister( concreteEntityName ); + } } } Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java =================================================================== --- core/branches/Branch_3_3/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java 2008-10-27 19:58:10 UTC (rev 15407) +++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java 2008-10-27 21:28:22 UTC (rev 15408) @@ -20,7 +20,6 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate.tuple.entity; @@ -57,6 +56,9 @@ super(entityMetamodel, mappedEntity); } + /** + * {@inheritDoc} + */ public EntityMode getEntityMode() { return EntityMode.MAP; } @@ -70,18 +72,30 @@ } } + /** + * {@inheritDoc} + */ protected Getter buildPropertyGetter(Property mappedProperty, PersistentClass mappedEntity) { return buildPropertyAccessor(mappedProperty).getGetter( null, mappedProperty.getName() ); } + /** + * {@inheritDoc} + */ protected Setter buildPropertySetter(Property mappedProperty, PersistentClass mappedEntity) { return buildPropertyAccessor(mappedProperty).getSetter( null, mappedProperty.getName() ); } + /** + * {@inheritDoc} + */ protected Instantiator buildInstantiator(PersistentClass mappingInfo) { return new DynamicMapInstantiator( mappingInfo ); } + /** + * {@inheritDoc} + */ protected ProxyFactory buildProxyFactory(PersistentClass mappingInfo, Getter idGetter, Setter idSetter) { ProxyFactory pf = new MapProxyFactory(); @@ -103,24 +117,38 @@ return pf; } + /** + * {@inheritDoc} + */ public Class getMappedClass() { return Map.class; } + /** + * {@inheritDoc} + */ public Class getConcreteProxyClass() { return Map.class; } + /** + * {@inheritDoc} + */ public boolean isInstrumented() { return false; } + /** + * {@inheritDoc} + */ public EntityNameResolver[] getEntityNameResolvers() { return new EntityNameResolver[] { BasicEntityNameResolver.INSTANCE }; } + /** + * {@inheritDoc} + */ public String determineConcreteSubclassEntityName(Object entityInstance, SessionFactoryImplementor factory) { - // TODO : do we need an explicit isInstance check here, or is that asserted prior to here? return extractEmbeddedEntityName( ( Map ) entityInstance ); } @@ -131,6 +159,9 @@ public static class BasicEntityNameResolver implements EntityNameResolver { public static final BasicEntityNameResolver INSTANCE = new BasicEntityNameResolver(); + /** + * {@inheritDoc} + */ public String resolveEntityName(Object entity) { final String entityName = extractEmbeddedEntityName( ( Map ) entity ); if ( entityName == null ) { @@ -139,10 +170,16 @@ return entityName; } + /** + * {@inheritDoc} + */ public boolean equals(Object obj) { return getClass().equals( obj.getClass() ); } + /** + * {@inheritDoc} + */ public int hashCode() { return getClass().hashCode(); } Added: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml =================================================================== --- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml (rev 0) +++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml 2008-10-27 21:28:22 UTC (rev 15408) @@ -0,0 +1,42 @@ +<?xml version="1.0"?> + + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + + <class entity-name="Superclass" discriminator-value="A"> + <id name="id" type="integer"><generator class="native"/></id> + <discriminator column="DISC" type="string" /> + <property name="dataA" type="string"/> + + <subclass entity-name="Subclass" discriminator-value="B"> + <property name="dataB" type="string"/> + </subclass> + </class> + +</hibernate-mapping> \ No newline at end of file Added: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java =================================================================== --- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java (rev 0) +++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java 2008-10-27 21:28:22 UTC (rev 15408) @@ -0,0 +1,58 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.entitymode.map.subclass; + +import java.util.HashMap; + +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.Session; + +/** + * TODO : javadoc + * + * @author Steve Ebersole + */ +public class SubclassDynamicMapTest extends FunctionalTestCase { + public SubclassDynamicMapTest(String string) { + super( string ); + } + + public String[] getMappings() { + return new String[] { "entitymode/map/subclass/Mappings.hbm.xml" }; + } + + public void testConcreateSubclassDeterminationOnEmptyDynamicMap() { + Session s = openSession(); + s.beginTransaction(); + s.persist( "Superclass", new HashMap() ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.createQuery( "delete Superclass" ).executeUpdate(); + s.getTransaction().commit(); + s.close(); + } +}

16 years, 2 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 October 2008