[hibernate-commits] Hibernate SVN: r14336 - in core/trunk: documentation/manual and 3 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Mon Feb 18 14:48:51 EST 2008


Author: steve.ebersole at jboss.com
Date: 2008-02-18 14:48:51 -0500 (Mon, 18 Feb 2008)
New Revision: 14336

Added:
   core/trunk/src/assembly/hibernate-all.xml
Modified:
   core/trunk/documentation/manual/pom.xml
   core/trunk/pom.xml
   core/trunk/src/assembly/dist.xml
   core/trunk/src/site/site.xml
   core/trunk/testing/pom.xml
Log:
adding Hardy's assembly stuff

Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml	2008-02-18 19:44:28 UTC (rev 14335)
+++ core/trunk/documentation/manual/pom.xml	2008-02-18 19:48:51 UTC (rev 14336)
@@ -24,7 +24,20 @@
                 <groupId>org.jboss.maven.plugins</groupId>
                 <artifactId>maven-jdocbook-plugin</artifactId>
                 <version>2.1.0-SNAPSHOT</version>
-		<extensions>true</extensions>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <!--
+                            here we are attaching the translate goal so that the translations are processed
+                            before compilation so that the transated XML is also transformed during
+                            generation
+                        -->
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>translate</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <dependencies>
                     <dependency>
                         <groupId>org.hibernate</groupId>
@@ -45,7 +58,7 @@
                         <translation>zh-CN</translation>
                     </translations>
                     <imageResource>
-                        <directory>src/main/docbook/en-US</directory>
+                        <directory>${basedir}/src/main/docbook/en-US</directory>
                         <excludes>
                             <exclude>*.xml</exclude>
                             <exclude>**/*.xml</exclude>

Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml	2008-02-18 19:44:28 UTC (rev 14335)
+++ core/trunk/pom.xml	2008-02-18 19:48:51 UTC (rev 14336)
@@ -71,6 +71,7 @@
                 <configuration>
                     <descriptors>
                         <descriptor>src/assembly/dist.xml</descriptor>
+                        <descriptor>src/assembly/hibernate-all.xml</descriptor>
                     </descriptors>
                 </configuration>
             </plugin>

Modified: core/trunk/src/assembly/dist.xml
===================================================================
--- core/trunk/src/assembly/dist.xml	2008-02-18 19:44:28 UTC (rev 14335)
+++ core/trunk/src/assembly/dist.xml	2008-02-18 19:48:51 UTC (rev 14336)
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+  ~ Hibernate, Relational Persistence for Idiomatic Java
   ~
+  ~ Copyright (c) 2007, 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, 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.
+  ~ Lesser General Public License, as published by the Free Software Foundation.
   ~
-  ~ Red Hat Author(s): Steve Ebersole
+  ~ 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"
@@ -41,6 +49,10 @@
             <!-- 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>
@@ -115,4 +127,4 @@
         </moduleSet>
     </moduleSets>
 
-</assembly>
+</assembly>
\ No newline at end of file

Added: core/trunk/src/assembly/hibernate-all.xml
===================================================================
--- core/trunk/src/assembly/hibernate-all.xml	                        (rev 0)
+++ core/trunk/src/assembly/hibernate-all.xml	2008-02-18 19:48:51 UTC (rev 14336)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ Copyright (c) 2007, 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-eg</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

Modified: core/trunk/src/site/site.xml
===================================================================
--- core/trunk/src/site/site.xml	2008-02-18 19:44:28 UTC (rev 14335)
+++ core/trunk/src/site/site.xml	2008-02-18 19:48:51 UTC (rev 14336)
@@ -14,6 +14,7 @@
     </poweredBy>
 
     <body>
+
         <head>
             <link rel="shortcut icon" href="images/favicon.ico"/>
         </head>
@@ -26,10 +27,37 @@
 
         <menu name="Overview">
             <item name="Introduction" href="index.html"/>
+            <item name="Getting Started" href="quickstart.html"/>
+            <item name="Documentation" href="documentation.html"/>
+            <item name="FAQs" href="faq.html"/>
         </menu>
 
-        <menu ref="reports"/>
+        <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> 
 
+</project>
+
         
\ No newline at end of file

Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml	2008-02-18 19:44:28 UTC (rev 14335)
+++ core/trunk/testing/pom.xml	2008-02-18 19:48:51 UTC (rev 14336)
@@ -37,7 +37,7 @@
         <resources>
             <resource>
                 <filtering>false</filtering>
-                <directory>${baseir}/src/main/java</directory>
+                <directory>src/main/java</directory>
                 <includes>
                     <include>**/*.hbm.xml</include>
                 </includes>




More information about the hibernate-commits mailing list