Hibernate SVN: r17368 - core/trunk.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-08-19 14:34:19 -0400 (Wed, 19 Aug 2009)
New Revision: 17368
Modified:
core/trunk/changelog.txt
Log:
prep 3.5.0-Beta-1
Modified: core/trunk/changelog.txt
===================================================================
--- core/trunk/changelog.txt 2009-08-19 18:15:21 UTC (rev 17367)
+++ core/trunk/changelog.txt 2009-08-19 18:34:19 UTC (rev 17368)
@@ -87,6 +87,7 @@
* [HHH-4034] - Update org.hibernate.action.BulkOperationCleanupAction to use new Region cache APIs
* [HHH-4088] - Session.getSession should always return sessions from parent (or root) session
* [HHH-4091] - HQLTest#testDuplicateImplicitJoinInSelect
+ * [HHH-4099] - Doc build error (http://jira.codehaus.org/browse/MNG-1323)
** Improvement
* [HHH-1234] - allow tuplizers the opportunity to influence getSubclassEntityPersister() processing
15 years, 3 months
Hibernate SVN: r17367 - core/trunk/documentation.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-08-19 14:15:21 -0400 (Wed, 19 Aug 2009)
New Revision: 17367
Modified:
core/trunk/documentation/pom.xml
Log:
HHH-4099 : Doc build error (http://jira.codehaus.org/browse/MNG-1323);
HHH-4100 : Problems with Envers docbook sources
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2009-08-19 18:14:33 UTC (rev 17366)
+++ core/trunk/documentation/pom.xml 2009-08-19 18:15:21 UTC (rev 17367)
@@ -18,8 +18,8 @@
<modules>
<module>manual</module>
+<!--
<module>envers</module>
-<!--
<module>jbosscache2</module>
-->
</modules>
15 years, 3 months
Hibernate SVN: r17366 - in core/trunk: documentation/jbosscache2 and 2 other directories.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-08-19 14:14:33 -0400 (Wed, 19 Aug 2009)
New Revision: 17366
Modified:
core/trunk/documentation/envers/pom.xml
core/trunk/documentation/jbosscache2/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/parent/pom.xml
Log:
HHH-4099 : Doc build error (http://jira.codehaus.org/browse/MNG-1323)
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2009-08-19 15:05:56 UTC (rev 17365)
+++ core/trunk/documentation/envers/pom.xml 2009-08-19 18:14:33 UTC (rev 17366)
@@ -21,16 +21,6 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>1.0.2</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
<configuration>
<sourceDocumentName>Envers_Reference.xml</sourceDocumentName>
<masterTranslation>en-US</masterTranslation>
@@ -43,31 +33,6 @@
<exclude>**/*.zargo</exclude>
</excludes>
</imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
- <finalName>hibernate_reference.pdf</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>false</useRelativeImageUris>
- </options>
</configuration>
</plugin>
</plugins>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2009-08-19 15:05:56 UTC (rev 17365)
+++ core/trunk/documentation/jbosscache2/pom.xml 2009-08-19 18:14:33 UTC (rev 17366)
@@ -51,16 +51,6 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.0</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>1.0.2</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
<configuration>
<sourceDocumentName>Hibernate_JBC2_Reference.xml</sourceDocumentName>
<sourceDirectory>${basedir}/src/main/docbook/en-US</sourceDirectory>
@@ -74,37 +64,6 @@
<exclude>**/*.zargo</exclude>
</excludes>
</imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
- <finalName>hibernate-jbosscache-guide.pdf</finalName>
- <!--
- <profilingTypeName>two_pass</profilingTypeName>
- -->
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <!--
- <profilingTypeName>two_pass</profilingTypeName>
- -->
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <!--
- <profilingTypeName>two_pass</profilingTypeName>
- -->
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <localeSeparator>-</localeSeparator>
- <useRelativeImageUris>true</useRelativeImageUris>
- </options>
</configuration>
</plugin>
</plugins>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2009-08-19 15:05:56 UTC (rev 17365)
+++ core/trunk/documentation/manual/pom.xml 2009-08-19 18:14:33 UTC (rev 17366)
@@ -19,27 +19,9 @@
<build>
<plugins>
<plugin>
- <!-- Needed in order to load the proper 'artifact handler' for the 'jdocbook-style' packaging -->
<groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-style-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>2.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
-
<executions>
<execution>
<!--
@@ -77,43 +59,9 @@
<profiling>
<enabled>true</enabled>
</profiling>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource>
- <finalName>hibernate_reference.pdf</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- </options>
</configuration>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jdocbook-style</artifactId>
- <version>2.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
-
</project>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-08-19 15:05:56 UTC (rev 17365)
+++ core/trunk/parent/pom.xml 2009-08-19 18:14:33 UTC (rev 17366)
@@ -114,6 +114,12 @@
<build>
<plugins>
<plugin>
+ <!-- Needed in order to load the proper 'artifact handler' for the 'jdocbook-style' packaging -->
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-style-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
<!-- require at least JDK 1.5 to run the build -->
<!-- ... -->
<!-- we need at least Maven 2.0.8 because of a bug fix affecting our antlr usage -->
@@ -175,6 +181,52 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.0</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jdocbook-style</artifactId>
+ <version>2.0.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource>
+ <finalName>hibernate_reference.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ </options>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-style-plugin</artifactId>
+ <version>2.0.0</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
@@ -339,6 +391,7 @@
<!-- / test-scoped dependencies for common testing dependencies -->
</dependencies>
+
<dependencyManagement>
<dependencies>
<dependency>
15 years, 3 months
Hibernate SVN: r17365 - core/trunk/documentation.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-08-19 11:05:56 -0400 (Wed, 19 Aug 2009)
New Revision: 17365
Removed:
core/trunk/documentation/releasenotes/
Modified:
core/trunk/documentation/pom.xml
Log:
removed unmaintained releasenotes module
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
+++ core/trunk/documentation/pom.xml 2009-08-19 15:05:56 UTC (rev 17365)
@@ -17,7 +17,6 @@
<description>Grouping of Hibernate Core Project documentation modules</description>
<modules>
- <module>releasenotes</module>
<module>manual</module>
<module>envers</module>
<!--
15 years, 3 months
Hibernate SVN: r17364 - in core/trunk: cache-ehcache and 16 other directories.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-08-19 11:02:46 -0400 (Wed, 19 Aug 2009)
New Revision: 17364
Modified:
core/trunk/annotations/pom.xml
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/envers/pom.xml
core/trunk/hibernate-maven-plugin/pom.xml
core/trunk/jmx/pom.xml
core/trunk/parent/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
core/trunk/tutorials/eg/pom.xml
core/trunk/tutorials/pom.xml
core/trunk/tutorials/web/pom.xml
Log:
[maven-release-plugin] rollback the release of hibernate-3.5.0.Beta-1
Modified: core/trunk/annotations/pom.xml
===================================================================
--- core/trunk/annotations/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/annotations/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -1,11 +1,37 @@
-<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"?>
+<!--
+ ~ 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
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -216,8 +242,8 @@
<jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
<jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
<jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
+ <jdbc.pass/>
+ <jdbc.isolation/>
</properties>
</profile>
@@ -236,8 +262,8 @@
<jdbc.driver>org.h2.Driver</jdbc.driver>
<jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
<jdbc.user>sa</jdbc.user>
- <jdbc.pass />
- <jdbc.isolation />
+ <jdbc.pass/>
+ <jdbc.isolation/>
</properties>
</profile>
@@ -265,7 +291,7 @@
<jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
+ <jdbc.isolation/>
</properties>
</profile>
@@ -285,7 +311,7 @@
<jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:hibbrtru</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
+ <jdbc.isolation/>
</properties>
</profile>
@@ -316,7 +342,7 @@
<jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
+ <jdbc.isolation/>
</properties>
</profile>
@@ -341,7 +367,7 @@
<jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
+ <jdbc.isolation/>
</properties>
</profile>
@@ -362,7 +388,7 @@
<jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
+ <jdbc.isolation/>
</properties>
</profile>
@@ -383,7 +409,7 @@
<jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
+ <jdbc.isolation/>
</properties>
</profile>
@@ -403,7 +429,7 @@
<jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbrtru</jdbc.url>
<jdbc.user>hibbrtru</jdbc.user>
<jdbc.pass>hibbrtru</jdbc.pass>
- <jdbc.isolation />
+ <jdbc.isolation/>
</properties>
</profile>
@@ -429,4 +455,4 @@
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/cache-ehcache/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/cache-jbosscache/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/cache-oscache/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/cache-swarmcache/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/connection-c3p0/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/connection-proxool/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/core/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -106,7 +106,7 @@
<targetMembers>
<methodBodyReturn>
<className>org.hibernate.Version</className>
- <methodName>getVersionString</methodName>>
+ <methodName>getVersionString</methodName>>
</methodBodyReturn>
</targetMembers>
</bytecodeInjection>
@@ -171,4 +171,4 @@
<properties>
<antlrPluginVersion>2.1</antlrPluginVersion>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/entitymanager/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -1,11 +1,13 @@
-<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>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -92,12 +94,12 @@
<phase>process-test-classes</phase>
<configuration>
<tasks>
- <property name="package.dir" value="${basedir}/target/test-packages" />
- <property name="package.tmp.dir" value="${basedir}/target/tmp" />
- <property name="classes.dir" value="${project.build.directory}/test-classes" />
- <property name="testresources.dir" value="${basedir}/src/test/resources" />
+ <property name="package.dir" value="${basedir}/target/test-packages"/>
+ <property name="package.tmp.dir" value="${basedir}/target/tmp"/>
+ <property name="classes.dir" value="${project.build.directory}/test-classes"/>
+ <property name="testresources.dir" value="${basedir}/src/test/resources"/>
<ant antfile="${basedir}/build.xml">
- <target name="package" />
+ <target name="package"/>
</ant>
</tasks>
</configuration>
@@ -447,4 +449,4 @@
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/envers/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -1,11 +1,13 @@
-<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>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -152,4 +154,4 @@
<jbossenvers.reports.aggregate>true</jbossenvers.reports.aggregate>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: core/trunk/hibernate-maven-plugin/pom.xml
===================================================================
--- core/trunk/hibernate-maven-plugin/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/hibernate-maven-plugin/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -20,14 +20,15 @@
~ 51 Franklin Street, Fifth Floor
~ 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>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/jmx/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -1,11 +1,37 @@
-<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"?>
+<!--
+ ~ 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
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -23,4 +49,4 @@
<version>${version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/parent/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -1,11 +1,37 @@
-<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"?>
+<!--
+ ~ 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
+ -->
+<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>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
@@ -30,9 +56,9 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0.B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0.B...</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0.Beta-1</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
</scm>
<ciManagement>
@@ -380,4 +406,4 @@
<properties>
<slf4jVersion>1.5.8</slf4jVersion>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/testing/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/testsuite/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/tutorials/eg/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/tutorials/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -31,7 +31,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2009-08-19 15:01:26 UTC (rev 17363)
+++ core/trunk/tutorials/web/pom.xml 2009-08-19 15:02:46 UTC (rev 17364)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
15 years, 3 months
Hibernate SVN: r17363 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration.
by hibernate-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2009-08-19 11:01:26 -0400 (Wed, 19 Aug 2009)
New Revision: 17363
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java
Log:
xml mapping tests
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java 2009-08-19 14:59:50 UTC (rev 17362)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java 2009-08-19 15:01:26 UTC (rev 17363)
@@ -43,7 +43,7 @@
public class MissingClassNameOnBeanNodeTest extends AbstractTest {
@Test
- @SpecAssertion(section = "7.1.1", id = "b")
+ @SpecAssertion(section = "7.1.1", id = "c")
public void testClassNameIsMandatory() {
try {
TestUtil.getValidatorUnderTest();
15 years, 3 months
Hibernate SVN: r17362 - in beanvalidation/trunk/validation-tck/src/main: resources and 1 other directories.
by hibernate-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2009-08-19 10:59:50 -0400 (Wed, 19 Aug 2009)
New Revision: 17362
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
xml mapping tests
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java (from rev 17352, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java 2009-08-19 14:59:50 UTC (rev 17362)
@@ -0,0 +1,56 @@
+// $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.jsr303.tck.tests.xmlconfiguration;
+
+
+import javax.validation.ValidationException;
+
+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.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.jsr303.ValidationXml;
+import static org.testng.Assert.fail;
+import org.testng.annotations.Test;
+
+import org.hibernate.jsr303.tck.util.TestUtil;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Artifact(artifactType = ArtifactType.JSR303)
+@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
+@ValidationXml(value = "validation-MissingClassNameOnBeanNodeTest.xml")
+@Resource(source = "user-constraints-MissingClassNameOnBeanNodeTest.xml",
+ destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml")
+public class MissingClassNameOnBeanNodeTest extends AbstractTest {
+
+ @Test
+ @SpecAssertion(section = "7.1.1", id = "b")
+ public void testClassNameIsMandatory() {
+ try {
+ TestUtil.getValidatorUnderTest();
+ fail();
+ }
+ catch ( ValidationException e ) {
+ // success
+ }
+ }
+}
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-19 14:38:34 UTC (rev 17361)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-19 14:59:50 UTC (rev 17362)
@@ -64,6 +64,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testClassConstraintDefinedInXml() {
@@ -87,6 +88,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testIgnoreValidationXml() {
@@ -104,6 +106,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testPropertyConstraintDefinedInXml() {
@@ -128,6 +131,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testFieldConstraintDefinedInXml() {
@@ -155,6 +159,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testAnnotationDefinedConstraintApplies() {
@@ -181,6 +186,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testCascadingConfiguredInXml() {
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml (from rev 17359, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml 2009-08-19 14:59:50 UTC (rev 17362)
@@ -0,0 +1,13 @@
+<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
+ xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
+ <default-package>org.hibernate.jsr303.tck.tests.xmlconfiguration</default-package>
+ <bean ignore-annotations="false">
+ <field name="lastname">
+ <constraint annotation="javax.validation.constraints.Pattern">
+ <message>Last name has to start with with a capital letter.</message>
+ <element name="regexp">^[A-Z][a-z]+</element>
+ </constraint>
+ </field>
+ </bean>
+</constraint-mappings>
Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml (from rev 17352, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-InvalidXmlConfigurationTest.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml 2009-08-19 14:59:50 UTC (rev 17362)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml</constraint-mapping>
+</validation-config>
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-08-19 14:38:34 UTC (rev 17361)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-08-19 14:59:50 UTC (rev 17362)
@@ -878,7 +878,8 @@
of mappings described via constraint-mapping</text>
</assertion>
<assertion id="n" testable="false">
- <text>The namespace javax.validation for properties is reserved for use by this specification</text>
+ <text>The namespace javax.validation for properties is reserved for use by this
+ specification</text>
</assertion>
<assertion id="o" testable="false">
<text>Properties defined via Configuration.addProperty(String, String) are added to the
@@ -1055,18 +1056,20 @@
considered part of the package described by default-package.</text>
</assertion>
<assertion id="b">
- <text>A given JavaBean is described by the bean element. The name of the class is
- mandatory</text>
+ <text>A given JavaBean is described by the bean element.</text>
</assertion>
<assertion id="c">
+ <text>The name of the class in the bean node is mandatory</text>
+ </assertion>
+ <assertion id="d">
<text>By default, all constraint declarations expressed via annotation are ignored for
classes described in XML</text>
</assertion>
- <assertion id="d">
+ <assertion id="e">
<text>You can force Bean Validation to consider both annotations and XML constraint
declarations by using ignore-annotation="false" on bean</text>
</assertion>
- <assertion id="e">
+ <assertion id="f">
<text>If the name of the class does refer to a class not present in in the classpath, a
ValidationException is raised</text>
</assertion>
@@ -1205,8 +1208,8 @@
of ConstraintValidator evaluated</text>
</assertion>
<assertion id="d">
- <text>Annotation based ConstraintValidator come before XML based ConstraintValidator
- in the array</text>
+ <text>Annotation based ConstraintValidator come before XML based ConstraintValidator in
+ the array</text>
</assertion>
<assertion id="e">
<text>The new list is returned by
15 years, 3 months
Hibernate SVN: r17361 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration.
by hibernate-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2009-08-19 10:38:34 -0400 (Wed, 19 Aug 2009)
New Revision: 17361
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
Log:
xml mapping tests
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java 2009-08-19 14:38:01 UTC (rev 17360)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java 2009-08-19 14:38:34 UTC (rev 17361)
@@ -75,7 +75,8 @@
public void testMessageInterpolatorSpecifiedInValidationXmlCanBeOverridden() {
Configuration<?> configuration = Validation
.byDefaultProvider()
- .configure().messageInterpolator( new ConfigurationDefinedMessageInterpolator() );
+ .configure();
+ configuration = configuration.messageInterpolator( new ConfigurationDefinedMessageInterpolator() );
Validator validator = configuration.buildValidatorFactory().getValidator();
User user = new User();
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-19 14:38:01 UTC (rev 17360)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-19 14:38:34 UTC (rev 17361)
@@ -21,6 +21,9 @@
import javax.validation.Configuration;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
+import javax.validation.constraints.Pattern;
+import javax.validation.metadata.BeanDescriptor;
+import javax.validation.metadata.ConstraintDescriptor;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -31,6 +34,8 @@
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
import org.jboss.testharness.impl.packaging.jsr303.ValidationXml;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
import org.hibernate.jsr303.tck.util.TestUtil;
@@ -57,6 +62,7 @@
@SpecAssertions({
@SpecAssertion(section = "4.4.6", id = "a"),
@SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
@SpecAssertion(section = "7.1.2", id = "a")
})
@@ -79,6 +85,7 @@
@SpecAssertions({
@SpecAssertion(section = "4.4.6", id = "b"),
@SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
@SpecAssertion(section = "7.1.2", id = "a")
})
@@ -95,6 +102,7 @@
@SpecAssertions({
@SpecAssertion(section = "4.4.6", id = "a"),
@SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
@SpecAssertion(section = "7.1.2", id = "a")
})
@@ -118,6 +126,7 @@
@SpecAssertions({
@SpecAssertion(section = "4.4.6", id = "a"),
@SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
@SpecAssertion(section = "7.1.2", id = "a")
})
@@ -144,6 +153,7 @@
@SpecAssertions({
@SpecAssertion(section = "4.4.6", id = "a"),
@SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
@SpecAssertion(section = "7.1.2", id = "a")
})
@@ -169,6 +179,7 @@
@SpecAssertions({
@SpecAssertion(section = "4.4.6", id = "a"),
@SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
@SpecAssertion(section = "7.1.2", id = "a")
})
@@ -189,4 +200,25 @@
constraintViolations = validator.validate( user );
assertCorrectNumberOfViolations( constraintViolations, 0 );
}
+
+ @Test
+ @SpecAssertion(section = "7.1", id = "a")
+ public void testXmlConfiguredConstraintExposesCorrespondingAnnotationViaMetadata() {
+ Validator validator = TestUtil.getValidatorUnderTest();
+
+
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( User.class );
+ Set<ConstraintDescriptor<?>> constraintDescriptors = beanDescriptor.getConstraintDescriptors();
+ assertEquals( constraintDescriptors.size(), 1, "There should be one class level constraint defined in xml" );
+
+ ConstraintDescriptor<?> descriptor = constraintDescriptors.iterator().next();
+ assertTrue( descriptor.getAnnotation() instanceof ConsistentUserInformation );
+
+
+ constraintDescriptors = beanDescriptor.getConstraintsForProperty( "lastname" )
+ .getConstraintDescriptors();
+ assertEquals( constraintDescriptors.size(), 1, "There should be one constraint defined in xml for 'lastname'" );
+ descriptor = constraintDescriptors.iterator().next();
+ assertTrue( descriptor.getAnnotation() instanceof Pattern );
+ }
}
15 years, 3 months
Hibernate SVN: r17360 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata.
by hibernate-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2009-08-19 10:38:01 -0400 (Wed, 19 Aug 2009)
New Revision: 17360
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/ElementDescriptorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java
Log:
made sure that corresponding annottation to xml defined constratins are avialable via the BV meta data API
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java 2009-08-19 12:49:16 UTC (rev 17359)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/BeanMetaDataImpl.java 2009-08-19 14:38:01 UTC (rev 17360)
@@ -18,11 +18,13 @@
package org.hibernate.validation.metadata;
import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.security.AccessController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -31,21 +33,19 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.security.AccessController;
import javax.validation.GroupDefinitionException;
import javax.validation.GroupSequence;
import javax.validation.Valid;
-import javax.validation.ValidationException;
import javax.validation.groups.Default;
import javax.validation.metadata.BeanDescriptor;
import javax.validation.metadata.PropertyDescriptor;
import org.slf4j.Logger;
-import org.hibernate.validation.util.LoggerFactory;
-import org.hibernate.validation.util.ReflectionHelper;
import org.hibernate.validation.util.GetDeclaredFields;
import org.hibernate.validation.util.GetDeclaredMethods;
+import org.hibernate.validation.util.LoggerFactory;
+import org.hibernate.validation.util.ReflectionHelper;
import org.hibernate.validation.util.SetAccessibility;
@@ -98,7 +98,7 @@
//updated on the fly, needs to be thread safe
//property name
- private final Set<String> propertyNames = new HashSet<String>(30);
+ private final Set<String> propertyNames = new HashSet<String>( 30 );
public BeanMetaDataImpl(Class<T> beanClass, ConstraintHelper constraintHelper) {
this(
@@ -139,6 +139,7 @@
}
public void addMetaConstraint(Class<?> clazz, MetaConstraint<T, ? extends Annotation> metaConstraint) {
+ // first we add the meta constraint to our meta constraint map
List<MetaConstraint<T, ? extends Annotation>> constraintList;
if ( !metaConstraints.containsKey( clazz ) ) {
constraintList = new ArrayList<MetaConstraint<T, ? extends Annotation>>();
@@ -148,6 +149,20 @@
constraintList = metaConstraints.get( clazz );
}
constraintList.add( metaConstraint );
+
+ // but we also have to update the descriptors exposing the BV metadata API
+ if ( metaConstraint.getElementType() == ElementType.TYPE ) {
+ beanDescriptor.addConstraintDescriptor( metaConstraint.getDescriptor() );
+ }
+ else {
+ PropertyDescriptorImpl propertyDescriptor = ( PropertyDescriptorImpl ) propertyDescriptors.get(
+ metaConstraint.getPropertyName()
+ );
+ if ( propertyDescriptor == null ) {
+ propertyDescriptor = addPropertyDescriptorForMember( metaConstraint.getMember() );
+ }
+ propertyDescriptor.addConstraintDescriptor( metaConstraint.getDescriptor() );
+ }
}
public void addCascadedMember(Member member) {
@@ -275,7 +290,7 @@
continue;
}
String name = ReflectionHelper.getPropertyName( field );
- if (name != null) {
+ if ( name != null ) {
propertyNames.add( name );
}
List<ConstraintDescriptorImpl<?>> fieldMetadata = findConstraints( field );
@@ -297,7 +312,7 @@
private void setAccessibility(Member member) {
SetAccessibility action = SetAccessibility.action( member );
- if (System.getSecurityManager() != null) {
+ if ( System.getSecurityManager() != null ) {
AccessController.doPrivileged( action );
}
else {
@@ -321,7 +336,7 @@
continue;
}
String name = ReflectionHelper.getPropertyName( method );
- if (name != null) {
+ if ( name != null ) {
propertyNames.add( name );
}
@@ -430,9 +445,6 @@
for ( Annotation annotation : beanClass.getAnnotations() ) {
metadata.addAll( findConstraintAnnotations( beanClass, annotation ) );
}
- for ( ConstraintDescriptorImpl constraintDescriptor : metadata ) {
- beanDescriptor.addConstraintDescriptor( constraintDescriptor );
- }
return metadata;
}
@@ -453,19 +465,6 @@
metadata.addAll( findConstraintAnnotations( member.getDeclaringClass(), annotation ) );
}
- String name = ReflectionHelper.getPropertyName( member );
- for ( ConstraintDescriptorImpl constraintDescriptor : metadata ) {
- if ( member instanceof Method && name == null ) { // can happen if member is a Method which does not follow the bean convention
- throw new ValidationException(
- "Annotated methods must follow the JavaBeans naming convention. " + member.getName() + "() does not."
- );
- }
- PropertyDescriptorImpl propertyDescriptor = ( PropertyDescriptorImpl ) propertyDescriptors.get( name );
- if ( propertyDescriptor == null ) {
- propertyDescriptor = addPropertyDescriptorForMember( member );
- }
- propertyDescriptor.addConstraintDescriptor( constraintDescriptor );
- }
return metadata;
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/ElementDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/ElementDescriptorImpl.java 2009-08-19 12:49:16 UTC (rev 17359)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/ElementDescriptorImpl.java 2009-08-19 14:38:01 UTC (rev 17360)
@@ -43,7 +43,7 @@
this.type = type;
}
- public void addConstraintDescriptor(ConstraintDescriptorImpl constraintDescriptor) {
+ public void addConstraintDescriptor(ConstraintDescriptor constraintDescriptor) {
constraintDescriptors.add( constraintDescriptor );
}
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java 2009-08-19 12:49:16 UTC (rev 17359)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/metadata/MetaConstraint.java 2009-08-19 14:38:01 UTC (rev 17360)
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Set;
import javax.validation.ConstraintViolation;
+import javax.validation.ValidationException;
import javax.validation.metadata.ConstraintDescriptor;
import org.hibernate.validation.engine.ConstraintTree;
@@ -89,6 +90,11 @@
}
this.member = member;
this.propertyName = ReflectionHelper.getPropertyName( member );
+ if ( member instanceof Method && propertyName == null ) { // can happen if member is a Method which does not follow the bean convention
+ throw new ValidationException(
+ "Annotated methods must follow the JavaBeans naming convention. " + member.getName() + "() does not."
+ );
+ }
this.beanClass = beanClass;
constraintTree = new ConstraintTree<A>( constraintDescriptor );
}
@@ -110,6 +116,10 @@
return beanClass;
}
+ public Member getMember() {
+ return member;
+ }
+
/**
* @return The JavaBeans name of the field/property the constraint was placed on. {@code null} if this is a
* class level constraint.
15 years, 3 months
Hibernate SVN: r17359 - in beanvalidation/trunk/validation-tck/src/main: resources and 1 other directories.
by hibernate-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2009-08-19 08:49:16 -0400 (Wed, 19 Aug 2009)
New Revision: 17359
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.xml
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml
beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
xml based tests
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java (from rev 17356, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java 2009-08-19 12:49:16 UTC (rev 17359)
@@ -0,0 +1,67 @@
+// $Id: InvalidXmlConfigurationTest.java 17352 2009-08-18 17:08:59Z hardy.ferentschik $
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.hibernate.jsr303.tck.tests.xmlconfiguration;
+
+
+import javax.validation.ValidationException;
+
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+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.testharness.impl.packaging.jsr303.ValidationXml;
+import static org.testng.Assert.fail;
+import org.testng.annotations.Test;
+
+import org.hibernate.jsr303.tck.common.TCKValidationProvider;
+import org.hibernate.jsr303.tck.common.TCKValidatorConfiguration;
+import org.hibernate.jsr303.tck.util.TestUtil;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Artifact(artifactType = ArtifactType.JSR303)
+@Classes({
+ TestUtil.class,
+ TestUtil.PathImpl.class,
+ TestUtil.NodeImpl.class,
+ TCKValidationProvider.class,
+ TCKValidatorConfiguration.class,
+ TCKValidationProvider.DummyValidatorFactory.class
+})
+@ValidationXml(value = "validation-MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.xml")
+public class MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest extends AbstractTest {
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "4.4.6", id = "g"),
+ @SpecAssertion(section = "4.4.6", id = "q")
+ })
+ public void testMessageInterpolatorSpecifiedInValidationXmlHasNoDefaultConstructor() {
+ try {
+ TestUtil.getValidatorUnderTest();
+ fail( "Bootstrapping should have failed due to mising no-arg constructor in MessageInterpolator" );
+ }
+ catch ( ValidationException e ) {
+ // success
+ System.err.println( e.getMessage() );
+ }
+ }
+}
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-19 12:48:52 UTC (rev 17358)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-19 12:49:16 UTC (rev 17359)
@@ -55,7 +55,10 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.4.6", id = "a")
+ @SpecAssertion(section = "4.4.6", id = "a"),
+ @SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.2", id = "a")
})
public void testClassConstraintDefinedInXml() {
Validator validator = TestUtil.getValidatorUnderTest();
@@ -74,7 +77,10 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.4.6", id = "b")
+ @SpecAssertion(section = "4.4.6", id = "b"),
+ @SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.2", id = "a")
})
public void testIgnoreValidationXml() {
Configuration<?> config = TestUtil.getConfigurationUnderTest();
@@ -87,7 +93,10 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.4.6", id = "a")
+ @SpecAssertion(section = "4.4.6", id = "a"),
+ @SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.2", id = "a")
})
public void testPropertyConstraintDefinedInXml() {
Validator validator = TestUtil.getValidatorUnderTest();
@@ -107,7 +116,10 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.4.6", id = "a")
+ @SpecAssertion(section = "4.4.6", id = "a"),
+ @SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.2", id = "a")
})
public void testFieldConstraintDefinedInXml() {
Validator validator = TestUtil.getValidatorUnderTest();
@@ -130,7 +142,10 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.4.6", id = "a")
+ @SpecAssertion(section = "4.4.6", id = "a"),
+ @SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.2", id = "a")
})
public void testAnnotationDefinedConstraintApplies() {
Validator validator = TestUtil.getValidatorUnderTest();
@@ -152,7 +167,10 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.4.6", id = "a")
+ @SpecAssertion(section = "4.4.6", id = "a"),
+ @SpecAssertion(section = "4.4.6", id = "l"),
+ @SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.2", id = "a")
})
public void testCascadingConfiguredInXml() {
Validator validator = TestUtil.getValidatorUnderTest();
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java 2009-08-19 12:48:52 UTC (rev 17358)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java 2009-08-19 12:49:16 UTC (rev 17359)
@@ -33,4 +33,10 @@
public String interpolate(String messageTemplate, Context context, Locale locale) {
return STATIC_INTERPOLATION_STRING;
}
+
+ public class NoDefaultConstructorInterpolator extends XmlDefinedMessageInterpolator {
+ public NoDefaultConstructorInterpolator(String foo) {
+
+ }
+ }
}
Modified: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml 2009-08-19 12:48:52 UTC (rev 17358)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml 2009-08-19 12:49:16 UTC (rev 17359)
@@ -52,7 +52,7 @@
</constraint>
</getter>
</bean>
- <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.ConsistentUserInformation">
+ <constraint-definition annotation="ConsistentUserInformation">
<validated-by include-existing-validators="false">
<value>org.hibernate.jsr303.tck.tests.xmlconfiguration.CustomConsistentUserValidator</value>
</validated-by>
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.xml (from rev 17356, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MessageInterpolatorSpecifiedInValidationXmlTest.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.xml 2009-08-19 12:49:16 UTC (rev 17359)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<validation-config
+ xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd">
+ <message-interpolator>org.hibernate.jsr303.tck.tests.xmlconfiguration.XmlDefinedMessageInterpolator.NoDefaultConstructorInterpolator</message-interpolator>
+</validation-config>
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-08-19 12:48:52 UTC (rev 17358)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-08-19 12:49:16 UTC (rev 17359)
@@ -874,17 +874,17 @@
<text>More than one constraint-mapping element can be present</text>
</assertion>
<assertion id="m">
- <text>Mappings provided via Configuration.addMapping(InputString) are added to the list
+ <text>Mappings provided via Configuration.addMapping(InputStream) are added to the list
of mappings described via constraint-mapping</text>
</assertion>
- <assertion id="n">
- <text>The namespace javax.validation is reserved for use by this specification</text>
+ <assertion id="n" testable="false">
+ <text>The namespace javax.validation for properties is reserved for use by this specification</text>
</assertion>
- <assertion id="o">
+ <assertion id="o" testable="false">
<text>Properties defined via Configuration.addProperty(String, String) are added to the
properties defined via property</text>
</assertion>
- <assertion id="p">
+ <assertion id="p" testable="false">
<text>If a property with the same name are defined in both XML and via the programmatic
API, the value provided via programmatic API has priority</text>
</assertion>
@@ -1175,7 +1175,7 @@
</assertion>
<assertion id="e">
<text>If the element represents an annotation, the annotation element is used to
- represent the annotation and placed un- der element</text>
+ represent the annotation and placed under element</text>
</assertion>
<assertion id="f">
<text>If the element represents an array of annotations, one or more annotation elements
@@ -1205,7 +1205,7 @@
of ConstraintValidator evaluated</text>
</assertion>
<assertion id="d">
- <text>Annota- tion based ConstraintValidator come before XML based ConstraintValidatot
+ <text>Annotation based ConstraintValidator come before XML based ConstraintValidator
in the array</text>
</assertion>
<assertion id="e">
15 years, 3 months