[hibernate-commits] Hibernate SVN: r14561 - in core/trunk: distribution and 7 other directories.

Author: steve.ebersole(a)jboss.com Date: 2008-04-19 01:15:20 -0400 (Sat, 19 Apr 2008) New Revision: 14561 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 Removed: core/trunk/src/ Log: try incorporating assembly ; take 4 Added: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml (rev 0) +++ core/trunk/distribution/pom.xml 2008-04-19 05:15:20 UTC (rev 14561) @@ -0,0 +1,124 @@ +<?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 the complete Hibernate distribution bundles</description> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <finalName>hibernate-core-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/hibernate-all.xml</descriptor> + <descriptor>src/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <!-- + The assemblies work off of dependency sets since the stuff to be + aggregated is no longer sub-modules after moving assembly itself + into this 'distribution' module. + --> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-jmx</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-ehcache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-jbosscache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-jbosscache2</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-oscache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-swarmcache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-c3p0</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-proxool</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Copied: core/trunk/distribution/src/assembly/dist.xml (from rev 14552, core/trunk/src/assembly/dist.xml) =================================================================== --- core/trunk/distribution/src/assembly/dist.xml (rev 0) +++ core/trunk/distribution/src/assembly/dist.xml 2008-04-19 05:15:20 UTC (rev 14561) @@ -0,0 +1,156 @@ +<?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 : this should eventually become the release-notes bawany is working on --> + <source>../changelog.txt</source> + </file> + <file> + <source>target/${project.artifactId}-${project.version}-all.jar</source> + <destName>hibernate3.jar</destName> + </file> + <file> + <source>../testing/target/hibernate-testing-${project.version}.jar</source> + </file> + <file> + <source>../testing/target/hibernate-testsuite-${project.version}.jar</source> + </file> + </files> + + <dependencySets> + <dependencySet> + <outputDirectory>lib/required</outputDirectory> + <includes> + <include>antlr:antlr</include> + + <include>cglib:cglib</include> + <include>asm:asm</include> + <include>asm:asm-attrs</include> + + <include>commons-collections:commons-collections</include> + + <include>dom4j:dom4j</include> + + <include>javassist:javassist</include> + + <include>org.slf4j:slf4j-api</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/optional/c3p0</outputDirectory> + <includes> + <include>c3p0:c3p0</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/optional/proxool</outputDirectory> + <includes> + <include>proxool:proxool</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/optional/ehcache</outputDirectory> + <includes> + <include>net.sf.ehcache:ehcache</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/optional/jbosscache</outputDirectory> + <includes> + <include>jboss:jboss-cache</include> + <include>concurrent:concurrent:1.3.4</include> + <include>jboss:jboss-common:4.0.2</include> + <include>jboss:jboss-jmx:4.0.2</include> + <include>jboss:jboss-system:4.0.2</include> + <include>jgroups:jgroups-all:2.2.7</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/optional/jbosscache2</outputDirectory> + <includes> + <include>org.jboss.cache:jbosscache-core</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/optional/oscache</outputDirectory> + <includes> + <include>opensymphony:oscache</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/optional/swarmcache</outputDirectory> + <includes> + <include>swarmcache:swarmcache</include> + </includes> + </dependencySet> + </dependencySets> + + <fileSets> + <fileSet> + <directory>..</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <outputDirectory>source</outputDirectory> + <includes> + <include>**/src/**</include> + </includes> + <excludes> + <exclude>**/target/**</exclude> + </excludes> + </fileSet> + <!-- todo : still need to account for documentation --> + <!-- todo : still need to account for tutorials --> + <!-- todo : still need to account for overall site stuff --> + </fileSets> + +</assembly> \ No newline at end of file Copied: core/trunk/distribution/src/assembly/hibernate-all.xml (from rev 14552, core/trunk/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-19 05:15:20 UTC (rev 14561) @@ -0,0 +1,49 @@ +<?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"> + + <!-- + Take the 'core' resoures and build a jar, ala the legacy hibernate3.jar + --> + <id>all</id> + <formats> + <format>jar</format> + </formats> + + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory>hibernate-all</baseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>org.hibernate:*</include> + </includes> + </dependencySet> + </dependencySets> + +</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-19 05:15:20 UTC (rev 14561) @@ -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-19 05:15:20 UTC (rev 14561) @@ -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-19 05:15:20 UTC (rev 14561) @@ -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-19 05:15:20 UTC (rev 14561) @@ -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