Hibernate SVN: r17640 - in beanvalidation/tck/trunk/src/main: resources and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-07 04:36:01 -0400 (Wed, 07 Oct 2009)
New Revision: 17640
Added:
beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java
beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SubClass.java
beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperClass.java
beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraint.java
beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraintValidator.java
Modified:
beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java
beanvalidation/tck/trunk/src/main/resources/tck-audit.xml
Log:
TCK updates adding spec assertions for new ElementDescriptor API
Copied: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java (from rev 17620, beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java)
===================================================================
--- beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java (rev 0)
+++ beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java 2009-10-07 08:36:01 UTC (rev 17640)
@@ -0,0 +1,172 @@
+// $Id$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.hibernate.jsr303.tck.tests.metadata;
+
+import java.lang.annotation.ElementType;
+import java.util.Set;
+import javax.validation.Validator;
+import javax.validation.groups.Default;
+import javax.validation.metadata.BeanDescriptor;
+import javax.validation.metadata.ConstraintDescriptor;
+import javax.validation.metadata.ElementDescriptor;
+import javax.validation.metadata.Scope;
+
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.testharness.AbstractTest;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ArtifactType;
+import org.jboss.testharness.impl.packaging.Classes;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.Test;
+
+import org.hibernate.jsr303.tck.util.TestUtil;
+import static org.hibernate.jsr303.tck.util.TestUtil.getPropertyDescriptor;
+import static org.hibernate.jsr303.tck.util.TestUtil.getValidatorUnderTest;
+
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Artifact(artifactType = ArtifactType.JSR303)
+@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
+public class ElementDescriptorTest extends AbstractTest {
+
+ @Test
+ @SpecAssertion(section = "5.2", id = "a")
+ public void testGetElementClass() {
+ Validator validator = getValidatorUnderTest();
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( SuperClass.class );
+ assertEquals( beanDescriptor.getElementClass(), SuperClass.class, "Wrong element class" );
+
+ ElementDescriptor elementDescriptor = beanDescriptor.getConstraintsForProperty( "myField" );
+ assertEquals( elementDescriptor.getElementClass(), String.class, "Wrong element class" );
+ }
+
+ @Test
+ @SpecAssertion(section = "5.2", id = "b")
+ public void testGetConstraintDescriptors() {
+ ElementDescriptor descriptor = getPropertyDescriptor( SubClass.class, "myField" );
+ assertEquals( descriptor.getConstraintDescriptors().size(), 2, "There should be two constraints on myField" );
+ }
+
+ @Test
+ @SpecAssertion(section = "5.2", id = "c")
+ public void testHasConstraints() {
+ ElementDescriptor descriptor = getPropertyDescriptor( SubClass.class, "myField" );
+ assertTrue( descriptor.hasConstraints() );
+ }
+
+ @Test
+ @SpecAssertion(section = "5.2", id = "d")
+ public void testUnorderedAndMatchingGroups() {
+ Validator validator = TestUtil.getValidatorUnderTest();
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( SubClass.class );
+ assertNotNull( beanDescriptor );
+
+ Set<ConstraintDescriptor<?>> descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .unorderedAndMatchingGroups( Default.class, SuperClass.BasicGroup.class )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 2 );
+
+ descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .unorderedAndMatchingGroups( SuperClass.UnusedGroup.class )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 0 );
+ }
+
+ @Test
+ @SpecAssertion(section = "5.2", id = "d")
+ public void testUnorderedAndMatchingGroupsWithInheritance() {
+ Validator validator = TestUtil.getValidatorUnderTest();
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( SubClass.class );
+ assertNotNull( beanDescriptor );
+
+ Set<ConstraintDescriptor<?>> descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .unorderedAndMatchingGroups( SuperClass.InheritedGroup.class )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 1 );
+ }
+
+ @Test
+ @SpecAssertion(section = "5.2", id = "d")
+ public void testUnorderedAndMatchingGroupsWithDefaultGroupOverriding() {
+ Validator validator = TestUtil.getValidatorUnderTest();
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( SubClass.class );
+ assertNotNull( beanDescriptor );
+
+ Set<ConstraintDescriptor<?>> descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .unorderedAndMatchingGroups( Default.class )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 1 );
+ }
+
+ @Test
+ @SpecAssertion(section = "5.2", id = "e")
+ public void testDeclaredOn() {
+ Validator validator = TestUtil.getValidatorUnderTest();
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( SubClass.class );
+ assertNotNull( beanDescriptor );
+
+ Set<ConstraintDescriptor<?>> descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .lookingAt( Scope.HIERARCHY )
+ .declaredOn( ElementType.TYPE )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 0 );
+
+ descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .lookingAt( Scope.HIERARCHY )
+ .declaredOn( ElementType.METHOD )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 0 );
+
+ descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .lookingAt( Scope.HIERARCHY )
+ .declaredOn( ElementType.FIELD )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 2 );
+ }
+
+ @Test
+ @SpecAssertion(section = "5.2", id = "f")
+ public void testLookingAt() {
+ Validator validator = TestUtil.getValidatorUnderTest();
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( SubClass.class );
+ assertNotNull( beanDescriptor );
+
+ Set<ConstraintDescriptor<?>> descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .lookingAt( Scope.HIERARCHY )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 2 );
+
+ descriptors = beanDescriptor.getConstraintsForProperty( "myField" )
+ .findConstraints()
+ .lookingAt( Scope.LOCAL_ELEMENT )
+ .getConstraintDescriptors();
+ assertTrue( descriptors.size() == 1 );
+ }
+}
\ No newline at end of file
Modified: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java
===================================================================
--- beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java 2009-10-07 08:34:52 UTC (rev 17639)
+++ beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java 2009-10-07 08:36:01 UTC (rev 17640)
@@ -19,11 +19,11 @@
import javax.validation.metadata.PropertyDescriptor;
+import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.testharness.AbstractTest;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ArtifactType;
import org.jboss.testharness.impl.packaging.Classes;
-import org.jboss.test.audit.annotations.SpecAssertion;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -37,8 +37,9 @@
* @author Hardy Ferentschik
*/
@Artifact(artifactType = ArtifactType.JSR303)
-(a)Classes({TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class})
+@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
public class PropertyDescriptorTest extends AbstractTest {
+
@Test
@SpecAssertion(section = "5.4", id = "a")
public void testIsNotCascaded() {
Copied: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SubClass.java (from rev 17620, beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/visibility/SubClass.java)
===================================================================
--- beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SubClass.java (rev 0)
+++ beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SubClass.java 2009-10-07 08:36:01 UTC (rev 17640)
@@ -0,0 +1,36 @@
+// $Id$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.hibernate.jsr303.tck.tests.metadata;
+
+import javax.validation.GroupSequence;
+import javax.validation.constraints.Max;
+
+
+/**
+ * @author Hardy Ferentschik
+ */
+@GroupSequence({ SubClass.class, SubClass.DefaultGroup.class })
+public class SubClass extends SuperClass {
+ @Max(value = 10, groups = SubClass.DefaultGroup.class)
+ private String myField = "1234567890";
+
+ public String yourField = "";
+
+ public interface DefaultGroup {
+ }
+}
Property changes on: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SubClass.java
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperClass.java (from rev 17620, beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/visibility/SuperClass.java)
===================================================================
--- beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperClass.java (rev 0)
+++ beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperClass.java 2009-10-07 08:36:01 UTC (rev 17640)
@@ -0,0 +1,43 @@
+// $Id$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.hibernate.jsr303.tck.tests.metadata;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * @author Hardy Ferentschik
+ */
+@SuperConstraint
+public class SuperClass {
+ @NotNull(groups = BasicGroup.class)
+ private String myField = "12345678901234567890";
+
+ public String getMyField() {
+ return myField;
+ }
+
+ interface UnusedGroup {
+ }
+
+ interface BasicGroup {
+ }
+
+ interface InheritedGroup extends BasicGroup {
+ }
+}
Property changes on: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperClass.java
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraint.java (from rev 17620, beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java)
===================================================================
--- beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraint.java (rev 0)
+++ beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraint.java 2009-10-07 08:36:01 UTC (rev 17640)
@@ -0,0 +1,45 @@
+// $Id$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.hibernate.jsr303.tck.tests.metadata;
+
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.OverridesAttribute;
+import javax.validation.Payload;
+import javax.validation.ReportAsSingleViolation;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Documented
+@Constraint(validatedBy = { })
+@Target({ TYPE })
+@Retention(RUNTIME)
+public @interface SuperConstraint {
+ public abstract String message() default "";
+
+ public abstract Class<?>[] groups() default { };
+
+ public abstract Class<? extends Payload>[] payload() default { };
+}
\ No newline at end of file
Added: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraintValidator.java
===================================================================
--- beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraintValidator.java (rev 0)
+++ beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraintValidator.java 2009-10-07 08:36:01 UTC (rev 17640)
@@ -0,0 +1,36 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat, Inc. and/or its affiliates, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.hibernate.jsr303.tck.tests.metadata;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class SuperConstraintValidator implements ConstraintValidator<SuperConstraint, SuperClass> {
+
+ public void initialize(SuperConstraint constraintAnnotation) {
+ }
+
+ public boolean isValid(SuperClass value, ConstraintValidatorContext constraintValidatorContext) {
+ return true;
+ }
+}
+
+
Modified: beanvalidation/tck/trunk/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/tck/trunk/src/main/resources/tck-audit.xml 2009-10-07 08:34:52 UTC (rev 17639)
+++ beanvalidation/tck/trunk/src/main/resources/tck-audit.xml 2009-10-07 08:36:01 UTC (rev 17640)
@@ -661,6 +661,12 @@
<text>For a class level constraint a Node object is added to Path whose name is null
</text>
</assertion>
+ <assertion id="n" testable="false">
+ <text>Bean Validation implementations should ensure that a ConstraintViolation
+ implementation is Serializable provided that the root bean, the leaf bean, the
+ invalid value and keys in the Path object are Serializable objects. </text>
+ </assertion>
+
</section>
<section id="4.3.1" title="Default message interpolation">
<assertion id="a">
@@ -945,6 +951,37 @@
parameter is null</text>
</assertion>
</section>
+ <section id="5.2" title="PropertyDescriptor">
+ <assertion id="a">
+ <text>getElementClass returns either the object type for a class, or the returned type
+ for a property</text>
+ </assertion>
+ <assertion id="b">
+ <text>getConstraintDescriptors returns all the ConstraintDescriptors hosted on the given
+ element in the class hierarchy, each ConstraintDescriptor describing one of the
+ constraints declared on the given element.</text>
+ </assertion>
+ <assertion id="c">
+ <text>hasConstraints returns true if the given element (class, field or property) in the
+ class hierarchy holds at least one constraint declaration.</text>
+ </assertion>
+ <assertion id="d">
+ <text>unorderedAndMatchingGroups restricts to the ConstraintDescriptors matching the set
+ of groups passed as parameters and present on the element. Order is not respected
+ but group inheritance and inheritance via sequence (including the Default group
+ overriding at the class level) are honored.</text>
+ </assertion>
+ <assertion id="e">
+ <text>declaredOn lets you restrict the list of element types constraints are hosted
+ on.</text>
+ </assertion>
+ <assertion id="f">
+ <text>lookingAt lets you restrict which constraints are considered. Either constraints
+ belonging to the element but hosted on the class represented by BeanDescritptor
+ (Scope.LOCAL_ELEMENT), or constraints belonging to the element but hosted anywhere
+ in the class hierarchy (Scope.HIERARCHY).</text>
+ </assertion>
+ </section>
<section id="5.3" title="BeanDescriptor">
<assertion id="a">
<text>isBeanConstrained returns true if the given class (and superclasses and
14 years, 7 months
Hibernate SVN: r17638 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-07 04:31:13 -0400 (Wed, 07 Oct 2009)
New Revision: 17638
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanDescriptorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ElementDescriptorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/PropertyDescriptorImpl.java
Log:
HV-249
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanDescriptorImpl.java 2009-10-06 20:42:51 UTC (rev 17637)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanDescriptorImpl.java 2009-10-07 08:31:13 UTC (rev 17638)
@@ -26,11 +26,9 @@
* @author Hardy Ferentschik
*/
public class BeanDescriptorImpl<T> extends ElementDescriptorImpl implements BeanDescriptor {
- private final BeanMetaData<T> metaDataBean;
public BeanDescriptorImpl(BeanMetaData<T> beanMetaData) {
- super( beanMetaData.getBeanClass() );
- this.metaDataBean = beanMetaData;
+ super( beanMetaData.getBeanClass(), beanMetaData );
}
public boolean isBeanConstrained() {
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java 2009-10-06 20:42:51 UTC (rev 17637)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/BeanMetaDataImpl.java 2009-10-07 08:31:13 UTC (rev 17638)
@@ -350,7 +350,8 @@
propertyDescriptor = new PropertyDescriptorImpl(
ReflectionHelper.getType( member ),
isCascaded,
- name
+ name,
+ this
);
propertyDescriptors.put( name, propertyDescriptor );
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ElementDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ElementDescriptorImpl.java 2009-10-06 20:42:51 UTC (rev 17637)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/ElementDescriptorImpl.java 2009-10-07 08:31:13 UTC (rev 17638)
@@ -18,12 +18,14 @@
package org.hibernate.validator.metadata;
import java.lang.annotation.ElementType;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import javax.validation.groups.Default;
import javax.validation.metadata.ConstraintDescriptor;
import javax.validation.metadata.ElementDescriptor;
import javax.validation.metadata.Scope;
@@ -39,10 +41,12 @@
* @author Hardy Ferentschik
*/
public class ElementDescriptorImpl implements ElementDescriptor {
+ protected final BeanMetaData<?> metaDataBean;
private final Class<?> type;
private final Set<ConstraintDescriptorImpl<?>> constraintDescriptors = new HashSet<ConstraintDescriptorImpl<?>>();
- public ElementDescriptorImpl(Class<?> type) {
+ public ElementDescriptorImpl(Class<?> type, BeanMetaData<?> metaDataBean) {
+ this.metaDataBean = metaDataBean;
this.type = type;
}
@@ -83,7 +87,15 @@
}
public ConstraintFinder unorderedAndMatchingGroups(Class<?>... classes) {
- this.groups = Arrays.asList( classes );
+ this.groups = new ArrayList<Class<?>>();
+ for ( Class<?> clazz : classes ) {
+ if ( Default.class.equals( clazz ) && metaDataBean.defaultGroupSequenceIsRedefined() ) {
+ this.groups.addAll( metaDataBean.getDefaultGroupSequence() );
+ }
+ else {
+ groups.add( clazz );
+ }
+ }
return this;
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/PropertyDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/PropertyDescriptorImpl.java 2009-10-06 20:42:51 UTC (rev 17637)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/metadata/PropertyDescriptorImpl.java 2009-10-07 08:31:13 UTC (rev 17638)
@@ -30,8 +30,8 @@
private final String property;
- public PropertyDescriptorImpl(Class<?> returnType, boolean cascaded, String property) {
- super( returnType );
+ public PropertyDescriptorImpl(Class<?> returnType, boolean cascaded, String property, BeanMetaData<?> beanMetaData) {
+ super( returnType, beanMetaData );
this.cascaded = cascaded;
this.property = property;
}
14 years, 7 months
Hibernate SVN: r17637 - in core/trunk/cache-jbosscache/src: test/resources and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2009-10-06 16:42:51 -0400 (Tue, 06 Oct 2009)
New Revision: 17637
Modified:
core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml
core/trunk/cache-jbosscache/src/test/resources/treecache.xml
Log:
[HHH-3849] Disable lock striping in JBoss Cache configs
Modified: core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml
===================================================================
(Binary files differ)
Modified: core/trunk/cache-jbosscache/src/test/resources/treecache.xml
===================================================================
--- core/trunk/cache-jbosscache/src/test/resources/treecache.xml 2009-10-06 20:14:00 UTC (rev 17636)
+++ core/trunk/cache-jbosscache/src/test/resources/treecache.xml 2009-10-06 20:42:51 UTC (rev 17637)
@@ -98,6 +98,9 @@
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">15000</attribute>
+
+ <!-- Lock Striping can lead to deadlocks -->
+ <attribute name="UseLockStriping">false</attribute>
<!--
Indicate whether to use marshalling or not. Set this to true if you
14 years, 7 months
Hibernate SVN: r17636 - core/branches/Branch_3_3/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2009-10-06 16:14:00 -0400 (Tue, 06 Oct 2009)
New Revision: 17636
Modified:
core/branches/Branch_3_3/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java
Log:
[HHH-4435] newerThan should return false when comparing to self
Modified: core/branches/Branch_3_3/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java
===================================================================
--- core/branches/Branch_3_3/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java 2009-10-06 18:38:33 UTC (rev 17635)
+++ core/branches/Branch_3_3/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java 2009-10-06 20:14:00 UTC (rev 17636)
@@ -116,6 +116,11 @@
// treat as us being newer
return (other.previousVersion != null);
}
+
+ // Can't be newer than itself
+ if ( this == dataVersion ) {
+ return false;
+ }
return versionComparator.compare(currentVersion, other.previousVersion) >= 1;
}
14 years, 7 months
Hibernate SVN: r17635 - core/trunk/cache-jbosscache.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2009-10-06 14:38:33 -0400 (Tue, 06 Oct 2009)
New Revision: 17635
Modified:
core/trunk/cache-jbosscache/pom.xml
Log:
[HHH-4476] Use JBC 3.2.1.GA
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2009-10-06 18:17:00 UTC (rev 17634)
+++ core/trunk/cache-jbosscache/pom.xml 2009-10-06 18:38:33 UTC (rev 17635)
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.1.0.GA</version>
+ <version>3.2.1.GA</version>
</dependency>
<!-- test dependencies -->
14 years, 7 months
Hibernate SVN: r17634 - core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2009-10-06 14:17:00 -0400 (Tue, 06 Oct 2009)
New Revision: 17634
Modified:
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java
Log:
[HHH-4435] newerThan should return false when comparing to self
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java 2009-10-06 18:15:30 UTC (rev 17633)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java 2009-10-06 18:17:00 UTC (rev 17634)
@@ -116,6 +116,11 @@
// treat as us being newer
return (other.previousVersion != null);
}
+
+ // Can't be newer than itself
+ if ( this == dataVersion ) {
+ return false;
+ }
return versionComparator.compare(currentVersion, other.previousVersion) >= 1;
}
14 years, 7 months
Hibernate SVN: r17633 - in core/trunk/cache-jbosscache/src: main/resources/org/hibernate/cache/jbc/builder and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: bstansberry(a)jboss.com
Date: 2009-10-06 14:15:30 -0400 (Tue, 06 Oct 2009)
New Revision: 17633
Added:
core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JbcConfigsXmlValidityTestCase.java
Removed:
core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc2-configs.xml
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java
Modified:
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java
core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java
Log:
[HHH-4475] Fix resource locations to reflect repackaging
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java 2009-10-06 17:00:53 UTC (rev 17632)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java 2009-10-06 18:15:30 UTC (rev 17633)
@@ -104,12 +104,12 @@
* Default value for {@link #CACHE_FACTORY_RESOURCE_PROP}. Specifies
* the "jbc2-configs.xml" file in this package.
*/
- public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc2/builder/jbc2-configs.xml";
+ public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc-configs.xml";
/**
* Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies
* the "jgroups-stacks.xml" file in this package.
*/
- public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc2/builder/jgroups-stacks.xml";
+ public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
/**
* Default value for {@link #ENTITY_CACHE_RESOURCE_PROP}.
*/
Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java
===================================================================
--- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java 2009-10-06 17:00:53 UTC (rev 17632)
+++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java 2009-10-06 18:15:30 UTC (rev 17633)
@@ -79,7 +79,7 @@
* Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies
* the "jgroups-stacks.xml" file in this package.
*/
- public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc2/builder/jgroups-stacks.xml";
+ public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
private Cache cache;
private ChannelFactory channelFactory;
Copied: core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml (from rev 17625, core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc2-configs.xml)
===================================================================
(Binary files differ)
Deleted: core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc2-configs.xml
===================================================================
(Binary files differ)
Deleted: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java 2009-10-06 17:00:53 UTC (rev 17632)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java 2009-10-06 18:15:30 UTC (rev 17633)
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
- *
- * 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, v. 2.1. This program is distributed in the
- * hope that it will be useful, but WITHOUT A 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, v.2.1 along with this
- * distribution; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Red Hat Author(s): Brian Stansberry
- */
-
-package org.hibernate.test.cache.jbc;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.hibernate.test.util.CacheManagerTestSetup;
-import org.jboss.cache.Cache;
-import org.jboss.cache.CacheManager;
-
-/**
- * Tests the validity of the JBC configs in jbc2-configs.xml.
- *
- * @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
- * @version $Revision: 1 $
- */
-public class Jbc2ConfigsXmlValidityTestCase extends AbstractJBossCacheTestCase
-{
- private static final AtomicReference<CacheManager> cacheManagerRef = new AtomicReference<CacheManager>();
-
- private static final Set<String> stdConfigs = new HashSet<String>();
-
- static
- {
- stdConfigs.add("optimistic-entity");
- stdConfigs.add("pessimistic-entity");
- stdConfigs.add("pessimistic-entity-repeatable");
- stdConfigs.add("optimistic-shared");
- stdConfigs.add("pessimistic-shared");
- stdConfigs.add("pessimistic-shared-repeatable");
- stdConfigs.add("local-query");
- stdConfigs.add("replicated-query");
- stdConfigs.add("timestamps-cache");
- }
-
- private CacheManager mgr;
- private String cacheName;
- private Cache cache;
-
- /**
- * Create a new Jbc2ConfigsXmlValidityTestCase.
- *
- * @param name
- */
- public Jbc2ConfigsXmlValidityTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(Jbc2ConfigsXmlValidityTestCase.class);
- return new CacheManagerTestSetup(suite, cacheManagerRef);
- }
-
-
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- this.mgr = cacheManagerRef.get();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
-
- if (cache != null)
- {
- try
- {
- mgr.releaseCache(this.cacheName);
- }
- catch (Exception ignored) {}
-
- cache = null;
- }
-
- mgr = null;
- }
-
- public void testOptimisticEntity() throws Exception
- {
- stdConfigTest("optimistic-entity");
- }
-
- public void testPessimisticEntity() throws Exception
- {
- stdConfigTest("pessimistic-entity");
- }
-
- public void testPessimisticEntityRepeatable() throws Exception
- {
- stdConfigTest("pessimistic-entity-repeatable");
- }
-
- public void testOptimisticShared() throws Exception
- {
- stdConfigTest("optimistic-shared");
- }
-
- public void testPessimisticShared() throws Exception
- {
- stdConfigTest("pessimistic-shared");
- }
-
- public void testPessimisticSharedRepeatable() throws Exception
- {
- stdConfigTest("pessimistic-shared-repeatable");
- }
-
- public void testLocalQuery() throws Exception
- {
- stdConfigTest("local-query");
- }
-
- public void testReplicatedQuery() throws Exception
- {
- stdConfigTest("replicated-query");
- }
-
- public void testTimestampsCache() throws Exception
- {
- stdConfigTest("timestamps-cache");
- }
-
- public void testAdditionalConfigs() throws Exception
- {
- Set<String> names = new HashSet<String>(this.mgr.getConfigurationNames());
- names.removeAll(stdConfigs);
- for (String name : names)
- {
- configTest(name);
- }
- }
-
- private void stdConfigTest(String configName) throws Exception
- {
- assertTrue(this.mgr.getConfigurationNames().contains(configName));
- configTest(configName);
- }
-
- private void configTest(String configName) throws Exception
- {
- this.cacheName = configName;
- this.cache = mgr.getCache(configName, true);
- this.cache.start();
- this.mgr.releaseCache(this.cacheName);
- this.cache = null;
- }
-}
Copied: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JbcConfigsXmlValidityTestCase.java (from rev 17625, core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java)
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JbcConfigsXmlValidityTestCase.java (rev 0)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JbcConfigsXmlValidityTestCase.java 2009-10-06 18:15:30 UTC (rev 17633)
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ *
+ * 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, v. 2.1. This program is distributed in the
+ * hope that it will be useful, but WITHOUT A 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, v.2.1 along with this
+ * distribution; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Red Hat Author(s): Brian Stansberry
+ */
+
+package org.hibernate.test.cache.jbc;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.hibernate.test.util.CacheManagerTestSetup;
+import org.jboss.cache.Cache;
+import org.jboss.cache.CacheManager;
+
+/**
+ * Tests the validity of the JBC configs in jbc2-configs.xml.
+ *
+ * @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1 $
+ */
+public class JbcConfigsXmlValidityTestCase extends AbstractJBossCacheTestCase
+{
+ private static final AtomicReference<CacheManager> cacheManagerRef = new AtomicReference<CacheManager>();
+
+ private static final Set<String> stdConfigs = new HashSet<String>();
+
+ static
+ {
+ stdConfigs.add("optimistic-entity");
+ stdConfigs.add("pessimistic-entity");
+ stdConfigs.add("pessimistic-entity-repeatable");
+ stdConfigs.add("optimistic-shared");
+ stdConfigs.add("pessimistic-shared");
+ stdConfigs.add("pessimistic-shared-repeatable");
+ stdConfigs.add("local-query");
+ stdConfigs.add("replicated-query");
+ stdConfigs.add("timestamps-cache");
+ }
+
+ private CacheManager mgr;
+ private String cacheName;
+ private Cache cache;
+
+ /**
+ * Create a new JbcConfigsXmlValidityTestCase.
+ *
+ * @param name
+ */
+ public JbcConfigsXmlValidityTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception {
+ TestSuite suite = new TestSuite(JbcConfigsXmlValidityTestCase.class);
+ return new CacheManagerTestSetup(suite, cacheManagerRef);
+ }
+
+
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ this.mgr = cacheManagerRef.get();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+
+ if (cache != null)
+ {
+ try
+ {
+ mgr.releaseCache(this.cacheName);
+ }
+ catch (Exception ignored) {}
+
+ cache = null;
+ }
+
+ mgr = null;
+ }
+
+ public void testOptimisticEntity() throws Exception
+ {
+ stdConfigTest("optimistic-entity");
+ }
+
+ public void testPessimisticEntity() throws Exception
+ {
+ stdConfigTest("pessimistic-entity");
+ }
+
+ public void testPessimisticEntityRepeatable() throws Exception
+ {
+ stdConfigTest("pessimistic-entity-repeatable");
+ }
+
+ public void testOptimisticShared() throws Exception
+ {
+ stdConfigTest("optimistic-shared");
+ }
+
+ public void testPessimisticShared() throws Exception
+ {
+ stdConfigTest("pessimistic-shared");
+ }
+
+ public void testPessimisticSharedRepeatable() throws Exception
+ {
+ stdConfigTest("pessimistic-shared-repeatable");
+ }
+
+ public void testLocalQuery() throws Exception
+ {
+ stdConfigTest("local-query");
+ }
+
+ public void testReplicatedQuery() throws Exception
+ {
+ stdConfigTest("replicated-query");
+ }
+
+ public void testTimestampsCache() throws Exception
+ {
+ stdConfigTest("timestamps-cache");
+ }
+
+ public void testAdditionalConfigs() throws Exception
+ {
+ Set<String> names = new HashSet<String>(this.mgr.getConfigurationNames());
+ names.removeAll(stdConfigs);
+ for (String name : names)
+ {
+ configTest(name);
+ }
+ }
+
+ private void stdConfigTest(String configName) throws Exception
+ {
+ assertTrue(this.mgr.getConfigurationNames().contains(configName));
+ configTest(configName);
+ }
+
+ private void configTest(String configName) throws Exception
+ {
+ this.cacheName = configName;
+ this.cache = mgr.getCache(configName, true);
+ this.cache.start();
+ this.mgr.releaseCache(this.cacheName);
+ this.cache = null;
+ }
+}
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java 2009-10-06 17:00:53 UTC (rev 17632)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java 2009-10-06 18:15:30 UTC (rev 17633)
@@ -18,6 +18,7 @@
import junit.framework.Test;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
import org.hibernate.test.util.SelectedClassnameClassLoader;
import org.hibernate.test.util.SelectedClassnameClassLoaderTestSetup;
@@ -31,8 +32,8 @@
public class IsolatedCacheTestSetup extends SelectedClassnameClassLoaderTestSetup
{
- public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc2-configs.xml";
- public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
+ public static final String DEF_CACHE_FACTORY_RESOURCE = MultiplexingCacheInstanceManager.DEF_CACHE_FACTORY_RESOURCE;
+ public static final String DEF_JGROUPS_RESOURCE = MultiplexingCacheInstanceManager.DEF_JGROUPS_RESOURCE;
private String[] isolatedClasses;
private String cacheConfig;
Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java
===================================================================
--- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java 2009-10-06 17:00:53 UTC (rev 17632)
+++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java 2009-10-06 18:15:30 UTC (rev 17633)
@@ -21,6 +21,7 @@
import junit.extensions.TestSetup;
import junit.framework.Test;
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
import org.jboss.cache.CacheManager;
import org.jboss.cache.CacheManagerImpl;
import org.jgroups.ChannelFactory;
@@ -36,8 +37,8 @@
*/
public class CacheManagerTestSetup extends TestSetup
{
- public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc2-configs.xml";
- public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
+ public static final String DEF_CACHE_FACTORY_RESOURCE = MultiplexingCacheInstanceManager.DEF_CACHE_FACTORY_RESOURCE;
+ public static final String DEF_JGROUPS_RESOURCE = MultiplexingCacheInstanceManager.DEF_JGROUPS_RESOURCE;
private final String jbcConfig;
private final String jgConfig;
14 years, 7 months