Hibernate SVN: r12774 - core/trunk/testsuite/src/test/profile/hsqldb.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-16 23:34:18 -0400 (Mon, 16 Jul 2007)
New Revision: 12774
Added:
core/trunk/testsuite/src/test/profile/hsqldb/hsqldb-env.xml
Log:
Added: core/trunk/testsuite/src/test/profile/hsqldb/hsqldb-env.xml
===================================================================
--- core/trunk/testsuite/src/test/profile/hsqldb/hsqldb-env.xml (rev 0)
+++ core/trunk/testsuite/src/test/profile/hsqldb/hsqldb-env.xml 2007-07-17 03:34:18 UTC (rev 12774)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<environments>
+ <environment name="hsqldb">
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/profile/hsqldb</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>hibernate.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ </dependency>
+ </dependencies>
+ </environment>
+</environments>
\ No newline at end of file
16 years, 10 months
Hibernate SVN: r12773 - in core/trunk: cache-jbosscache and 20 other directories.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-16 23:31:57 -0400 (Mon, 16 Jul 2007)
New Revision: 12773
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-jbosscache2/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/documentation/manual/en-US/pom.xml
core/trunk/documentation/manual/es-ES/pom.xml
core/trunk/documentation/manual/fr-FR/pom.xml
core/trunk/documentation/manual/ja-JP/pom.xml
core/trunk/documentation/manual/ko-KR/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/manual/pt-BR/pom.xml
core/trunk/documentation/manual/zh-CN/pom.xml
core/trunk/documentation/pom.xml
core/trunk/documentation/tutorial/pom.xml
core/trunk/eg/pom.xml
core/trunk/jmx/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
Log:
uploading separated parent poms
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-ehcache/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,26 +3,26 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate Ehcache integration</name>
+ <name>Hibernate Ehcache Integration</name>
<description>Integration of Hibernate with Ehcache</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-jbosscache/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,26 +3,26 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate JBossCache integration</name>
+ <name>Hibernate JBossCache Integration</name>
<description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -62,4 +62,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-jbosscache2/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,31 +3,31 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache2</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate JBossCache2.x integration</name>
+ <name>Hibernate JBossCache2.x Integration</name>
<description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-cache</artifactId>
- <!-- does not work with idea plugin :(
+ <!-- I'd prefer this, at least until we get a GA...
<version>[2.0.0.BETA2,)</version>
-->
<version>2.0.0.BETA2</version>
@@ -38,16 +38,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <jdkName>1.5</jdkName>
- <jdkLevel>5.0</jdkLevel>
- <!-- why this isnt the default I have no clue -->
- <linkModules>true</linkModules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -57,4 +47,4 @@
</plugins>
</build>
-</project>
+</project>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-oscache/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,26 +3,26 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-oscache</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate OSCache integration</name>
+ <name>Hibernate OSCache Integration</name>
<description>Integration of Hibernate with OSCache</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/cache-swarmcache/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,26 +3,26 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-swarmcache</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Hibernate SwarmCache integration</name>
+ <name>Hibernate SwarmCache Integration</name>
<description>Integration of Hibernate with SwarmCache</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>swarmcache</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/connection-c3p0/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,17 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate C3P0 ConnectionProvider</name>
<description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
@@ -21,8 +21,8 @@
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>c3p0</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/connection-proxool/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,17 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-proxool</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate Proxool ConnectionProvider</name>
<description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
@@ -21,8 +21,8 @@
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>proxool</groupId>
@@ -31,4 +31,4 @@
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/core/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -2,17 +2,17 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Core</name>
@@ -32,7 +32,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
Modified: core/trunk/documentation/manual/en-US/pom.xml
===================================================================
--- core/trunk/documentation/manual/en-US/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/en-US/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,61 +3,21 @@
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-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>docbook</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-docbook-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>com.redhat</groupId>
- <artifactId>docbook-xslt</artifactId>
- <version>0.1</version>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>/standard/fopdf.xsl</stylesheetResource>
- <finalName>Hibernate_Reference.pdf</finalName>
- </format>
- <format>
- <formatName>eclipse</formatName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>/standard/html.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>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<properties>
<translation>en-US</translation>
</properties>
Modified: core/trunk/documentation/manual/es-ES/pom.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/es-ES/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>es-ES</translation>
Modified: core/trunk/documentation/manual/fr-FR/pom.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/fr-FR/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,19 +3,23 @@
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-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>fr-FR</translation>
</properties>
+
</project>
Modified: core/trunk/documentation/manual/ja-JP/pom.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/ja-JP/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>ja-JP</translation>
Modified: core/trunk/documentation/manual/ko-KR/pom.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/ko-KR/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>ko-KR</translation>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,86 +3,24 @@
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-documentation</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Hibernate Manual</name>
- <description>The Hibernate reference manual</description>
+ <name>Hibernate Manual (aggregator)</name>
+ <description>The Hibernate reference manual (aggregator)</description>
+
<modules>
<module>en-US</module>
<module>fr-FR</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-docbook-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-docbook-xslt</artifactId>
- <version>0.1</version>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>/standard/fopdf.xsl</stylesheetResource>
- <finalName>hibernate_reference.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>/standard/html.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <xincludeSupported>true</xincludeSupported>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <transformerParameters>
- <property>
- <name>custom.titlepage.img</name>
- <value>${basedir}/src/main/resources/shared/images/hibernate_logo_a.png</value>
- </property>
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-<!-- report plugin is currently hosed
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugin</groupId>
- <artifactId>jboss-docbook-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
--->
- <properties>
- <masterTranslation>en-US</masterTranslation>
- </properties>
-
</project>
Modified: core/trunk/documentation/manual/pt-BR/pom.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/pt-BR/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>.../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>pt-BR</translation>
Modified: core/trunk/documentation/manual/zh-CN/pom.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/manual/zh-CN/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,20 @@
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-manual</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
<name>Hibernate Manual (${translation})</name>
+ <description>The Hibernate reference manual (${translation})</description>
<properties>
<translation>zh-CN</translation>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,18 +3,19 @@
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.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-documentation</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <name>Hibernate Core - Documentation</name>
+
+ <name>Hibernate Core - Documentation</name>
<description>Grouping of Hibernate Core Project documentation modules</description>
<modules>
Modified: core/trunk/documentation/tutorial/pom.xml
===================================================================
--- core/trunk/documentation/tutorial/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/documentation/tutorial/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,18 @@
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-documentation</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorial</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>war</packaging>
+
<name>Hibernate Tutorial</name>
<description>A tutorial project showcasing Hibernate usage</description>
@@ -21,7 +22,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: core/trunk/eg/pom.xml
===================================================================
--- core/trunk/eg/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/eg/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -5,16 +5,16 @@
<modelVersion>4.0.0</modelVersion>
<!-- todo : this module should eventually make its way over to documentation/tutorial -->
-
+
<parent>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-eg</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Hibernate Example</name>
@@ -24,7 +24,7 @@
<dependency>
<groupId>${groupId}</groupId>
<artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/jmx/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,27 +3,31 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jmx</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate JMX Module</name>
- <description>Defines Hibernate JMX functionality</description>
+ <description>Defines Hibernate JMX capabilities</description>
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/testing/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,17 +3,17 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate Testing</name>
<description>Hibernate JUnit test utilities</description>
@@ -21,16 +21,15 @@
<dependencies>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<!-- here we need to pull JUnit deps into compile scope... -->
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
+</project>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2007-07-17 03:15:53 UTC (rev 12772)
+++ core/trunk/testsuite/pom.xml 2007-07-17 03:31:57 UTC (rev 12773)
@@ -3,76 +3,80 @@
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-code</artifactId>
- <version>3.3.0.beta1</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
</parent>
-
+
<groupId>org.hibernate</groupId>
<artifactId>hibernate-testsuite</artifactId>
- <packaging>jar</packaging>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Hibernate Testsuite</name>
<description>The testsuite of Hibernate functionality</description>
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.core.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-testing</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-testing</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-jbosscache</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-oscache</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-jbosscache</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>hibernate-swarmcache</artifactId>
- <version>${hibernate.core.version}</version>
+ <artifactId>hibernate-oscache</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.11</version>
+ <groupId>${groupId}</groupId>
+ <artifactId>hibernate-swarmcache</artifactId>
+ <version>${version}</version>
</dependency>
<!-- these are optional on core... :( -->
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.4.GA</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.1_3</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-attrs</artifactId>
<version>1.5.3</version>
- <optional>true</optional>
- </dependency>
+ </dependency>
<!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
<dependency>
<groupId>jaxen</groupId>
@@ -95,8 +99,21 @@
<directory>src/test/resources</directory>
</testResource>
</testResources>
+
<plugins>
<plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-test-ext-plugin</artifactId>
+ <version>1.0.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>extend</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -111,28 +128,9 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>hsqldb</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/profile/hsqldb</directory>
- </testResource>
- </testResources>
- </build>
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <properties>
+ <test.extender.cfg>${basedir}/src/test/profile/hsqldb/hsqldb-env.xml</test.extender.cfg>
+ <test.extender.env>hsqldb</test.extender.env>
+ </properties>
-</project>
+</project>
16 years, 10 months
Hibernate SVN: r12772 - core/trunk.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-16 23:15:53 -0400 (Mon, 16 Jul 2007)
New Revision: 12772
Removed:
core/trunk/code/
Log:
splitting code back out into individual modules (found better way to isolate documentation)
16 years, 10 months
Hibernate SVN: r12771 - in core/trunk: code and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-16 23:15:03 -0400 (Mon, 16 Jul 2007)
New Revision: 12771
Added:
core/trunk/cache-ehcache/
core/trunk/cache-jbosscache/
core/trunk/cache-jbosscache2/
core/trunk/cache-oscache/
core/trunk/cache-swarmcache/
core/trunk/connection-c3p0/
core/trunk/connection-proxool/
core/trunk/core/
core/trunk/eg/
core/trunk/jmx/
core/trunk/testing/
core/trunk/testsuite/
Removed:
core/trunk/code/cache-ehcache/
core/trunk/code/cache-jbosscache/
core/trunk/code/cache-jbosscache2/
core/trunk/code/cache-oscache/
core/trunk/code/cache-swarmcache/
core/trunk/code/connection-c3p0/
core/trunk/code/connection-proxool/
core/trunk/code/core/
core/trunk/code/eg/
core/trunk/code/jmx/
core/trunk/code/testing/
core/trunk/code/testsuite/
Modified:
core/trunk/pom.xml
Log:
splitting code back out into individual modules (found better way to isolate documentation)
Copied: core/trunk/cache-ehcache (from rev 12727, core/trunk/code/cache-ehcache)
Copied: core/trunk/cache-jbosscache (from rev 12727, core/trunk/code/cache-jbosscache)
Copied: core/trunk/cache-jbosscache2 (from rev 12727, core/trunk/code/cache-jbosscache2)
Copied: core/trunk/cache-oscache (from rev 12727, core/trunk/code/cache-oscache)
Copied: core/trunk/cache-swarmcache (from rev 12727, core/trunk/code/cache-swarmcache)
Copied: core/trunk/connection-c3p0 (from rev 12727, core/trunk/code/connection-c3p0)
Copied: core/trunk/connection-proxool (from rev 12727, core/trunk/code/connection-proxool)
Copied: core/trunk/core (from rev 12770, core/trunk/code/core)
Copied: core/trunk/eg (from rev 12727, core/trunk/code/eg)
Copied: core/trunk/jmx (from rev 12727, core/trunk/code/jmx)
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2007-07-17 03:06:57 UTC (rev 12770)
+++ core/trunk/pom.xml 2007-07-17 03:15:03 UTC (rev 12771)
@@ -4,88 +4,57 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-parent</artifactId>
+ <artifactId>hibernate</artifactId>
<packaging>pom</packaging>
- <version>3.3.0.beta1</version>
+ <version>3.3.0-SNAPSHOT</version>
- <name>Hibernate Parent</name>
- <description>The parent POM for all Hibernate Core modules.</description>
- <url>http://hibernate.org</url>
+ <name>Hibernate Core Aggregator</name>
+ <description>Aggregator of the Hibernate Core modules.</description>
- <issueManagement>
- <system>jira</system>
- <url>http://opensource.atlassian.com/projects/hibernate/browse/HHH</url>
- </issueManagement>
-
- <ciManagement>
- <system>cruisecontrol</system>
- <url>http://cruisecontrol.jboss.com/cc/</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <address>hibernate-dev(a)lists.jboss.org</address>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <mailingLists>
- <mailingList>
- <name>Hibernate Announcements</name>
- <post>hibernate-announce(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Hibernate Commit Notificatons</name>
- <post>hibernate-commits(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archive>
- </mailingList>
- <mailingList>
- <name>Hibernate Developers</name>
- <post>hibernate-dev(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.org/index.html</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Hibernate Issue Notifications</name>
- <post>hibernate-issues(a)lists.jboss.org</post>
- <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</subscribe>
- <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</unsubscribe>
- <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive>
- </mailingList>
- </mailingLists>
-
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/copyleft/lesser.html</url>
- <comments>See discussion at http://hibernate.org/356.html for more details.</comments>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/</developerConnection>
- <tag></tag>
- <url>http://fisheye.jboss.com/viewrep/Hibernate</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>
<modules>
- <module>code</module>
+ <module>core</module>
+ <module>cache-ehcache</module>
+ <module>cache-jbosscache</module>
+ <module>cache-jbosscache2</module>
+ <module>cache-oscache</module>
+ <module>cache-swarmcache</module>
+ <module>connection-c3p0</module>
+ <module>connection-proxool</module>
+ <module>jmx</module>
+ <module>testing</module>
+ <module>testsuite</module>
+ <module>eg</module>
+<!-- Need to scope bytecode providers first
+ <module>bytecode-cglib</module>
+ <module>bytecode-javassist</module>
+-->
<module>documentation</module>
</modules>
-
- <properties>
- <hibernate.core.version>${version}</hibernate.core.version>
- </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-6</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
-</project>
+</project>
Copied: core/trunk/testing (from rev 12727, core/trunk/code/testing)
Copied: core/trunk/testsuite (from rev 12770, core/trunk/code/testsuite)
16 years, 10 months
Hibernate SVN: r12770 - in maven-poms/trunk: core-manual-parent and 1 other directories.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-16 23:06:57 -0400 (Mon, 16 Jul 2007)
New Revision: 12770
Added:
maven-poms/trunk/core-manual-parent/
maven-poms/trunk/core-manual-parent/pom.xml
maven-poms/trunk/core-parent/
maven-poms/trunk/core-parent/pom.xml
Log:
uploading separated parent poms
Added: maven-poms/trunk/core-manual-parent/pom.xml
===================================================================
--- maven-poms/trunk/core-manual-parent/pom.xml (rev 0)
+++ maven-poms/trunk/core-manual-parent/pom.xml 2007-07-17 03:06:57 UTC (rev 12770)
@@ -0,0 +1,61 @@
+<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-core-parent</artifactId>
+ <version>1</version>
+ <relativePath>../core-parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-manual-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+ <name>Hibernate Core Manual Parent</name>
+ <description>Parent POM for the Hibernate Core reference manual modules</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.0.0</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-docbook-xslt</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource>
+ <finalName>hibernate_reference.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>false</xincludeSupported>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <masterTranslation>en-US</masterTranslation>
+ </properties>
+
+</project>
Added: maven-poms/trunk/core-parent/pom.xml
===================================================================
--- maven-poms/trunk/core-parent/pom.xml (rev 0)
+++ maven-poms/trunk/core-parent/pom.xml 2007-07-17 03:06:57 UTC (rev 12770)
@@ -0,0 +1,201 @@
+<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-core-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+
+ <name>Hibernate Core Parent</name>
+ <description>The parent POM for all Hibernate Core modules.</description>
+ <url>http://hibernate.org</url>
+
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/copyleft/lesser.html</url>
+ <comments>See discussion at http://hibernate.org/356.html for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <!-- todo : make sure these get updated to point at the real svn repo -->
+ <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>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://opensource.atlassian.com/projects/hibernate/browse/HHH</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>cruisecontrol</system>
+ <url>http://cruisecontrol.jboss.com/cc/</url>
+ <notifiers>
+ <notifier>
+ <type>mail</type>
+ <address>hibernate-dev(a)lists.jboss.org</address>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>Hibernate Announcements</name>
+ <post>hibernate-announce(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Hibernate Commit Notificatons</name>
+ <post>hibernate-commits(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Hibernate Developers</name>
+ <post>hibernate-dev(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.org/index.html</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Hibernate Issue Notifications</name>
+ <post>hibernate-issues(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <build>
+ <plugins>
+ <!-- require at least JDK 1.5 to run the build -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[1.5,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- but, by default, compile to JDK 1.4 compatibility (individual modules and/or user can override) -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <!-- Not really caring about reporting plugin versions; I think this is ok??? -->
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>${hibernate.core.reports.aggregate}</aggregate>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>${hibernate.core.reports.aggregate}</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <aggregate>${hibernate.core.reports.aggregate}</aggregate>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.4</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <configuration>
+ <aggregate>${hibernate.core.reports.aggregate}</aggregate>
+ <tags>
+ <tag>@FIXME</tag>
+ <tag>@fixme</tag>
+ <tag>FIXME</tag>
+ <tag>fixme</tag>
+ <tag>@TODO</tag>
+ <tag>@todo</tag>
+ <tag>TODO</tag>
+ <tag>todo</tag>
+ </tags>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- Note: aggregate-able, may cause problems if we aggregate jxr and not this because of the xref links -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <properties>
+ <!-- for now, at least, lets aggregate them -->
+ <hibernate.core.reports.aggregate>true</hibernate.core.reports.aggregate>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.11</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
16 years, 10 months
Hibernate SVN: r12769 - maven-poms.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-16 23:02:01 -0400 (Mon, 16 Jul 2007)
New Revision: 12769
Added:
maven-poms/trunk/
Log:
uploading separated parent poms
16 years, 10 months
Hibernate SVN: r12768 - /.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-16 23:01:22 -0400 (Mon, 16 Jul 2007)
New Revision: 12768
Added:
maven-poms/
Log:
uploading separated parent poms
16 years, 10 months
Hibernate SVN: r12767 - core/trunk/documentation/manual/es-ES/src/main/docbook/modules and 6 other directories.
by hibernate-commits@lists.jboss.org
Author: d.plentz
Date: 2007-07-16 00:18:27 -0400 (Mon, 16 Jul 2007)
New Revision: 12767
Modified:
core/trunk/documentation/manual/en-US/src/main/docbook/modules/collection_mapping.xml
core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/en-US/src/main/docbook/modules/transactions.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/collection_mapping.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/transactions.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/collection_mapping.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/transactions.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/collection_mapping.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/transactions.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/collection_mapping.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/transactions.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/collection_mapping.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/transactions.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/collection_mapping.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/transactions.xml
trunk/HibernateExt/entitymanager/doc/reference/en/modules/entitymanagerapi.xml
Log:
[HHH-2714] Three typos in code examples
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/collection_mapping.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/collection_mapping.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -830,7 +830,7 @@
</class>
<class name="Item">
- <id name="id" column="CATEGORY_ID"/>
+ <id name="id" column="ITEM_ID"/>
...
<!-- inverse end -->
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -312,8 +312,8 @@
while ( kittensAndMothers.hasNext() ) {
Object[] tuple = (Object[]) kittensAndMothers.next();
- Cat kitten = tuple[0];
- Cat mother = tuple[1];
+ Cat kitten = (Cat) tuple[0];
+ Cat mother = (Cat) tuple[1];
....
}]]></programlisting>
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/transactions.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/transactions.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/transactions.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -735,7 +735,7 @@
int oldVersion = foo.getVersion();
session.load( foo, foo.getKey() ); // load the current state
-if ( oldVersion!=foo.getVersion ) throw new StaleObjectStateException();
+if ( oldVersion != foo.getVersion() ) throw new StaleObjectStateException();
foo.setProperty("bar");
t.commit();
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/collection_mapping.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/collection_mapping.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -838,7 +838,7 @@
</class>
<class name="Item">
- <id name="id" column="CATEGORY_ID"/>
+ <id name="id" column="ITEM_ID"/>
...
<!-- inverse end -->
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/session_api.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/session_api.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -309,8 +309,8 @@
while ( kittensAndMothers.hasNext() ) {
Object[] tuple = (Object[]) kittensAndMothers.next();
- Cat kitten = tuple[0];
- Cat mother = tuple[1];
+ Cat kitten = (Cat) tuple[0];
+ Cat mother = (Cat) tuple[1];
....
}]]></programlisting>
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/transactions.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/transactions.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/transactions.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -653,7 +653,7 @@
Transaction t = session.beginTransaction();
int oldVersion = foo.getVersion();
session.load( foo, foo.getKey() ); // load the current state
-if ( oldVersion!=foo.getVersion ) throw new StaleObjectStateException();
+if ( oldVersion != foo.getVersion() ) throw new StaleObjectStateException();
foo.setProperty("bar");
t.commit();
session.close();]]></programlisting>
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/collection_mapping.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/collection_mapping.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -814,7 +814,7 @@
</class>
<class name="Item">
- <id name="id" column="CATEGORY_ID"/>
+ <id name="id" column="ITEM_ID"/>
...
<!-- inverse end -->
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/session_api.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/session_api.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -305,8 +305,8 @@
while ( kittensAndMothers.hasNext() ) {
Object[] tuple = (Object[]) kittensAndMothers.next();
- Cat kitten = tuple[0];
- Cat mother = tuple[1];
+ Cat kitten = (Cat) tuple[0];
+ Cat mother = (Cat) tuple[1];
....
}]]></programlisting>
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/transactions.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/transactions.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/transactions.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -713,7 +713,7 @@
int oldVersion = foo.getVersion();
session.load( foo, foo.getKey() ); // Charger l'�tat courant
- if ( oldVersion!=foo.getVersion )
+ if ( oldVersion != foo.getVersion() )
throw new StaleObjectStateException();
foo.setProperty("bar");
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/collection_mapping.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/collection_mapping.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -830,7 +830,7 @@
</class>
<class name="Item">
- <id name="id" column="CATEGORY_ID"/>
+ <id name="id" column="ITEM_ID"/>
...
<!-- inverse end -->
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/session_api.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/session_api.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -298,8 +298,8 @@
while ( kittensAndMothers.hasNext() ) {
Object[] tuple = (Object[]) kittensAndMothers.next();
- Cat kitten = tuple[0];
- Cat mother = tuple[1];
+ Cat kitten = (Cat) tuple[0];
+ Cat mother = (Cat) tuple[1];
....
}]]></programlisting>
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/transactions.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/transactions.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/transactions.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -858,7 +858,7 @@
int oldVersion = foo.getVersion();
session.load( foo, foo.getKey() ); // load the current state
-if ( oldVersion!=foo.getVersion ) throw new StaleObjectStateException();
+if ( oldVersion != foo.getVersion() ) throw new StaleObjectStateException();
foo.setProperty("bar");
t.commit();
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/collection_mapping.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/collection_mapping.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -777,7 +777,7 @@
</class>
<class name="Item">
- <id name="id" column="CATEGORY_ID"/>
+ <id name="id" column="ITEM_ID"/>
...
<!-- inverse end -->
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/session_api.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/session_api.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -276,8 +276,8 @@
while ( kittensAndMothers.hasNext() ) {
Object[] tuple = (Object[]) kittensAndMothers.next();
- Cat kitten = tuple[0];
- Cat mother = tuple[1];
+ Cat kitten = (Cat) tuple[0];
+ Cat mother = (Cat) tuple[1];
....
}]]></programlisting>
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/transactions.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/transactions.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/transactions.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -659,7 +659,7 @@
int oldVersion = foo.getVersion();
session.load( foo, foo.getKey() ); // load the current state
-if ( oldVersion!=foo.getVersion ) throw new StaleObjectStateException();
+if ( oldVersion != foo.getVersion() ) throw new StaleObjectStateException();
foo.setProperty("bar");
t.commit();
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/collection_mapping.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/collection_mapping.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -830,7 +830,7 @@
</class>
<class name="Item">
- <id name="id" column="CATEGORY_ID"/>
+ <id name="id" column="ITEM_ID"/>
...
<!-- inverse end -->
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -319,8 +319,8 @@
while ( kittensAndMothers.hasNext() ) {
Object[] tuple = (Object[]) kittensAndMothers.next();
- Cat kitten = tuple[0];
- Cat mother = tuple[1];
+ Cat kitten = (Cat) tuple[0];
+ Cat mother = (Cat) tuple[1];
....
}]]></programlisting>
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/transactions.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/transactions.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/transactions.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -756,7 +756,7 @@
int oldVersion = foo.getVersion();
session.load( foo, foo.getKey() ); // load the current state
-if ( oldVersion!=foo.getVersion ) throw new StaleObjectStateException();
+if ( oldVersion != foo.getVersion() ) throw new StaleObjectStateException();
foo.setProperty("bar");
t.commit();
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/collection_mapping.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/collection_mapping.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -722,7 +722,7 @@
</class>
<class name="Item">
- <id name="id" column="CATEGORY_ID"/>
+ <id name="id" column="ITEM_ID"/>
...
<!-- inverse end -->
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/session_api.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/session_api.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -274,8 +274,8 @@
while ( kittensAndMothers.hasNext() ) {
Object[] tuple = (Object[]) kittensAndMothers.next();
- Cat kitten = tuple[0];
- Cat mother = tuple[1];
+ Cat kitten = (Cat) tuple[0];
+ Cat mother = (Cat) tuple[1];
....
}]]></programlisting>
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/transactions.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/transactions.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/transactions.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -566,7 +566,7 @@
int oldVersion = foo.getVersion();
session.load( foo, foo.getKey() ); // load the current state
-if ( oldVersion!=foo.getVersion ) throw new StaleObjectStateException();
+if ( oldVersion != foo.getVersion() ) throw new StaleObjectStateException();
foo.setProperty("bar");
t.commit();
Modified: trunk/HibernateExt/entitymanager/doc/reference/en/modules/entitymanagerapi.xml
===================================================================
--- trunk/HibernateExt/entitymanager/doc/reference/en/modules/entitymanagerapi.xml 2007-07-16 02:20:28 UTC (rev 12766)
+++ trunk/HibernateExt/entitymanager/doc/reference/en/modules/entitymanagerapi.xml 2007-07-16 04:18:27 UTC (rev 12767)
@@ -159,8 +159,8 @@
while ( kittensAndMothers.hasNext() ) {
Object[] tuple = (Object[]) kittensAndMothers.next();
- Cat kitten = tuple[0];
- Cat mother = tuple[1];
+ Cat kitten = (Cat) tuple[0];
+ Cat mother = (Cat) tuple[1];
....
}</programlisting>
</section>
16 years, 10 months
Hibernate SVN: r12766 - in trunk/HibernateExt/validator/src: test/org/hibernate/validator/test and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: d.plentz
Date: 2007-07-15 22:20:28 -0400 (Sun, 15 Jul 2007)
New Revision: 12766
Modified:
trunk/HibernateExt/validator/src/java/org/hibernate/validator/EmailValidator.java
trunk/HibernateExt/validator/src/test/org/hibernate/validator/test/EmailTest.java
Log:
[HV-14] Minor typo in regular expression in class EmailValidator
Modified: trunk/HibernateExt/validator/src/java/org/hibernate/validator/EmailValidator.java
===================================================================
--- trunk/HibernateExt/validator/src/java/org/hibernate/validator/EmailValidator.java 2007-07-16 00:36:41 UTC (rev 12765)
+++ trunk/HibernateExt/validator/src/java/org/hibernate/validator/EmailValidator.java 2007-07-16 02:20:28 UTC (rev 12766)
@@ -10,7 +10,8 @@
* @author Emmanuel Bernard
*/
public class EmailValidator implements Validator<Email>, Serializable {
- private static String ATOM = "[^\\x00-\\x1F^\\(^\\)^\\<^\\>^\\@^\\,^\\(;^\\:^\\\\^\\\"^\\.^\\[^\\]^\\s]";
+ //TODO: Implement this http://www.ex-parrot.com/~pdw/Mail-RFC822-Address.html regex in java
+ private static String ATOM = "[^\\x00-\\x1F^\\(^\\)^\\<^\\>^\\@^\\,^\\;^\\:^\\\\^\\\"^\\.^\\[^\\]^\\s]";
private static String DOMAIN = "(" + ATOM + "+(\\." + ATOM + "+)*";
private static String IP_DOMAIN = "\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\]";
@@ -20,17 +21,13 @@
if ( value == null ) return true;
if ( !( value instanceof String ) ) return false;
String string = (String) value;
- if ( string.length() == 0 ) return true;
- Matcher m = pattern.matcher( string );
+ if ( string.length() == 0 ) return true;
+ Matcher m = pattern.matcher( string );
return m.matches();
}
public void initialize(Email parameters) {
pattern = java.util.regex.Pattern.compile(
- "^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*(a)[A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*$",
- java.util.regex.Pattern.CASE_INSENSITIVE
- );
- pattern = java.util.regex.Pattern.compile(
"^" + ATOM + "+(\\." + ATOM + "+)*@"
+ DOMAIN
+ "|"
Modified: trunk/HibernateExt/validator/src/test/org/hibernate/validator/test/EmailTest.java
===================================================================
--- trunk/HibernateExt/validator/src/test/org/hibernate/validator/test/EmailTest.java 2007-07-16 00:36:41 UTC (rev 12765)
+++ trunk/HibernateExt/validator/src/test/org/hibernate/validator/test/EmailTest.java 2007-07-16 02:20:28 UTC (rev 12766)
@@ -11,29 +11,28 @@
private ClassValidator<User> userValidator;
public void testEmail() throws Exception {
- userValidator = new ClassValidator<User>( User.class );
- isRightEmail( "emmanuel(a)hibernate.org" );
- isRightEmail( "" );
- isRightEmail( null );
- isWrongEmail( "emmanuel.hibernate.org" );
- isRightEmail( "emmanuel@hibernate" );
- isRightEmail( "emma-n_uel@hibernate" );
- isWrongEmail( "emma nuel(a)hibernate.org" );
- isWrongEmail( "emma(nuel(a)hibernate.org" );
- isWrongEmail( "emmanuel@" );
- isRightEmail( "emma+nuel(a)hibernate.org" );
- isRightEmail( "emma=nuel(a)hibernate.org" );
- isWrongEmail( "emma\nnuel(a)hibernate.org" );
- isWrongEmail( "emma@nuel(a)hibernate.org" );
- isRightEmail( "emmanuel(a)[123.12.2.11]" );
+ userValidator = new ClassValidator<User>(User.class);
+ isRightEmail("emmanuel(a)hibernate.org");
+ isRightEmail("");
+ isRightEmail(null);
+ isRightEmail("emmanuel@hibernate");
+ isRightEmail("emma-n_uel@hibernate");
+ isRightEmail("emma+nuel(a)hibernate.org");
+ isRightEmail("emma=nuel(a)hibernate.org");
+ isRightEmail("emmanuel(a)[123.12.2.11]");
+ isWrongEmail("emmanuel.hibernate.org");
+ isWrongEmail("emma nuel(a)hibernate.org");
+ isWrongEmail("emma(nuel(a)hibernate.org");
+ isWrongEmail("emmanuel@");
+ isWrongEmail("emma\nnuel(a)hibernate.org");
+ isWrongEmail("emma@nuel(a)hibernate.org");
}
private void isRightEmail(String email) {
- assertEquals( "Wrong email", 0, userValidator.getPotentialInvalidValues( "email", email ).length );
+ assertEquals("Wrong email", 0, userValidator.getPotentialInvalidValues("email", email).length);
}
private void isWrongEmail(String email) {
- assertEquals( "Right email", 1, userValidator.getPotentialInvalidValues( "email", email ).length );
- ;
+ assertEquals("Right email", 1, userValidator.getPotentialInvalidValues("email", email).length);
}
}
16 years, 10 months
Hibernate SVN: r12765 - in core/trunk/documentation/manual: es-ES/src/main/docbook/modules and 5 other directories.
by hibernate-commits@lists.jboss.org
Author: d.plentz
Date: 2007-07-15 20:36:41 -0400 (Sun, 15 Jul 2007)
New Revision: 12765
Modified:
core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/session_api.xml
Log:
[HHH-1694] Documentation Outdated: "10.4.4. Queries in native SQL"
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml 2007-07-13 18:44:05 UTC (rev 12764)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml 2007-07-16 00:36:41 UTC (rev 12765)
@@ -572,19 +572,16 @@
Hibernate API, you must enclose SQL aliases in braces:
</para>
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list();]]></programlisting>
+ <programlisting><![CDATA[List cats = session.createSQLQuery("SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list();]]></programlisting>
<programlisting><![CDATA[List cats = session.createSQLQuery(
"SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
"{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
- "FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list()]]></programlisting>
+ "FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list()]]></programlisting>
<para>
SQL queries may contain named and positional parameters, just like Hibernate queries.
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/session_api.xml 2007-07-13 18:44:05 UTC (rev 12764)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/session_api.xml 2007-07-16 00:36:41 UTC (rev 12765)
@@ -564,19 +564,16 @@
Hibernate, debes encerrar los alias de SQL entre llaves:
</para>
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list();]]></programlisting>
-
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
- "{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
- "FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list()]]></programlisting>
+ <programlisting><![CDATA[List cats = session.createSQLQuery("SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list();]]></programlisting>
+
+ <programlisting><![CDATA[List cats = session.createSQLQuery(
+ "SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
+ "{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
+ "FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list()]]></programlisting>
<para>
Las consultas SQL pueden contener parámetros con nombre y posicionales, al igual que
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/session_api.xml 2007-07-13 18:44:05 UTC (rev 12764)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/session_api.xml 2007-07-16 00:36:41 UTC (rev 12765)
@@ -558,20 +558,17 @@
l'API Hibernate, vous devez mettre les alias SQL entre accolades :
</para>
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list();]]></programlisting>
+ <programlisting><![CDATA[List cats = session.createSQLQuery("SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list();]]></programlisting>
+
+ <programlisting><![CDATA[List cats = session.createSQLQuery(
+ "SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
+ "{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
+ "FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list()]]></programlisting>
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
- "{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
- "FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list()]]></programlisting>
-
<para>
Les requ�tes SQL peuvent contenir des param�tres nomm�s et positionnels, comme des
requ�tes Hibernate. Plus d'informations � propos des requ�tes SQL natives dans Hibernate
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/session_api.xml 2007-07-13 18:44:05 UTC (rev 12764)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/session_api.xml 2007-07-16 00:36:41 UTC (rev 12765)
@@ -537,21 +537,16 @@
<literal>Connection</literal> ��g�p�ł��邱�Ƃ�o���Ă����܂��傤�B ����AHibernate
API��g���̂ł���A���L�̂悤��SQL�̕ʖ����ʂł�����Ȃ���Ȃ�܂���B </para>
-
+ <programlisting><![CDATA[List cats = session.createSQLQuery("SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list();]]></programlisting>
+
<programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list();]]></programlisting>
-
-
- <programlisting><![CDATA[List cats = session.createSQLQuery(
"SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
"{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
- "FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list()]]></programlisting>
+ "FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list()]]></programlisting>
<para>
SQL�N�G���́AHibernate�N�G���Ɠ����悤�ɁA���O�t���̃p�����[�^�ƈʒu�p�����[�^�����Ƃ��ł��܂��B
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/session_api.xml 2007-07-13 18:44:05 UTC (rev 12764)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/session_api.xml 2007-07-16 00:36:41 UTC (rev 12765)
@@ -523,19 +523,16 @@
중괄호들 속에 포함시켜야 한다:
</para>
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list();]]></programlisting>
-
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
- "{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
- "FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list()]]></programlisting>
+ <programlisting><![CDATA[List cats = session.createSQLQuery("SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list();]]></programlisting>
+
+ <programlisting><![CDATA[List cats = session.createSQLQuery(
+ "SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
+ "{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
+ "FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list()]]></programlisting>
<para>
SQL 질의들은 Hibernate 질의들처럼 명명된 파라미터들과 위치 파라미터들을 포함할 수도 있다. SQL 질의들에 대한
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml 2007-07-13 18:44:05 UTC (rev 12764)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml 2007-07-16 00:36:41 UTC (rev 12765)
@@ -580,19 +580,16 @@
Hibernate API, you must enclose SQL aliases in braces:
</para>
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list();]]></programlisting>
+ <programlisting><![CDATA[List cats = session.createSQLQuery("SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list();]]></programlisting>
<programlisting><![CDATA[List cats = session.createSQLQuery(
"SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
"{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
- "FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list()]]></programlisting>
+ "FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list()]]></programlisting>
<para>
SQL queries may contain named and positional parameters, just like Hibernate queries.
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/session_api.xml 2007-07-13 18:44:05 UTC (rev 12764)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/session_api.xml 2007-07-16 00:36:41 UTC (rev 12765)
@@ -517,21 +517,17 @@
如果你选择使用Hibernate的API, 你必须把SQL别名用大括号包围起来:
</para>
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list();]]></programlisting>
-
- <programlisting><![CDATA[List cats = session.createSQLQuery(
- "SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
- "{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
- "FROM CAT {cat} WHERE ROWNUM<10",
- "cat",
- Cat.class
-).list()]]></programlisting>
+ <programlisting><![CDATA[List cats = session.createSQLQuery("SELECT {cat.*} FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list();]]></programlisting>
+
+ <programlisting><![CDATA[List cats = session.createSQLQuery(
+ "SELECT {cat}.ID AS {cat.id}, {cat}.SEX AS {cat.sex}, " +
+ "{cat}.MATE AS {cat.mate}, {cat}.SUBCLASS AS {cat.class}, ... " +
+ "FROM CAT {cat} WHERE ROWNUM<10")
+ .addEntity("cat", Cat.class)
+.list()]]></programlisting>
-
<para>
和Hibernate查询一样,SQL查询也可以包含命名参数和占位参数。
可以在<xref linkend="querysql"/>找到更多关于Hibernate中原生SQL(native SQL)的信息。
16 years, 10 months