[hibernate-commits] Hibernate SVN: r14545 - in core/trunk: cache-ehcache and 23 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Fri Apr 18 14:19:52 EDT 2008


Author: steve.ebersole at jboss.com
Date: 2008-04-18 14:19:51 -0400 (Fri, 18 Apr 2008)
New Revision: 14545

Added:
   core/trunk/distribution/
   core/trunk/distribution/pom.xml
   core/trunk/distribution/src/
   core/trunk/distribution/src/assembly/
   core/trunk/distribution/src/assembly/dist.xml
   core/trunk/distribution/src/assembly/hibernate-all.xml
   core/trunk/distribution/src/site/
   core/trunk/distribution/src/site/apt/
   core/trunk/distribution/src/site/apt/documentation.apt
   core/trunk/distribution/src/site/apt/index.apt
   core/trunk/distribution/src/site/resources/
   core/trunk/distribution/src/site/resources/css/
   core/trunk/distribution/src/site/resources/css/site.css
   core/trunk/distribution/src/site/resources/images/
   core/trunk/distribution/src/site/resources/images/favicon.ico
   core/trunk/distribution/src/site/resources/images/hibernate_icon.png
   core/trunk/distribution/src/site/resources/images/hibernate_logo.png
   core/trunk/distribution/src/site/resources/images/maven-button-4.png
   core/trunk/distribution/src/site/site.xml
   core/trunk/parent/
   core/trunk/parent/pom.xml
Removed:
   core/trunk/src/
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/jbosscache2/pom.xml
   core/trunk/documentation/manual/pom.xml
   core/trunk/documentation/pom.xml
   core/trunk/jmx/pom.xml
   core/trunk/pom.xml
   core/trunk/testing/pom.xml
   core/trunk/testsuite/pom.xml
   core/trunk/tutorials/pom.xml
Log:
try incorporating assembly ; take 2

Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/cache-ehcache/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-ehcache</artifactId>
     <packaging>jar</packaging>

Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/cache-jbosscache/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-jbosscache</artifactId>
     <packaging>jar</packaging>

Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/cache-jbosscache2/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-jbosscache2</artifactId>
     <packaging>jar</packaging>

Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/cache-oscache/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-oscache</artifactId>
     <packaging>jar</packaging>

Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/cache-swarmcache/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-swarmcache</artifactId>
     <packaging>jar</packaging>

Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/connection-c3p0/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,12 +1,12 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
     <groupId>org.hibernate</groupId>

Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/connection-proxool/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-proxool</artifactId>
     <packaging>jar</packaging>

Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/core/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,12 +1,12 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.hibernate</groupId>

Added: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml	                        (rev 0)
+++ core/trunk/distribution/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -0,0 +1,61 @@
+<?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.3.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.hibernate</groupId>
+    <artifactId>hibernate-distribution</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Hibernate Distribution</name>
+    <description>Builds a distribution the same as we used to build before maven</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-2</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/assembly/hibernate-all.xml</descriptor>
+                        <descriptor>src/assembly/dist.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

