[hibernate-commits] Hibernate SVN: r17413 - in validator/trunk: hibernate-validator/src/main/java/org/hibernate/validation/engine and 4 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Aug 25 10:39:26 EDT 2009
Author: hardy.ferentschik
Date: 2009-08-25 10:39:26 -0400 (Tue, 25 Aug 2009)
New Revision: 17413
Added:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorConfiguration.java
Removed:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidationProvider.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/HibernateValidatorConfiguration.java
Modified:
validator/trunk/hibernate-validator-tck-runner/pom.xml
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java
validator/trunk/hibernate-validator/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java
Log:
HV-211
Deleted: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidationProvider.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidationProvider.java 2009-08-25 14:38:28 UTC (rev 17412)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidationProvider.java 2009-08-25 14:39:26 UTC (rev 17413)
@@ -1,49 +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;
-
-import javax.validation.Configuration;
-import javax.validation.ValidatorFactory;
-import javax.validation.spi.BootstrapState;
-import javax.validation.spi.ConfigurationState;
-import javax.validation.spi.ValidationProvider;
-
-import org.hibernate.validation.engine.ConfigurationImpl;
-import org.hibernate.validation.engine.HibernateValidatorConfiguration;
-import org.hibernate.validation.engine.ValidatorFactoryImpl;
-
-/**
- * Default implementation of <code>ValidationProvider</code> within Hibernate validator.
- *
- * @author Emmanuel Bernard
- * @author Hardy Ferentschik
- */
-public class HibernateValidationProvider implements ValidationProvider<HibernateValidatorConfiguration> {
-
- public HibernateValidatorConfiguration createSpecializedConfiguration(BootstrapState state) {
- return HibernateValidatorConfiguration.class.cast( new ConfigurationImpl( this ) );
- }
-
- public Configuration<?> createGenericConfiguration(BootstrapState state) {
- return new ConfigurationImpl( state );
- }
-
- public ValidatorFactory buildValidatorFactory(ConfigurationState configurationState) {
- return new ValidatorFactoryImpl( configurationState );
- }
-}
Copied: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidator.java (from rev 17398, validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidationProvider.java)
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidator.java (rev 0)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidator.java 2009-08-25 14:39:26 UTC (rev 17413)
@@ -0,0 +1,49 @@
+// $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;
+
+import javax.validation.Configuration;
+import javax.validation.ValidatorFactory;
+import javax.validation.spi.BootstrapState;
+import javax.validation.spi.ConfigurationState;
+import javax.validation.spi.ValidationProvider;
+
+import org.hibernate.validation.engine.ConfigurationImpl;
+import org.hibernate.validation.engine.ValidatorConfiguration;
+import org.hibernate.validation.engine.ValidatorFactoryImpl;
+
+/**
+ * Default implementation of <code>ValidationProvider</code> within Hibernate validator.
+ *
+ * @author Emmanuel Bernard
+ * @author Hardy Ferentschik
+ */
+public class HibernateValidator implements ValidationProvider<ValidatorConfiguration> {
+
+ public ValidatorConfiguration createSpecializedConfiguration(BootstrapState state) {
+ return ValidatorConfiguration.class.cast( new ConfigurationImpl( this ) );
+ }
+
+ public Configuration<?> createGenericConfiguration(BootstrapState state) {
+ return new ConfigurationImpl( state );
+ }
+
+ public ValidatorFactory buildValidatorFactory(ConfigurationState configurationState) {
+ return new ValidatorFactoryImpl( configurationState );
+ }
+}
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidator.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java 2009-08-25 14:38:28 UTC (rev 17412)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java 2009-08-25 14:39:26 UTC (rev 17413)
@@ -45,7 +45,7 @@
* @author Emmanuel Bernard
* @author Hardy Ferentschik
*/
-public class ConfigurationImpl implements HibernateValidatorConfiguration, ConfigurationState {
+public class ConfigurationImpl implements ValidatorConfiguration, ConfigurationState {
static {
Version.touch();
@@ -80,7 +80,7 @@
validationBootstrapParameters.provider = provider;
}
- public HibernateValidatorConfiguration ignoreXmlConfiguration() {
+ public ValidatorConfiguration ignoreXmlConfiguration() {
ignoreXmlConfiguration = true;
return this;
}
@@ -100,12 +100,12 @@
return this;
}
- public HibernateValidatorConfiguration addMapping(InputStream stream) {
+ public ValidatorConfiguration addMapping(InputStream stream) {
validationBootstrapParameters.mappings.add( stream );
return this;
}
- public HibernateValidatorConfiguration addProperty(String name, String value) {
+ public ValidatorConfiguration addProperty(String name, String value) {
if ( value != null ) {
validationBootstrapParameters.configProperties.put( name, value );
}
Deleted: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/HibernateValidatorConfiguration.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/HibernateValidatorConfiguration.java 2009-08-25 14:38:28 UTC (rev 17412)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/HibernateValidatorConfiguration.java 2009-08-25 14:39:26 UTC (rev 17413)
@@ -1,12 +0,0 @@
-package org.hibernate.validation.engine;
-
-import javax.validation.Configuration;
-
-/**
- * Uniquely identify Hibernate Validator in the Bean Validation bootstrap strategy
- * Also contains Hibernate Validator specific configurations
- *
- * @author Emmanuel Bernard
- */
-public interface HibernateValidatorConfiguration extends Configuration<HibernateValidatorConfiguration> {
-}
Copied: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorConfiguration.java (from rev 17398, validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/HibernateValidatorConfiguration.java)
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorConfiguration.java (rev 0)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorConfiguration.java 2009-08-25 14:39:26 UTC (rev 17413)
@@ -0,0 +1,12 @@
+package org.hibernate.validation.engine;
+
+import javax.validation.Configuration;
+
+/**
+ * Uniquely identify Hibernate Validator in the Bean Validation bootstrap strategy
+ * Also contains Hibernate Validator specific configurations
+ *
+ * @author Emmanuel Bernard
+ */
+public interface ValidatorConfiguration extends Configuration<ValidatorConfiguration> {
+}
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorConfiguration.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider
===================================================================
--- validator/trunk/hibernate-validator/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider 2009-08-25 14:38:28 UTC (rev 17412)
+++ validator/trunk/hibernate-validator/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider 2009-08-25 14:39:26 UTC (rev 17413)
@@ -1 +1 @@
-org.hibernate.validation.HibernateValidationProvider
\ No newline at end of file
+org.hibernate.validation.HibernateValidator
\ No newline at end of file
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java 2009-08-25 14:38:28 UTC (rev 17412)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java 2009-08-25 14:39:26 UTC (rev 17413)
@@ -35,9 +35,9 @@
import org.hibernate.validation.constraints.impl.NotNullValidator;
import org.hibernate.validation.engine.ConfigurationImpl;
import org.hibernate.validation.engine.ConstraintValidatorFactoryImpl;
-import org.hibernate.validation.engine.HibernateValidatorConfiguration;
+import org.hibernate.validation.engine.ValidatorConfiguration;
import org.hibernate.validation.engine.ValidatorFactoryImpl;
-import org.hibernate.validation.HibernateValidationProvider;
+import org.hibernate.validation.HibernateValidator;
/**
* Tests the Bean Validation bootstrapping.
@@ -48,8 +48,8 @@
@Test
public void testBootstrapAsServiceWithBuilder() {
- HibernateValidatorConfiguration configuration = Validation
- .byProvider( HibernateValidationProvider.class )
+ ValidatorConfiguration configuration = Validation
+ .byProvider( HibernateValidator.class )
.configure();
assertDefaultBuilderAndFactory( configuration );
}
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-08-25 14:38:28 UTC (rev 17412)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/TestUtil.java 2009-08-25 14:39:26 UTC (rev 17413)
@@ -36,8 +36,8 @@
import static org.testng.Assert.assertTrue;
import static org.testng.FileAssert.fail;
-import org.hibernate.validation.HibernateValidationProvider;
-import org.hibernate.validation.engine.HibernateValidatorConfiguration;
+import org.hibernate.validation.HibernateValidator;
+import org.hibernate.validation.engine.ValidatorConfiguration;
import org.hibernate.validation.engine.PathImpl;
/**
@@ -55,8 +55,8 @@
public static Validator getValidator() {
if ( hibernateValidator == null ) {
- HibernateValidatorConfiguration configuration = Validation
- .byProvider( HibernateValidationProvider.class )
+ ValidatorConfiguration configuration = Validation
+ .byProvider( HibernateValidator.class )
.configure();
hibernateValidator = configuration.buildValidatorFactory().getValidator();
}
@@ -73,8 +73,8 @@
public static Validator getValidatorWithCustomConfiguration(String path) {
Thread.currentThread().setContextClassLoader( new CustomValidationXmlClassLoader( path ) );
- HibernateValidatorConfiguration configuration = Validation
- .byProvider( HibernateValidationProvider.class )
+ ValidatorConfiguration configuration = Validation
+ .byProvider( HibernateValidator.class )
.configure();
return configuration.buildValidatorFactory().getValidator();
}
@@ -85,8 +85,8 @@
public static Validator getValidatorIgnoringValidationXml() {
Thread.currentThread().setContextClassLoader( new IgnoringValidationXmlClassLoader() );
- HibernateValidatorConfiguration configuration = Validation
- .byProvider( HibernateValidationProvider.class )
+ ValidatorConfiguration configuration = Validation
+ .byProvider( HibernateValidator.class )
.configure();
return configuration.buildValidatorFactory().getValidator();
}
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-08-25 14:38:28 UTC (rev 17412)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2009-08-25 14:39:26 UTC (rev 17413)
@@ -43,7 +43,7 @@
<properties>
<jboss.home>/opt/java/jboss-5</jboss.home>
- <validation.provider>org.hibernate.validation.HibernateValidationProvider</validation.provider>
+ <validation.provider>org.hibernate.validation.HibernateValidator</validation.provider>
<remote.debug />
</properties>
More information about the hibernate-commits
mailing list