Added: core/trunk/distribution/src/assembly/dist.xml
===================================================================
--- core/trunk/distribution/src/assembly/dist.xml	                        (rev 0)
+++ core/trunk/distribution/src/assembly/dist.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  -->
+<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
+
+    <!--
+        Produces a dist-style bundle similar to what previous (non-mavenized) versions of
+        Hibernate did.
+    -->
+
+    <id>dist</id>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <includeSiteDirectory>true</includeSiteDirectory>
+
+    <files>
+        <file>
+            <source>lgpl.txt</source>
+        </file>
+        <file>
+            <!-- todo : bundle only current changelog?  that's supportable as a generated artifact...  -->
+            <!-- maven-changelog-plugin may already support this (^^) ... -->
+            <source>changelog.txt</source>
+        </file>
+        <file>
+            <source>target/${project.artifactId}-${project.version}-all.jar</source>
+            <destName>hibernate3.jar</destName>
+        </file>
+    </files>
+
+    <fileSets>
+        <fileSet>
+            <outputDirectory>sources</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+            <excludes>
+                <exclude>**/target/**</exclude>
+            </excludes>
+        </fileSet>
+        <!-- ugh! -->
+        <fileSet>
+            <directory>documentation/manual/en-US/target/docbook</directory>
+            <outputDirectory>manual/en-US</outputDirectory>
+            <includes>
+                <include>**/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>documentation/manual/fr-FR/target/docbook</directory>
+            <outputDirectory>manual/fr-FR</outputDirectory>
+            <includes>
+                <include>**/**</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+    <moduleSets>
+        <!-- Handle the "code" related modules -->
+        <moduleSet>
+            <!-- this setting makes sure that sub modules of documentation are not picked up here -->
+            <includeSubModules>false</includeSubModules>
+            <includes>
+                <include>org.hibernate:*</include>
+            </includes>
+            <excludes>
+                <!-- documentation handled in separate moduleSet -->
+                <exclude>org.hibernate:hibernate-documentation</exclude>
+                <!-- not included in the dist bundle -->
+                <exclude>org.hibernate:hibernate-testsuite</exclude>
+                <!-- not included in the dist bundle (for now; eventually will become part of documentation/tutorial) -->
+                <exclude>org.hibernate:hibernate-tutorials</exclude>
+            </excludes>
+            <binaries>
+                <unpack>false</unpack>
+                <includeDependencies>false</includeDependencies>
+                <!-- drop version from JAR file name -->
+                <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+                <dependencySets>
+                    <dependencySet>
+                        <outputDirectory>lib</outputDirectory>
+                        <includes>
+                            <include>*:jar:*</include>
+                        </includes>
+                        <excludes>
+                            <exclude>org.hibernate:*</exclude>
+                            <exclude>*:sources</exclude>
+                            <exclude>*:javadoc</exclude>
+                            <!-- stuff jbosscache's pom pulls in -->
+                            <exclude>c3p0:c3p0:jar:0.9.0.4</exclude>
+                            <exclude>commons-logging:commons-logging:jar:1.1</exclude>
+                            <exclude>findbugs:annotations:*</exclude>
+                            <exclude>apache-httpclient:commons-httpclient:*</exclude>
+                            <exclude>apache-slide:*</exclude>
+                            <exclude>jdbm:jdbm:*</exclude>
+                            <exclude>org.beanshell:bsh:*</exclude>
+                            <exclude>sleepycat:je:*</exclude>
+                        </excludes>
+                    </dependencySet>
+                </dependencySets>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
+
+</assembly>
\ No newline at end of file

Added: core/trunk/distribution/src/assembly/hibernate-all.xml
===================================================================
--- core/trunk/distribution/src/assembly/hibernate-all.xml	                        (rev 0)
+++ core/trunk/distribution/src/assembly/hibernate-all.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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
+  ~
+  -->
+<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
+
+    <!--
+        Produces a dist-style bundle similar to what previous (non-mavenized) versions of
+        Hibernate did.
+    -->
+    <id>all</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <baseDirectory>hibernate-all</baseDirectory>
+    <moduleSets>
+        <!-- Handle the "code" related modules -->
+        <moduleSet>
+            <!-- this setting makes sure that sub modules of documentation are not picked up here -->
+            <includeSubModules>false</includeSubModules>
+            <includes>
+                <include>org.hibernate:*</include>
+            </includes>
+            <excludes>
+                <!-- documentation handled in separate moduleSet -->
+                <exclude>org.hibernate:hibernate-documentation</exclude>
+                <!-- not included in the dist bundle -->
+                <exclude>org.hibernate:hibernate-testsuite</exclude>
+                <!-- not included in the dist bundle (for now; eventually will become part of documentation/tutorial) -->
+                <exclude>org.hibernate:hibernate-tutorials</exclude>
+            </excludes>
+            <sources>
+                <includeModuleDirectory>false</includeModuleDirectory>
+                <fileSets>
+                    <fileSet>
+                        <directory>target/classes</directory>
+                        <outputDirectory>/</outputDirectory>
+                    </fileSet>
+                </fileSets>
+            </sources>
+        </moduleSet>
+    </moduleSets>
+</assembly>
\ No newline at end of file

Added: core/trunk/distribution/src/site/apt/documentation.apt
===================================================================
--- core/trunk/distribution/src/site/apt/documentation.apt	                        (rev 0)
+++ core/trunk/distribution/src/site/apt/documentation.apt	2008-04-18 18:19:51 UTC (rev 14545)
@@ -0,0 +1,33 @@
+ ------
+ Documentation
+ ------
+ Steve Ebersole
+ ------
+ 17 March 2008
+ ------
+
+~~ 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
+
+Hibernate Core - Documentation
+
+    Coming Soon...  intended as a central aggregation of documentation and resource information.
\ No newline at end of file

Added: core/trunk/distribution/src/site/apt/index.apt
===================================================================
--- core/trunk/distribution/src/site/apt/index.apt	                        (rev 0)
+++ core/trunk/distribution/src/site/apt/index.apt	2008-04-18 18:19:51 UTC (rev 14545)
@@ -0,0 +1,59 @@
+ ------
+ Introduction
+ ------
+ Steve Ebersole
+ ------
+ 20 July 2007
+ ------
+
+~~ 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
+
+Hibernate Core - Relational Persistence for Idiomatic Java
+
+    Hibernate is a powerful, high performance object/relational persistence and query
+    service.  Hibernate lets you develop persistent classes following common object-oriented
+    idioms such as association, inheritance, polymorphism, composition, and collections.
+
+    Hibernate's goal is to relieve the developer from 95 percent of common data persistence related
+    programming tasks, compared to manual coding with SQL and the JDBC API.  Hibernate Core for Java
+    generates SQL for you, relieves you from manual JDBC result set handling and object conversion,
+    and keeps your application portable to all SQL databases.  However, unlike many other persistence
+    solutions, Hibernate does not hide the power of SQL from you and guarantees that your investment
+    in relational technology and knowledge is as valid as always.
+
+    Hibernate provides transparent persistence, the only requirement for a persistent class is a
+    no-argument constructor. You don't even need classes, you can also persist a model using Maps of
+    Maps, or just about anything else.
+
+    Hibernate offers sophisticated query options.  You can write plain SQL, object-oriented
+    HQL (Hibernate Query Language), or create programatic Criteria and Example queries.  Hibernate can
+    optimize object loading all the time, with various fetching and caching options.
+
+    Hibernate adapts to your development process, no matter if you start with a design from scratch or
+    work with an existing database, and it will support any application architecture.  Combined with
+    Hibernate EntityManager and Hibernate Annotations you can use Hibernate as a certified Java Persistence
+    provider.
+
+    Please visit the {{{http://hibernate.org}website}} for more information.
+
+    Happpy Hibernating!

Added: core/trunk/distribution/src/site/resources/css/site.css
===================================================================
--- core/trunk/distribution/src/site/resources/css/site.css	                        (rev 0)
+++ core/trunk/distribution/src/site/resources/css/site.css	2008-04-18 18:19:51 UTC (rev 14545)
@@ -0,0 +1,31 @@
+/**
+ * Copyright © 2007  Red Hat Middleware, LLC. All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, v. 2.1. This program is distributed in the
+ * hope that it will be useful, but WITHOUT A WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details. You should have received a
+ * copy of the GNU Lesser General Public License, v.2.1 along with this
+ * distribution; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Red Hat Author(s): Steve Ebersole
+ */
+
+/*
+ * Apply the colors taken from the Hibernate logo in various places
+ * thoughout the generated site pages.
+ *
+ * brown : #aea477
+ * gray  : #59666c
+ */
+
+h1, h2, h3, h4, h5, h6 {
+    color: #aea477;
+}
+
+#navcolumn h5 {
+    color: #59666c;
+}

Added: core/trunk/distribution/src/site/resources/images/favicon.ico
===================================================================
(Binary files differ)


Property changes on: core/trunk/distribution/src/site/resources/images/favicon.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: core/trunk/distribution/src/site/resources/images/hibernate_icon.png
===================================================================
(Binary files differ)


Property changes on: core/trunk/distribution/src/site/resources/images/hibernate_icon.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: core/trunk/distribution/src/site/resources/images/hibernate_logo.png
===================================================================
(Binary files differ)


Property changes on: core/trunk/distribution/src/site/resources/images/hibernate_logo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: core/trunk/distribution/src/site/resources/images/maven-button-4.png
===================================================================
(Binary files differ)


Property changes on: core/trunk/distribution/src/site/resources/images/maven-button-4.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: core/trunk/distribution/src/site/site.xml
===================================================================
--- core/trunk/distribution/src/site/site.xml	                        (rev 0)
+++ core/trunk/distribution/src/site/site.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -0,0 +1,85 @@
+<!--
+  ~ 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 name="Hibernate Core">
+
+    <bannerLeft>
+        <name>Hibernate Core Project</name>
+        <src>images/hibernate_logo.png</src>
+        <href>http://hibernate.org</href>
+    </bannerLeft>
+    
+    <version position="left"/>
+    <publishDate position="navigation-bottom" format="yyyy-MM-dd"/>
+<!--
+    <poweredBy>
+        <logo name="Maven" href="http://maven.apache.org/" img="images/maven-button-4.png"/>
+    </poweredBy
+-->
+    <body>
+
+        <head>
+            <link rel="shortcut icon" href="images/favicon.ico"/>
+        </head>
+
+        <links>
+            <item name="Hibernate" href="http://hibernate.org"/>
+            <item name="JBoss" href="http://jboss.org"/>
+            <item name="Red Hat" href="http://redhat.com"/>
+        </links>
+
+        <menu name="Overview">
+            <item name="Introduction" href="index.html"/>
+            <item name="Documentation" href="documentation.html"/>
+        </menu>
+
+        <menu name="Information">
+            <item name="Project Summary" href="project-summary.html"/>
+            <item name="Project License" href="license.html"/>
+            <item name="Issue Tracking" href="issue-tracking.html"/>
+            <item name="Mailing Lists" href="mail-lists.html"/>
+            <item name="Source Repository" href="source-repository.html"/>
+            <item name="Continuous Integration" href="integration.html"/>
+            <item name="Dependencies" href="dependencies.html"/>
+            <item name="Dependency Convergence" href="dependency-convergence.html"/>
+        </menu>
+
+        <menu name="Modules">
+            <item name="Core" href="modules/core/index.html"/>
+            <item name="JMX Capabilities" href="modules/jmx/index.html"/>
+            <item name="Ehcache Integration" href="ehcache/index.html"/>
+            <item name="JBossCache(1.x) Integration" href="jbc/index.html"/>
+            <item name="JBossCache(2.x) Integration" href="jbc2/index.html"/>
+            <item name="SwarmCache Integration" href="swarmcache/index.html"/>
+            <item name="OSCache Integration" href="oscache/index.html"/>
+            <item name="C3P0 Integration" href="c3p0/index.html"/>
+            <item name="Proxool Integration" href="proxool/index.html"/>
+            <item name="Testing Support" href="testing/index.html"/>
+        </menu>
+
+    </body>
+
+</project>
+
+        
\ No newline at end of file

Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/documentation/jbosscache2/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -3,11 +3,12 @@
         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>3</version>
+        <artifactId>hibernate-parent</artifactId>
+        <version>3.3.0-SNAPSHOT</version>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
     
     <groupId>org.hibernate</groupId>

Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/documentation/manual/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -3,13 +3,14 @@
         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>3</version>
+        <artifactId>hibernate-parent</artifactId>
+        <version>3.3.0-SNAPSHOT</version>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual</artifactId>
     <version>3.3.0-SNAPSHOT</version>

Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/documentation/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -29,14 +29,14 @@
         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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-documentation</artifactId>
     <packaging>pom</packaging>

Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/jmx/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -4,9 +4,9 @@
 
     <parent>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.hibernate</groupId>

Added: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml	                        (rev 0)
+++ core/trunk/parent/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -0,0 +1,329 @@
+<?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.3.0-SNAPSHOT</version>
+
+    <name>Hibernate Core Parent POM</name>
+    <description>The base POM for all Hibernate Core modules.</description>
+    <url>http://hibernate.org</url>
+
+    <organization>
+        <name>Hibernate.org</name>
+        <url>http://hibernate.org</url>
+    </organization>
+
+    <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>
+        <!-- this is the cloned repo!!! -->
+        <connection>scm:svn:https://svn.jboss.org/repos/hibernate.clone/core/trunk</connection>
+        <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate.clone/core/trunk</developerConnection>
+        <url>https://svn.jboss.org/repos/hibernate.clone/core/trunk</url>
+    </scm>
+
+    <ciManagement>
+        <system>hudson</system>
+        <url>http://hudson.jboss.org/hudson/job/hibernate-testsuite/</url>
+        <notifiers>
+            <notifier>
+                <type>mail</type>
+                <address>hibernate-dev at lists.jboss.org</address>
+            </notifier>
+        </notifiers>
+    </ciManagement>
+
+    <mailingLists>
+        <mailingList>
+            <name>Hibernate Announcements</name>
+            <post>hibernate-announce at 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 at 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 at 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 at 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>
+            <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 -->
+                <!-- 2.0.8 not released at this time, so I instead say anything greater that 2.0.7 -->
+                <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>
+                                <requireMavenVersion>
+                                    <version>(2.0.7,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 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>
+            <!-- add specification/implementation details to the manifests -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                        <manifestEntries>
+                            <Implementation-URL>${pom.url}</Implementation-URL>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-webdav</artifactId>
+                <version>1.0-beta-2</version>
+            </extension>
+        </extensions>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.4.2</version>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <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>
+                <version>2.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <linkXref>true</linkXref>
+                    <minimumTokens>100</minimumTokens>
+                    <targetJdk>1.4</targetJdk>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>taglist-maven-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <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>
+                <version>2.0-beta-2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>1.1.1</version>
+                <configuration>
+                    <onlyAnalyze>org.hibernate.*</onlyAnalyze>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <profiles>
+        <profile>
+            <!--
+                A profile used implicitly by the release plugin.  Here we use it to enable documentation building
+                as well as execution of the assembly plugin (to build the SourceForge dist).
+            -->
+            <id>release-profile</id>
+            <modules>
+                <module>documentation</module>
+            </modules>
+        </profile>
+
+        <!-- seperate profile for documentation activation -->
+        <profile>
+            <id>docs</id>
+            <modules>
+                <module>documentation</module>
+            </modules>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.4.2</version>
+            </dependency>
+            <dependency>
+                <groupId>antlr</groupId>
+                <artifactId>antlr</artifactId>
+                <version>2.7.6</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+            </dependency>
+            <dependency>
+                <groupId>dom4j</groupId>
+                <artifactId>dom4j</artifactId>
+                <version>1.6.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <distributionManagement>
+        <repository>
+            <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+            <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+            <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+            <id>repository.jboss.org</id>
+            <url>file://${maven.repository.root}</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots.jboss.org</id>
+            <name>JBoss Snapshot Repository</name>
+            <url>dav:https://snapshots.jboss.org/maven2</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+</project>
\ No newline at end of file

Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -27,83 +27,23 @@
 <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.3.0-SNAPSHOT</version>
+        <relativePath>parent/pom.xml</relativePath>
+    </parent>
+
     <groupId>org.hibernate</groupId>
-    <artifactId>hibernate</artifactId>
+    <artifactId>hibernate-aggregator</artifactId>
     <packaging>pom</packaging>
-    <version>3.3.0-SNAPSHOT</version>
 
     <name>Hibernate Core Aggregator</name>
     <description>Aggregator of the Hibernate Core modules.</description>
-    <url>http://hibernate.org</url>
 
-    <organization>
-        <name>Hibernate.org</name>
-        <url>http://hibernate.org</url>
-    </organization>
-
-    <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>
-        <!-- this is the cloned repo!!! -->
-        <connection>scm:svn:https://svn.jboss.org/repos/hibernate.clone/core/trunk</connection>
-        <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate.clone/core/trunk</developerConnection>
-        <url>https://svn.jboss.org/repos/hibernate.clone/core/trunk</url>
-    </scm>
-
-    <ciManagement>
-        <system>hudson</system>
-        <url>http://hudson.jboss.org/hudson/job/hibernate-testsuite/</url>
-        <notifiers>
-            <notifier>
-                <type>mail</type>
-                <address>hibernate-dev at lists.jboss.org</address>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-
-    <mailingLists>
-        <mailingList>
-            <name>Hibernate Announcements</name>
-            <post>hibernate-announce at 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 at 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 at 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 at 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>
-
     <modules>
+        <module>parent</module>
         <module>core</module>
         <module>cache-ehcache</module>
         <module>cache-jbosscache</module>
@@ -116,70 +56,18 @@
         <module>testing</module>
         <module>testsuite</module>
         <module>tutorials</module>
-<!-- Need to scope bytecode providers first
+<!--
+    Need to scope bytecode providers first...
         <module>bytecode-cglib</module>
         <module>bytecode-javassist</module>
 -->
+        <module>distribution</module>
     </modules>
     
     <build>
         <plugins>
             <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 -->
-                <!-- 2.0.8 not released at this time, so I instead say anything greater that 2.0.7 -->
                 <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>
-                                <requireMavenVersion>
-                                    <version>(2.0.7,)</version>
-                                </requireMavenVersion>
-                            </rules>    
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- 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>
-            <!-- add specification/implementation details to the manifests -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest> 
-                        <manifestEntries>
-                            <Implementation-URL>${pom.url}</Implementation-URL>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
                 <version>2.0-beta-7</version>
                 <configuration>
@@ -187,112 +75,9 @@
                     <goals>install,site,assembly:single</goals>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-2</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/assembly/hibernate-all.xml</descriptor>
-                        <descriptor>src/assembly/dist.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-webdav</artifactId>
-                <version>1.0-beta-2</version>
-            </extension>
-        </extensions>
     </build>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.2</version>
-                <configuration>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.4</version>
-                <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>
-                <version>2.1</version>
-                <configuration>
-                    <aggregate>${hibernate.core.reports.aggregate}</aggregate>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.2</version>
-                <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>
-                <version>2.1</version>
-                <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>
-                <version>2.0-beta-2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>1.1.1</version>
-                <configuration>
-                    <onlyAnalyze>org.hibernate.*</onlyAnalyze>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
     <profiles>
         <profile>
             <!--
@@ -314,66 +99,4 @@
         </profile>
     </profiles>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>antlr</groupId>
-                <artifactId>antlr</artifactId>
-                <version>2.7.6</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>3.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>dom4j</groupId>
-                <artifactId>dom4j</artifactId>
-                <version>1.6.1</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <distributionManagement>
-        <repository>
-            <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
-            <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
-            <!-- todo : replace this with direct svn access once the svnkit providers are available -->
-            <id>repository.jboss.org</id>
-            <url>file://${maven.repository.root}</url>
-        </repository>
-        <snapshotRepository>
-            <id>snapshots.jboss.org</id>
-            <name>JBoss Snapshot Repository</name>
-            <url>dav:https://snapshots.jboss.org/maven2</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-
-    <properties>
-        <hibernate.core.reports.aggregate>false</hibernate.core.reports.aggregate>
-    </properties>
-
 </project>
\ No newline at end of file

Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/testing/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-testing</artifactId>
     <packaging>jar</packaging>

Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/testsuite/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-testsuite</artifactId>
     <packaging>jar</packaging>

Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml	2008-04-17 15:19:12 UTC (rev 14544)
+++ core/trunk/tutorials/pom.xml	2008-04-18 18:19:51 UTC (rev 14545)
@@ -1,14 +1,14 @@
 <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</artifactId>
+        <artifactId>hibernate-parent</artifactId>
         <version>3.3.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../hibernate-parent/pom.xml</relativePath>
     </parent>
-    
+
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-tutorials</artifactId>
     <packaging>pom</packaging>




More information about the hibernate-commits mailing list