Hibernate SVN: r14615 - core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US.
by hibernate-commits＠lists.jboss.org
Author: bsatguna
Date: 2008-04-29 20:54:37 -0400 (Tue, 29 Apr 2008)
New Revision: 14615
Modified:
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Release_Notes.xml
Log:
Added new content to release notes file
Modified: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Release_Notes.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Release_Notes.xml 2008-04-30 00:48:43 UTC (rev 14614)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Release_Notes.xml 2008-04-30 00:54:37 UTC (rev 14615)
@@ -14,7 +14,7 @@
<section id="Background">
<title>Background</title>
<para>
- Hibernate is a powerful object/relational mapping tool for building Java applications. It significantly reduces repetitive persistence related programming tasks by mapping the object model's data representation to a relational data model. The mapping feature eliminates paradigm mismatch issues caused by data handling between objects and relational databases.
+ Hibernate is a powerful object/relational mapping tool for building Java applications. It significantly reduces repetitive persistence related programming tasks by mapping the object model's data representation to a relational data model. Hibernate offers a sophisticated object-oriented HQL (Hibernate query language) allowing the programmer to make use of polymorphic queries. Queries can be expressed in native SQL or using Criteria and example queries. A full feature datasheet is available <ulink url="http://www.jboss.com/pdf/HibernateBrochure-Jun2005.pdf">here for download</ulink>
</para>
</section>
</section>
@@ -26,7 +26,8 @@
<section id="Installation_Notes">
<title>Installation Notes</title>
<para>
- Any information that the user must keep in mind before or during installation has to be specified here.
+ We advise users to ensure that adequate disk space is available for the installation of Hibernate, JDK 1.4 (or above) and the database.
+
</para>
</section>
<section id="Migration_Guide">
16 years, 8 months
- 1
- 0
Hibernate SVN: r14614 - in core/branches/Branch_3_2_4_SP1_CP/doc/release_notes: src/main/docbook/en-US and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: bsatguna
Date: 2008-04-29 20:48:43 -0400 (Tue, 29 Apr 2008)
New Revision: 14614
Added:
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/pom.xml
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Article_Info.xml
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Author_Group.xml
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Book_Info.xml
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Release_Notes.xml
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Revision_History.xml
Log:
adding release notes files
Added: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/pom.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/pom.xml (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/pom.xml 2008-04-30 00:48:43 UTC (rev 14614)
@@ -0,0 +1,116 @@
+<?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
+ -->
+
+<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-releasenotes</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+
+ <name>Hibernate Release Notes</name>
+ <description>The Hibernate release notes DocBook source module</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0</version>
+ <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>
+ <artifactId>hibernate-jdocbook-style</artifactId>
+ <version>1.0.2</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>en-US/Release_Notes.xml</sourceDocumentName>
+ <masterTranslation>en-US</masterTranslation>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <includes>
+ <include>**/*.svg</include>
+ <include>**/*.png</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
+ <finalName>Release_Notes.pdf</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <localeSeparator>-</localeSeparator>
+ <useRelativeImageUris>true</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Article_Info.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Article_Info.xml (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Article_Info.xml 2008-04-30 00:48:43 UTC (rev 14614)
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE articleinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<articleinfo id="Release_Notes-Hibernate-Standalone">
+ <title>Enterprise Hibernate x.y.z Release Notes</title>
+ <subtitle>Release Notes</subtitle>
+ <issuenum>0.1</issuenum>
+ <productnumber>0</productnumber>
+ <abstract><para>This document outlines information necessary for installation, migration and bug fixes.</para>
+ </abstract>
+ <corpauthor><inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/redhat-logo.svg" />
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor><copyright>
+ <year>&YEAR;</year>
+ <holder>&HOLDER;</holder>
+ </copyright>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</articleinfo>
+
+
+
Added: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Author_Group.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Author_Group.xml (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Author_Group.xml 2008-04-30 00:48:43 UTC (rev 14614)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<authorgroup>
+ <corpauthor>FF0000 Headgear Documentation Group</corpauthor>
+ <author>
+ <firstname>Dude</firstname>
+ <surname>McDude</surname>
+ <affiliation>
+ <orgname>My Org</orgname>
+ <orgdiv>Best Div in the place</orgdiv>
+ </affiliation>
+ <email>dude.mcdude(a)myorg.org</email>
+ </author>
+</authorgroup>
Added: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Book_Info.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Book_Info.xml (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Book_Info.xml 2008-04-30 00:48:43 UTC (rev 14614)
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+<!DOCTYPE articleinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<articleinfo id="Release_Notes-Product_Name_and_Version">
+ <title>Product Name and Version</title>
+ <subtitle>Release Notes</subtitle>
+ <issuenum>0.1</issuenum>
+ <productnumber>0</productnumber>
+ <abstract><para>This book is about... (Be brief; this para is used for the RPM spec
+ file)</para>
+ </abstract>
+ <corpauthor><inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/redhat-logo.svg" />
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor><copyright>
+ <year>&YEAR;</year>
+ <holder>&HOLDER;</holder>
+ </copyright>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</articleinfo>
+
+
+
Added: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Release_Notes.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Release_Notes.xml (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Release_Notes.xml 2008-04-30 00:48:43 UTC (rev 14614)
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<article id="HIB_Release_Notes">
+ <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+ <section id="Overview">
+ <title>
+ Overview
+ </title>
+ <para>
+ These release notes contain important information regarding Hibernate &VERSION;. This document covers installation and migration notes, new features and bug fixes.
+ </para>
+
+ <section id="Background">
+ <title>Background</title>
+ <para>
+ Hibernate is a powerful object/relational mapping tool for building Java applications. It significantly reduces repetitive persistence related programming tasks by mapping the object model's data representation to a relational data model. The mapping feature eliminates paradigm mismatch issues caused by data handling between objects and relational databases.
+ </para>
+ </section>
+ </section>
+ <section id="Important_Notes">
+ <title>Installation And Migration Guide</title>
+ <para>
+ This section contains all information related to installing hibernate, testing the installation and running some examples.
+ </para>
+ <section id="Installation_Notes">
+ <title>Installation Notes</title>
+ <para>
+ Any information that the user must keep in mind before or during installation has to be specified here.
+ </para>
+ </section>
+ <section id="Migration_Guide">
+ <title>Migration Guide</title>
+ <para>
+ Information regarding upgrades
+ </para>
+ </section>
+ </section>
+ <section id="Features_And_Bug_Fixes">
+ <title>New features and bug fixes</title>
+ <para>
+ All new features and bug fixes mentioned in these release notes are applicable to VERSION;.
+ </para>
+ <section id="New_Features">
+ <title>New Features</title>
+ <para>
+ Provide a summary of new features applicable to this release.
+ </para>
+ </section>
+ <section id="Bug_Fixes">
+ <title>Bug Fixes</title>
+ <para>
+ The following bugs have been addressed and resolved in this release.
+ </para>
+ </section>
+ </section>
+ <section id="Documentation">
+ <title>Documentation</title>
+ <para>
+ List all the documentation links here and where to find them.
+ </para>
+ </section>
+ <section id="Product_Support">
+ <title>Product Support</title>
+ <para>
+ List all the links here.
+ </para>
+ </section>
+</article>
Added: core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Revision_History.xml
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Revision_History.xml (rev 0)
+++ core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/Revision_History.xml 2008-04-30 00:48:43 UTC (rev 14614)
@@ -0,0 +1,20 @@
+<?xml version='1.0'?>
+<!DOCTYPE revhistory PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<revhistory>
+ <revision>
+ <revnumber>1.0</revnumber>
+ <date></date>
+ <author>
+ <firstname></firstname>
+ <surname></surname>
+ <email></email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member></member>
+ </simplelist>
+ </revdescription>
+ </revision>
+</revhistory>
16 years, 8 months
- 1
- 0
Hibernate SVN: r14613 - in core/branches/Branch_3_2_4_SP1_CP/doc/release_notes: src and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: bsatguna
Date: 2008-04-29 20:44:52 -0400 (Tue, 29 Apr 2008)
New Revision: 14613
Added:
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/
core/branches/Branch_3_2_4_SP1_CP/doc/release_notes/src/main/docbook/en-US/
Log:
creating a directory structure for release notes
16 years, 8 months
- 1
- 0
Hibernate SVN: r14612 - in search/trunk/src: java/org/hibernate/search/event and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-04-29 20:27:12 -0400 (Tue, 29 Apr 2008)
New Revision: 14612
Added:
search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper.java
Removed:
search/trunk/src/java/org/hibernate/search/util/DirectoryProviderHelper.java
Modified:
search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java
search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java
Log:
HSEARCH-181 Fix a few directory related issues around DirectoryProvider (Sanne Grinovero)
Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-04-29 23:46:43 UTC (rev 14611)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -40,4 +40,6 @@
public LuceneIndexingParameters getIndexingParameters(DirectoryProvider<?> provider);
void addIndexingParmeters(DirectoryProvider<?> provider, LuceneIndexingParameters indexingParams);
+
+ public String getIndexingStrategy();
}
Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-04-29 23:46:43 UTC (rev 14611)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -40,16 +40,13 @@
public void initialize(Configuration cfg) {
searchFactoryImplementor = SearchFactoryImpl.getSearchFactory( cfg );
- String indexingStrategy = cfg.getProperties().getProperty( Environment.INDEXING_STRATEGY, "event" );
+ String indexingStrategy = searchFactoryImplementor.getIndexingStrategy();
if ( "event".equals( indexingStrategy ) ) {
used = searchFactoryImplementor.getDocumentBuilders().size() != 0;
}
else if ( "manual".equals( indexingStrategy ) ) {
used = false;
}
- else {
- throw new SearchException(Environment.INDEXING_STRATEGY + " unknown: " + indexingStrategy);
- }
}
public SearchFactoryImplementor getSearchFactoryImplementor() {
Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-04-29 23:46:43 UTC (rev 14611)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -66,6 +66,7 @@
private BackendQueueProcessorFactory backendQueueProcessorFactory;
private Map<String, FilterDef> filterDefinitions = new HashMap<String, FilterDef>();
private FilterCachingStrategy filterCachingStrategy;
+ private String indexingStrategy;
/**
* Each directory provider (index) can have its own performance settings.
@@ -86,6 +87,7 @@
public SearchFactoryImpl(Configuration cfg) {
//yuk
ReflectionManager reflectionManager = getReflectionManager( cfg );
+ setIndexingStrategy(cfg); //need to be done before the document builds
InitContext context = new InitContext(cfg);
initDocumentBuilders(cfg, reflectionManager, context );
@@ -98,6 +100,17 @@
buildFilterCachingStrategy( cfg.getProperties() );
}
+ private void setIndexingStrategy(Configuration cfg) {
+ indexingStrategy = cfg.getProperties().getProperty( Environment.INDEXING_STRATEGY, "event" );
+ if ( ! ("event".equals( indexingStrategy ) || "manual".equals( indexingStrategy ) ) ) {
+ throw new SearchException(Environment.INDEXING_STRATEGY + " unknown: " + indexingStrategy);
+ }
+ }
+
+ public String getIndexingStrategy() {
+ return indexingStrategy;
+ }
+
private void bindFilterDefs(XClass mappedXClass) {
FullTextFilterDef defAnn = mappedXClass.getAnnotation( FullTextFilterDef.class );
if ( defAnn != null ) {
Added: search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper.java (rev 0)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProviderHelper.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -0,0 +1,143 @@
+//$Id$
+package org.hibernate.search.store;
+
+import java.util.Properties;
+import java.io.File;
+import java.io.IOException;
+
+import org.hibernate.search.SearchException;
+import org.hibernate.annotations.common.util.StringHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.store.FSDirectory;
+
+/**
+ * @author Emmanuel Bernard
+ * @author Sanne Grinovero
+ */
+public class DirectoryProviderHelper {
+
+ private static final Log log = LogFactory.getLog( DirectoryProviderHelper.class );
+ private static final String ROOTINDEX_PROP_NAME = "sourceBase";
+ private static final String RELATIVEINDEX_PROP_NAME = "source";
+
+ /**
+ * Build a directory name out of a root and relative path, guessing the significant part
+ * and checking for the file availability
+ * @param directoryProviderName
+ * @param properties
+ * @param needWritePermissions when true the directory will be tested for read-write permissions.
+ * @return
+ */
+ public static File getSourceDirectory( String directoryProviderName, Properties properties, boolean needWritePermissions ) {
+ String root = properties.getProperty( ROOTINDEX_PROP_NAME );
+ String relative = properties.getProperty( RELATIVEINDEX_PROP_NAME );
+ File sourceDirectory;
+ if ( log.isTraceEnabled() ) {
+ log.trace(
+ "Guess source directory from " + ROOTINDEX_PROP_NAME + " " + root != null ? root : "<null>"
+ + " and " + RELATIVEINDEX_PROP_NAME + " " + relative != null ? relative : "<null>"
+ );
+ }
+ if ( relative == null ) relative = directoryProviderName;
+ if ( StringHelper.isEmpty( root ) ) {
+ log.debug( "No root directory, go with relative " + relative );
+ sourceDirectory = new File( relative );
+ if ( ! sourceDirectory.isDirectory() ) { // this also tests for existence
+ throw new SearchException( "Unable to read source directory: " + relative );
+ }
+ //else keep source as it
+ }
+ else {
+ File rootDir = new File( root );
+ makeSanityCheckedDirectory( rootDir, directoryProviderName, needWritePermissions );
+ sourceDirectory = new File( root, relative );
+ makeSanityCheckedDirectory( sourceDirectory, directoryProviderName, needWritePermissions );
+ log.debug( "Get directory from root + relative" );
+ }
+ return sourceDirectory;
+ }
+
+ /**
+ * Creates an FSDirectory in provided directory if not already existing.
+ * @param indexDir The directory where to write a new index
+ * @return the created FSDirectory
+ * @throws IOException
+ */
+ public static FSDirectory createFSIndex(File indexDir) throws IOException {
+ FSDirectory fsDirectory = FSDirectory.getDirectory( indexDir );
+ if ( ! IndexReader.indexExists( fsDirectory ) ) {
+ log.debug( "Initialize index: '" + indexDir.getAbsolutePath() + "'" );
+ IndexWriter iw = new IndexWriter( fsDirectory, new StandardAnalyzer(), true );
+ iw.close();
+ }
+ return fsDirectory;
+ }
+
+ /**
+ * Verify the index directory exists and is writable,
+ * or creates it if not existing.
+ * @param annotatedIndexName The index name declared on the @Indexed annotation
+ * @param properties The properties may override the indexname.
+ * @param verifyIsWritable Verify the directory is writable
+ * @return the File representing the Index Directory
+ * @throws SearchException
+ */
+ public static File getVerifiedIndexDir(String annotatedIndexName, Properties properties, boolean verifyIsWritable) {
+ String indexBase = properties.getProperty( "indexBase", "." );
+ String indexName = properties.getProperty( "indexName", annotatedIndexName );
+ File baseIndexDir = new File( indexBase );
+ makeSanityCheckedDirectory( baseIndexDir, indexName, verifyIsWritable );
+ File indexDir = new File( baseIndexDir, indexName );
+ makeSanityCheckedDirectory( indexDir, indexName, verifyIsWritable );
+ return indexDir;
+ }
+
+ /**
+ * @param directory The directory to create or verify
+ * @param indexName To label exceptions
+ * @param verifyIsWritable Verify the directory is writable
+ * @throws SearchException
+ */
+ private static void makeSanityCheckedDirectory(File directory, String indexName, boolean verifyIsWritable) {
+ if ( ! directory.exists() ) {
+ log.warn( "Index directory not found, creating: '" + directory.getAbsolutePath() + "'" );
+ //if not existing, create the full path
+ if ( ! directory.mkdirs() ) {
+ throw new SearchException( "Unable to create index directory: "
+ + directory.getAbsolutePath() + " for index "
+ + indexName );
+ }
+ }
+ else {
+ // else check it is not a file
+ if ( ! directory.isDirectory() ) {
+ throw new SearchException( "Unable to initialize index: "
+ + indexName + ": "
+ + directory.getAbsolutePath() + " is a file." );
+ }
+ }
+ // and ensure it's writable
+ if ( verifyIsWritable && ( ! directory.canWrite() ) ) {
+ throw new SearchException( "Cannot write into index directory: "
+ + directory.getAbsolutePath() + " for index "
+ + indexName );
+ }
+ }
+
+ static long getRefreshPeriod(Properties properties, String directoryProviderName) {
+ String refreshPeriod = properties.getProperty( "refresh", "3600" );
+ long period;
+ try {
+ period = Long.parseLong( refreshPeriod );
+ } catch (NumberFormatException nfe) {
+ throw new SearchException( "Unable to initialize index: " + directoryProviderName +"; refresh period is not numeric.", nfe );
+ }
+ log.debug( "Refresh period " + period + " seconds" );
+ return period * 1000; //per second
+ }
+
+}
Modified: search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2008-04-29 23:46:43 UTC (rev 14611)
+++ search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -5,13 +5,9 @@
import java.io.IOException;
import java.util.Properties;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.FSDirectory;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
-import org.hibernate.HibernateException;
-import org.hibernate.search.util.DirectoryProviderHelper;
+import org.hibernate.search.Environment;
+import org.hibernate.search.SearchException;
import org.hibernate.search.engine.SearchFactoryImplementor;
/**
@@ -21,31 +17,24 @@
*
* @author Emmanuel Bernard
* @author Sylvain Vieujot
+ * @author Sanne Grinovero
*/
public class FSDirectoryProvider implements DirectoryProvider<FSDirectory> {
- private static Log log = LogFactory.getLog( FSDirectoryProvider.class );
+
private FSDirectory directory;
private String indexName;
public void initialize(String directoryProviderName, Properties properties, SearchFactoryImplementor searchFactoryImplementor) {
- File indexDir = DirectoryProviderHelper.determineIndexDir( directoryProviderName, properties );
+ // on "manual" indexing skip read-write check on index directory
+ boolean manual = searchFactoryImplementor.getIndexingStrategy().equals( "manual" );
+ File indexDir = DirectoryProviderHelper.getVerifiedIndexDir( directoryProviderName, properties, ! manual );
try {
- boolean create = !indexDir.exists();
- if (create) {
- log.debug( "index directory not found, creating: '" + indexDir.getAbsolutePath() + "'" );
- indexDir.mkdirs();
- }
indexName = indexDir.getCanonicalPath();
- directory = FSDirectory.getDirectory( indexName );
//this is cheap so it's not done in start()
- if ( create ) {
- log.debug( "Initialize index: '" + indexName + "'" );
- IndexWriter iw = new IndexWriter( directory, new StandardAnalyzer(), create );
- iw.close();
- }
+ directory = DirectoryProviderHelper.createFSIndex( indexDir );
}
catch (IOException e) {
- throw new HibernateException( "Unable to initialize index: " + directoryProviderName, e );
+ throw new SearchException( "Unable to initialize index: " + directoryProviderName, e );
}
}
Modified: search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2008-04-29 23:46:43 UTC (rev 14611)
+++ search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -11,14 +11,11 @@
import java.io.IOException;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.search.util.DirectoryProviderHelper;
+import org.hibernate.search.SearchException;
import org.hibernate.search.util.FileHelper;
import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.HibernateException;
/**
* File based DirectoryProvider that takes care of index copy
@@ -29,10 +26,13 @@
* A copy is triggered every refresh seconds
*
* @author Emmanuel Bernard
+ * @author Sanne Grinovero
*/
//TODO rename copy?
public class FSMasterDirectoryProvider implements DirectoryProvider<FSDirectory> {
+
private static Log log = LogFactory.getLog( FSMasterDirectoryProvider.class );
+
private FSDirectory directory;
private int current;
private String indexName;
@@ -40,54 +40,37 @@
private SearchFactoryImplementor searchFactory;
//variables needed between initialize and start
- private String source;
+ private File sourceDir;
private File indexDir;
private String directoryProviderName;
private Properties properties;
-
public void initialize(String directoryProviderName, Properties properties, SearchFactoryImplementor searchFactoryImplementor) {
this.properties = properties;
this.directoryProviderName = directoryProviderName;
//source guessing
- source = DirectoryProviderHelper.getSourceDirectory( "sourceBase", "source", directoryProviderName, properties );
- if ( source == null)
- throw new IllegalStateException("FSMasterDirectoryProvider requires a viable source directory");
- log.debug( "Source directory: " + source );
- indexDir = DirectoryProviderHelper.determineIndexDir( directoryProviderName, properties );
- log.debug( "Index directory: " + indexDir );
+ sourceDir = DirectoryProviderHelper.getSourceDirectory( directoryProviderName, properties, true );
+ log.debug( "Source directory: " + sourceDir.getPath() );
+ indexDir = DirectoryProviderHelper.getVerifiedIndexDir( directoryProviderName, properties, true );
+ log.debug( "Index directory: " + indexDir.getPath() );
try {
- boolean create = !indexDir.exists();
- if (create) {
- log.debug( "index directory not found, creating: '" + indexDir.getAbsolutePath() + "'" );
- indexDir.mkdirs();
- }
indexName = indexDir.getCanonicalPath();
- directory = FSDirectory.getDirectory( indexName);
- if ( create ) {
- log.debug( "Initialize index: '" + indexName + "'" );
- IndexWriter iw = new IndexWriter( directory, new StandardAnalyzer(), create );
- iw.close();
- }
+ directory = DirectoryProviderHelper.createFSIndex( indexDir );
}
catch (IOException e) {
- throw new HibernateException( "Unable to initialize index: " + directoryProviderName, e );
+ throw new SearchException( "Unable to initialize index: " + directoryProviderName, e );
}
this.searchFactory = searchFactoryImplementor;
}
public void start() {
- //source guessing
- String refreshPeriod = properties.getProperty( "refresh", "3600" );
- long period = Long.parseLong( refreshPeriod );
- log.debug("Refresh period " + period + " seconds");
- period *= 1000; //per second
+ long period = DirectoryProviderHelper.getRefreshPeriod( properties, directoryProviderName );
try {
//copy to source
- if ( new File( source, "current1").exists() ) {
+ if ( new File( sourceDir, "current1").exists() ) {
current = 2;
}
- else if ( new File( source, "current2").exists() ) {
+ else if ( new File( sourceDir, "current2").exists() ) {
current = 1;
}
else {
@@ -95,19 +78,19 @@
current = 1;
}
String currentString = Integer.valueOf( current ).toString();
- File subDir = new File( source, currentString );
+ File subDir = new File( sourceDir, currentString );
FileHelper.synchronize( indexDir, subDir, true );
- new File( source, "current1").delete();
- new File( source, "current2").delete();
+ new File( sourceDir, "current1 ").delete();
+ new File( sourceDir, "current2" ).delete();
//TODO small hole, no file can be found here
- new File( source, "current" + currentString).createNewFile();
- log.debug( "Current directory: " + current);
+ new File( sourceDir, "current" + currentString ).createNewFile();
+ log.debug( "Current directory: " + current );
}
catch (IOException e) {
- throw new HibernateException( "Unable to initialize index: " + directoryProviderName, e );
+ throw new SearchException( "Unable to initialize index: " + directoryProviderName, e );
}
- timer = new Timer(true); //daemon thread, the copy algorithm is robust
- TimerTask task = new FSMasterDirectoryProvider.TriggerTask(indexName, source, this );
+ timer = new Timer( true ); //daemon thread, the copy algorithm is robust
+ TimerTask task = new FSMasterDirectoryProvider.TriggerTask( indexDir, sourceDir, this );
timer.scheduleAtFixedRate( task, period, period );
}
@@ -136,10 +119,10 @@
class TriggerTask extends TimerTask {
- private ExecutorService executor;
- private FSMasterDirectoryProvider.CopyDirectory copyTask;
+ private final ExecutorService executor;
+ private final FSMasterDirectoryProvider.CopyDirectory copyTask;
- public TriggerTask(String source, String destination, DirectoryProvider directoryProvider) {
+ public TriggerTask(File source, File destination, DirectoryProvider directoryProvider) {
executor = Executors.newSingleThreadExecutor();
copyTask = new FSMasterDirectoryProvider.CopyDirectory( source, destination, directoryProvider );
}
@@ -149,19 +132,19 @@
executor.execute( copyTask );
}
else {
- log.info( "Skipping directory synchronization, previous work still in progress: " + indexName);
+ log.info( "Skipping directory synchronization, previous work still in progress: " + indexName );
}
}
}
class CopyDirectory implements Runnable {
- private String source;
- private String destination;
+ private final File source;
+ private final File destination;
private volatile boolean inProgress;
private Lock directoryProviderLock;
private DirectoryProvider directoryProvider;
- public CopyDirectory(String source, String destination, DirectoryProvider directoryProvider) {
+ public CopyDirectory(File source, File destination, DirectoryProvider directoryProvider) {
this.source = source;
this.destination = destination;
this.directoryProvider = directoryProvider;
@@ -171,7 +154,7 @@
//TODO get rid of current and use the marker file instead?
long start = System.currentTimeMillis();
inProgress = true;
- if (directoryProviderLock == null) {
+ if ( directoryProviderLock == null ) {
directoryProviderLock = searchFactory.getLockableDirectoryProviders().get( directoryProvider );
directoryProvider = null;
searchFactory = null; //get rid of any useless link (help hot redeployment?)
@@ -180,26 +163,25 @@
directoryProviderLock.lock();
int oldIndex = current;
int index = current == 1 ? 2 : 1;
- File sourceFile = new File(source);
File destinationFile = new File(destination, Integer.valueOf(index).toString() );
//TODO make smart a parameter
try {
- log.trace("Copying " + sourceFile + " into " + destinationFile);
- FileHelper.synchronize( sourceFile, destinationFile, true);
+ log.trace( "Copying " + source + " into " + destinationFile );
+ FileHelper.synchronize( source, destinationFile, true );
current = index;
}
catch (IOException e) {
//don't change current
- log.error( "Unable to synchronize source of " + indexName, e);
+ log.error( "Unable to synchronize source of " + indexName, e );
inProgress = false;
return;
}
- if ( ! new File(destination, "current" + oldIndex).delete() ) {
+ if ( ! new File( destination, "current" + oldIndex ).delete() ) {
log.warn( "Unable to remove previous marker file from source of " + indexName );
}
try {
- new File(destination, "current" + index).createNewFile();
+ new File( destination, "current" + index ).createNewFile();
}
catch( IOException e ) {
log.warn( "Unable to create current marker in source of " + indexName, e );
@@ -209,7 +191,7 @@
directoryProviderLock.unlock();
inProgress = false;
}
- log.trace( "Copy for " + indexName + " took " + (System.currentTimeMillis() - start) + " ms");
+ log.trace( "Copy for " + indexName + " took " + (System.currentTimeMillis() - start) + " ms" );
}
}
Modified: search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2008-04-29 23:46:43 UTC (rev 14611)
+++ search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -10,14 +10,11 @@
import java.io.IOException;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.HibernateException;
import org.hibernate.AssertionFailure;
+import org.hibernate.search.SearchException;
import org.hibernate.search.util.FileHelper;
-import org.hibernate.search.util.DirectoryProviderHelper;
import org.hibernate.search.engine.SearchFactoryImplementor;
/**
@@ -30,9 +27,12 @@
* A copy is triggered every refresh seconds
*
* @author Emmanuel Bernard
+ * @author Sanne Grinovero
*/
public class FSSlaveDirectoryProvider implements DirectoryProvider<FSDirectory> {
+
private static Log log = LogFactory.getLog( FSSlaveDirectoryProvider.class );
+
private FSDirectory directory1;
private FSDirectory directory2;
private int current;
@@ -40,7 +40,7 @@
private Timer timer;
//variables needed between initialize and start
- private String source;
+ private File sourceIndexDir;
private File indexDir;
private String directoryProviderName;
private Properties properties;
@@ -49,58 +49,33 @@
this.properties = properties;
this.directoryProviderName = directoryProviderName;
//source guessing
- source = DirectoryProviderHelper.getSourceDirectory( "sourceBase", "source", directoryProviderName, properties );
- if (source == null)
- throw new IllegalStateException("FSSlaveDirectoryProvider requires a viable source directory");
- if ( ! new File(source, "current1").exists() && ! new File(source, "current2").exists() ) {
- throw new IllegalStateException("No current marker in source directory");
+ sourceIndexDir = DirectoryProviderHelper.getSourceDirectory( directoryProviderName, properties, false );
+ if ( ! new File( sourceIndexDir, "current1" ).exists() && ! new File( sourceIndexDir, "current2" ).exists() ) {
+ throw new IllegalStateException( "No current marker in source directory" );
}
- log.debug( "Source directory: " + source );
- indexDir = DirectoryProviderHelper.determineIndexDir( directoryProviderName, properties );
+ log.debug( "Source directory: " + sourceIndexDir.getPath() );
+ indexDir = DirectoryProviderHelper.getVerifiedIndexDir( directoryProviderName, properties, true );
log.debug( "Index directory: " + indexDir.getPath() );
try {
- boolean create = !indexDir.exists();
- if (create) {
- log.debug( "index directory not found, creating: '" + indexDir.getAbsolutePath() + "'" );
- indexDir.mkdirs();
- }
indexName = indexDir.getCanonicalPath();
}
catch (IOException e) {
- throw new HibernateException( "Unable to initialize index: " + directoryProviderName, e );
+ throw new SearchException( "Unable to initialize index: " + directoryProviderName, e );
}
}
public void start() {
- //source guessing
- String refreshPeriod = properties.getProperty( "refresh", "3600" );
- long period = Long.parseLong( refreshPeriod );
- log.debug("Refresh period " + period + " seconds");
- period *= 1000; //per second
+ long period = DirectoryProviderHelper.getRefreshPeriod( properties, directoryProviderName );
try {
- boolean create;
-
- File subDir = new File( indexName, "1" );
- create = ! subDir.exists();
- directory1 = FSDirectory.getDirectory( subDir.getCanonicalPath());
- if ( create ) {
- log.debug( "Initialize index: '" + subDir.getAbsolutePath() + "'" );
- IndexWriter iw = new IndexWriter( directory1, new StandardAnalyzer(), create );
- iw.close();
- }
-
- subDir = new File( indexName, "2" );
- create = ! subDir.exists();
- directory2 = FSDirectory.getDirectory( subDir.getCanonicalPath());
- if ( create ) {
- log.debug( "Initialize index: '" + subDir.getAbsolutePath() + "'" );
- IndexWriter iw = new IndexWriter( directory2, new StandardAnalyzer(), create );
- iw.close();
- }
- File currentMarker = new File(indexName, "current1");
- File current2Marker = new File(indexName, "current2");
+ directory1 = DirectoryProviderHelper.createFSIndex( new File(indexDir, "1") );
+ directory2 = DirectoryProviderHelper.createFSIndex( new File(indexDir, "2") );
+ File currentMarker = new File( indexDir, "current1" );
+ File current2Marker = new File( indexDir, "current2" );
if ( currentMarker.exists() ) {
current = 1;
+ if ( current2Marker.exists() ) {
+ current2Marker.delete(); //TODO or throw an exception?
+ }
}
else if ( current2Marker.exists() ) {
current = 2;
@@ -109,38 +84,38 @@
//no default
log.debug( "Setting directory 1 as current");
current = 1;
- File sourceFile = new File(source);
- File destinationFile = new File(indexName, Integer.valueOf(current).toString() );
+ File destinationFile = new File( indexDir, Integer.valueOf( current ).toString() );
int sourceCurrent;
- if ( new File(sourceFile, "current1").exists() ) {
+ if ( new File( sourceIndexDir, "current1").exists() ) {
sourceCurrent = 1;
}
- else if ( new File(sourceFile, "current2").exists() ) {
+ else if ( new File( sourceIndexDir, "current2").exists() ) {
sourceCurrent = 2;
}
else {
- throw new AssertionFailure("No current file marker found in source directory: " + source);
+ throw new AssertionFailure( "No current file marker found in source directory: " + sourceIndexDir.getPath() );
}
try {
- FileHelper.synchronize( new File(sourceFile, String.valueOf(sourceCurrent) ), destinationFile, true);
+ FileHelper.synchronize( new File( sourceIndexDir, String.valueOf(sourceCurrent) ), destinationFile, true);
}
catch (IOException e) {
- throw new HibernateException("Umable to synchonize directory: " + indexName, e);
+ throw new SearchException( "Unable to synchronize directory: " + indexName, e );
}
if (! currentMarker.createNewFile() ) {
- throw new HibernateException("Unable to create the directory marker file: " + indexName);
+ throw new SearchException( "Unable to create the directory marker file: " + indexName );
}
}
log.debug( "Current directory: " + current);
}
catch (IOException e) {
- throw new HibernateException( "Unable to initialize index: " + directoryProviderName, e );
+ throw new SearchException( "Unable to initialize index: " + directoryProviderName, e );
}
timer = new Timer(true); //daemon thread, the copy algorithm is robust
- TimerTask task = new TriggerTask(source, indexName);
+ TimerTask task = new TriggerTask( sourceIndexDir, indexDir );
timer.scheduleAtFixedRate( task, period, period );
}
+ //FIXME this is Thread-Unsafe! A memory barrier is missing.
public FSDirectory getDirectory() {
if (current == 1) {
return directory1;
@@ -149,7 +124,7 @@
return directory2;
}
else {
- throw new AssertionFailure("Illegal current directory: " + current);
+ throw new AssertionFailure( "Illegal current directory: " + current );
}
}
@@ -174,12 +149,12 @@
class TriggerTask extends TimerTask {
- private ExecutorService executor;
- private CopyDirectory copyTask;
+ private final ExecutorService executor;
+ private final CopyDirectory copyTask;
- public TriggerTask(String source, String destination) {
+ public TriggerTask(File sourceIndexDir, File destination) {
executor = Executors.newSingleThreadExecutor();
- copyTask = new CopyDirectory( source, destination );
+ copyTask = new CopyDirectory( sourceIndexDir, destination );
}
public void run() {
@@ -193,12 +168,12 @@
}
class CopyDirectory implements Runnable {
- private String source;
- private String destination;
+ private final File source;
+ private final File destination;
private volatile boolean inProgress;
- public CopyDirectory(String source, String destination) {
- this.source = source;
+ public CopyDirectory(File sourceIndexDir, File destination) {
+ this.source = sourceIndexDir;
this.destination = destination;
}
@@ -216,16 +191,16 @@
sourceFile = new File(source, "2");
}
else {
- log.error("Unable to determine current in source directory");
+ log.error( "Unable to determine current in source directory" );
inProgress = false;
return;
}
- File destinationFile = new File(destination, Integer.valueOf(index).toString() );
+ File destinationFile = new File( destination, Integer.valueOf( index ).toString() );
//TODO make smart a parameter
try {
- log.trace("Copying " + sourceFile + " into " + destinationFile);
- FileHelper.synchronize( sourceFile, destinationFile, true);
+ log.trace( "Copying " + sourceFile + " into " + destinationFile );
+ FileHelper.synchronize( sourceFile, destinationFile, true );
current = index;
}
catch (IOException e) {
@@ -234,11 +209,11 @@
inProgress = false;
return;
}
- if ( ! new File(indexName, "current" + oldIndex).delete() ) {
+ if ( ! new File( indexName, "current" + oldIndex ).delete() ) {
log.warn( "Unable to remove previous marker file in " + indexName );
}
try {
- new File(indexName, "current" + index).createNewFile();
+ new File( indexName, "current" + index ).createNewFile();
}
catch( IOException e ) {
log.warn( "Unable to create current marker file in " + indexName, e );
@@ -247,7 +222,7 @@
finally {
inProgress = false;
}
- log.trace( "Copy for " + indexName + " took " + (System.currentTimeMillis() - start) + " ms");
+ log.trace( "Copy for " + indexName + " took " + (System.currentTimeMillis() - start) + " ms" );
}
}
Deleted: search/trunk/src/java/org/hibernate/search/util/DirectoryProviderHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/util/DirectoryProviderHelper.java 2008-04-29 23:46:43 UTC (rev 14611)
+++ search/trunk/src/java/org/hibernate/search/util/DirectoryProviderHelper.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -1,93 +0,0 @@
-//$Id$
-package org.hibernate.search.util;
-
-import java.util.Properties;
-import java.io.File;
-import java.io.IOException;
-import java.text.MessageFormat;
-
-import org.hibernate.HibernateException;
-import org.hibernate.AssertionFailure;
-import org.hibernate.search.SearchException;
-import org.hibernate.annotations.common.util.StringHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author Emmanuel Bernard
- */
-public class DirectoryProviderHelper {
- private static Log log = LogFactory.getLog( DirectoryProviderHelper.class );
- /**
- * Build a directory name out of a root and relative path, guessing the significant part
- * and checking for the file availability
- *
- */
- public static String getSourceDirectory(String rootPropertyName, String relativePropertyName,
- String directoryProviderName, Properties properties) {
- //TODO check that it's a directory
- String root = properties.getProperty( rootPropertyName );
- String relative = properties.getProperty( relativePropertyName );
- if ( log.isTraceEnabled() ) {
- log.trace(
- "Guess source directory from " + rootPropertyName + " " + root != null ? root : "<null>"
- + " and " + relativePropertyName + " " + relative != null ? relative : "<null>"
- );
- }
- if (relative == null) relative = directoryProviderName;
- if ( StringHelper.isEmpty( root ) ) {
- log.debug( "No root directory, go with relative " + relative );
- File sourceFile = new File(relative);
- if ( ! sourceFile.exists() ) {
- throw new SearchException("Unable to read source directory: " + relative);
- }
- //else keep source as it
- }
- else {
- File rootDir = new File(root);
- if ( ! rootDir.exists() ) {
- rootDir.mkdirs();
- }
- else if ( ! rootDir.isDirectory() ) {
- throw new SearchException(rootPropertyName + " is not a directory");
- }
- //test it again in case mkdir failed for wrong reasons
- if ( rootDir.exists() ) {
- File sourceFile = new File(root, relative);
- if (! sourceFile.exists() ) sourceFile.mkdirs();
- log.debug( "Get directory from root + relative");
- try {
- relative = sourceFile.getCanonicalPath();
- }
- catch (IOException e) {
- throw new AssertionFailure("Unable to get canonical path: " + root + " + " + relative);
- }
- }
- else {
- throw new SearchException(rootPropertyName + " does not exist and cannot be created");
- }
- }
- return relative;
- }
-
- public static File determineIndexDir(String directoryProviderName, Properties properties) {
- String indexBase = properties.getProperty( "indexBase", "." );
- String indexName = properties.getProperty( "indexName", directoryProviderName );
- File indexDir = new File( indexBase );
- if ( ! indexDir.exists() ) {
- //if the base directory does not exist, create it
- //we do not fear concurrent creation since mkdir does not raise exceptions
- indexDir.mkdirs();
- }
- else if ( ! indexDir.isDirectory() ) {
- throw new SearchException( MessageFormat.format( "Index directory is not a directory: {0}", indexBase ) );
- }
- if ( !indexDir.canWrite() ) {
- throw new SearchException( "Cannot write into index directory: "
- + ( indexDir.isAbsolute() ? indexBase : indexDir.getAbsolutePath() ) );
- }
-
- indexDir = new File( indexDir, indexName );
- return indexDir;
- }
-}
Modified: search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java 2008-04-29 23:46:43 UTC (rev 14611)
+++ search/trunk/src/test/org/hibernate/search/test/FSDirectoryTest.java 2008-04-30 00:27:12 UTC (rev 14612)
@@ -14,28 +14,29 @@
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
import org.hibernate.Session;
import org.hibernate.event.PostDeleteEventListener;
import org.hibernate.event.PostInsertEventListener;
import org.hibernate.event.PostUpdateEventListener;
import org.hibernate.search.Environment;
import org.hibernate.search.event.FullTextIndexEventListener;
+import org.hibernate.search.store.DirectoryProviderHelper;
import org.hibernate.search.store.FSDirectoryProvider;
-import org.hibernate.search.util.DirectoryProviderHelper;
+import org.hibernate.search.util.FileHelper;
/**
* @author Gavin King
*/
public class FSDirectoryTest extends SearchTestCase {
-
protected void setUp() throws Exception {
File sub = getBaseIndexDir();
sub.mkdir();
File[] files = sub.listFiles();
for (File file : files) {
if ( file.isDirectory() ) {
- delete( file );
+ FileHelper.delete( file );
}
}
//super.setUp(); //we need a fresh session factory each time for index set up
@@ -51,44 +52,22 @@
protected void tearDown() throws Exception {
super.tearDown();
File sub = getBaseIndexDir();
- delete( sub );
+ FileHelper.delete( sub );
}
- private void delete(File sub) {
- if ( sub.isDirectory() ) {
- for (File file : sub.listFiles()) {
- delete( file );
- }
- sub.delete();
- }
- else {
- sub.delete();
- }
- }
-
- private void recursiveDelete(File f) {
- for (File file : f.listFiles()) {
- if ( file.isDirectory() ) {
- recursiveDelete( file );
- }
- }
- f.delete();
- }
-
public void testDirectoryProviderHelperMkdirsGetSource() throws Exception {
String root = "./testDir";
String relative = "dir1/dir2/dir3";
Properties properties = new Properties();
- properties.put( "root", root );
- properties.put( "relative", relative );
+ properties.put( "sourceBase", root );
+ properties.put( "source", relative );
- String rel = DirectoryProviderHelper.getSourceDirectory( "root", "relative", "name", properties );
+ File rel = DirectoryProviderHelper.getSourceDirectory( "name", properties, true );
- File f = new File( rel );
- assertTrue( f.exists() );
+ assertTrue( rel.exists() );
- recursiveDelete( new File( root ) );
+ FileHelper.delete( new File( root ) );
}
public void testDirectoryProviderHelperMkdirsDetermineIndex() throws Exception {
@@ -99,16 +78,15 @@
properties.put( "indexBase", root );
properties.put( "indexName", relative );
- File f = DirectoryProviderHelper.determineIndexDir( "name", properties );
+ File f = DirectoryProviderHelper.getVerifiedIndexDir( "name", properties, true );
assertTrue( new File( root ).exists() );
- recursiveDelete( new File( "./testDir" ) );
+ FileHelper.delete( new File( "./testDir" ) );
}
public void testEventIntegration() throws Exception {
-
Session s = getSessions().openSession();
s.getTransaction().begin();
s.persist(
@@ -205,7 +183,6 @@
searcher.close();
}
-
s = getSessions().openSession();
s.getTransaction().begin();
List list = s.createQuery( "from Document" ).list();
@@ -216,6 +193,24 @@
s.close();
}
+ public void testSearchOnDeletedIndex() throws Exception {
+ Session s = getSessions().openSession();
+ s.getTransaction().begin();
+ s.persist( new Document( "Hibernate Search in Action", "", "") );
+ s.getTransaction().commit();
+ s.close();
+
+ IndexSearcher searcher = new IndexSearcher( new File( getBaseIndexDir(), "Documents" ).getCanonicalPath() );
+ // deleting before search, but after IndexSearcher creation:
+ // ( fails when deleting -concurrently- to IndexSearcher initialization! )
+ FileHelper.delete(getBaseIndexDir());
+ TermQuery query = new TermQuery( new Term("title","action") );
+ Hits hits = searcher.search( query );
+ assertEquals( 1, hits.length() );
+ assertEquals( "Hibernate Search in Action", hits.doc( 0 ).get( "title" ) );
+ searcher.close();
+ }
+
protected Class[] getMappings() {
return new Class[] {
Document.class
16 years, 8 months
- 1
- 0
Hibernate SVN: r14611 - core/branches/Branch_3_2/test/org/hibernate/test/ops.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-04-29 19:46:43 -0400 (Tue, 29 Apr 2008)
New Revision: 14611
Modified:
core/branches/Branch_3_2/test/org/hibernate/test/ops/MergeTest.java
Log:
added tests for merging initialized and uninitialized managed collections
Modified: core/branches/Branch_3_2/test/org/hibernate/test/ops/MergeTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/ops/MergeTest.java 2008-04-29 23:02:13 UTC (rev 14610)
+++ core/branches/Branch_3_2/test/org/hibernate/test/ops/MergeTest.java 2008-04-29 23:46:43 UTC (rev 14611)
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import junit.framework.Test;
@@ -561,6 +562,94 @@
// cleanup();
}
+ public void testMergeManagedUninitializedCollection() {
+
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ NumberedNode root = new NumberedNode( "root" );
+ root.addChild( new NumberedNode( "child" ) );
+ s.persist(root);
+ tx.commit();
+ s.close();
+
+ clearCounts();
+
+ NumberedNode newRoot = new NumberedNode( "root" );
+ newRoot.setId( root.getId() );
+
+ s = openSession();
+ tx = s.beginTransaction();
+ root = ( NumberedNode ) s.get( NumberedNode.class, new Long( root.getId() ) );
+ Set managedChildren = root.getChildren();
+ assertFalse( Hibernate.isInitialized( managedChildren ) );
+ newRoot.setChildren( managedChildren );
+ assertSame( root, s.merge( newRoot ) );
+ assertSame( managedChildren, root.getChildren() );
+ assertFalse( Hibernate.isInitialized( managedChildren ) );
+ tx.commit();
+
+ assertInsertCount(0);
+ assertUpdateCount(0);
+ assertDeleteCount(0);
+
+ tx = s.beginTransaction();
+ assertEquals(
+ s.createCriteria(NumberedNode.class)
+ .setProjection( Projections.rowCount() )
+ .uniqueResult(),
+ new Integer(2)
+ );
+ tx.commit();
+
+ s.close();
+
+// cleanup();
+ }
+
+ public void testMergeManagedInitializedCollection() {
+
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ NumberedNode root = new NumberedNode( "root" );
+ root.addChild( new NumberedNode( "child" ) );
+ s.persist(root);
+ tx.commit();
+ s.close();
+
+ clearCounts();
+
+ NumberedNode newRoot = new NumberedNode( "root" );
+ newRoot.setId( root.getId() );
+
+ s = openSession();
+ tx = s.beginTransaction();
+ root = ( NumberedNode ) s.get( NumberedNode.class, new Long( root.getId() ) );
+ Set managedChildren = root.getChildren();
+ Hibernate.initialize( managedChildren );
+ assertTrue( Hibernate.isInitialized( managedChildren ) );
+ newRoot.setChildren( managedChildren );
+ assertSame( root, s.merge( newRoot ) );
+ assertSame( managedChildren, root.getChildren() );
+ assertTrue( Hibernate.isInitialized( managedChildren ) );
+ tx.commit();
+
+ assertInsertCount(0);
+ assertUpdateCount(0);
+ assertDeleteCount(0);
+
+ tx = s.beginTransaction();
+ assertEquals(
+ s.createCriteria(NumberedNode.class)
+ .setProjection( Projections.rowCount() )
+ .uniqueResult(),
+ new Integer(2)
+ );
+ tx.commit();
+
+ s.close();
+
+// cleanup();
+ }
public void testRecursiveMergeTransient() {
Session s = openSession();
Transaction tx = s.beginTransaction();
16 years, 8 months
- 1
- 0
Hibernate SVN: r14610 - core/trunk/testsuite/src/test/java/org/hibernate/test/ops.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-04-29 19:02:13 -0400 (Tue, 29 Apr 2008)
New Revision: 14610
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/ops/MergeTest.java
Log:
added tests for merging initialized and uninitialized managed collections
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ops/MergeTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/ops/MergeTest.java 2008-04-29 02:06:27 UTC (rev 14609)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/ops/MergeTest.java 2008-04-29 23:02:13 UTC (rev 14610)
@@ -4,16 +4,17 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import junit.framework.Test;
import org.hibernate.Hibernate;
+import org.hibernate.NonUniqueObjectException;
import org.hibernate.Session;
+import org.hibernate.StaleObjectStateException;
import org.hibernate.Transaction;
-import org.hibernate.NonUniqueObjectException;
-import org.hibernate.StaleObjectStateException;
+import org.hibernate.criterion.Projections;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
-import org.hibernate.criterion.Projections;
/**
* @author Gavin King
@@ -561,6 +562,95 @@
cleanup();
}
+ public void testMergeManagedUninitializedCollection() {
+
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ NumberedNode root = new NumberedNode( "root" );
+ root.addChild( new NumberedNode( "child" ) );
+ s.persist(root);
+ tx.commit();
+ s.close();
+
+ clearCounts();
+
+ NumberedNode newRoot = new NumberedNode( "root" );
+ newRoot.setId( root.getId() );
+
+ s = openSession();
+ tx = s.beginTransaction();
+ root = ( NumberedNode ) s.get( NumberedNode.class, root.getId() );
+ Set managedChildren = root.getChildren();
+ assertFalse( Hibernate.isInitialized( managedChildren ) );
+ newRoot.setChildren( managedChildren );
+ assertSame( root, s.merge( newRoot ) );
+ assertSame( managedChildren, root.getChildren() );
+ assertFalse( Hibernate.isInitialized( managedChildren ) );
+ tx.commit();
+
+ assertInsertCount(0);
+ assertUpdateCount(0);
+ assertDeleteCount(0);
+
+ tx = s.beginTransaction();
+ assertEquals(
+ s.createCriteria(NumberedNode.class)
+ .setProjection( Projections.rowCount() )
+ .uniqueResult(),
+ new Integer(2)
+ );
+ tx.commit();
+
+ s.close();
+
+ cleanup();
+ }
+
+ public void testMergeManagedInitializedCollection() {
+
+ Session s = openSession();
+ Transaction tx = s.beginTransaction();
+ NumberedNode root = new NumberedNode( "root" );
+ root.addChild( new NumberedNode( "child" ) );
+ s.persist(root);
+ tx.commit();
+ s.close();
+
+ clearCounts();
+
+ NumberedNode newRoot = new NumberedNode( "root" );
+ newRoot.setId( root.getId() );
+
+ s = openSession();
+ tx = s.beginTransaction();
+ root = ( NumberedNode ) s.get( NumberedNode.class, root.getId() );
+ Set managedChildren = root.getChildren();
+ Hibernate.initialize( managedChildren );
+ assertTrue( Hibernate.isInitialized( managedChildren ) );
+ newRoot.setChildren( managedChildren );
+ assertSame( root, s.merge( newRoot ) );
+ assertSame( managedChildren, root.getChildren() );
+ assertTrue( Hibernate.isInitialized( managedChildren ) );
+ tx.commit();
+
+ assertInsertCount(0);
+ assertUpdateCount(0);
+ assertDeleteCount(0);
+
+ tx = s.beginTransaction();
+ assertEquals(
+ s.createCriteria(NumberedNode.class)
+ .setProjection( Projections.rowCount() )
+ .uniqueResult(),
+ new Integer(2)
+ );
+ tx.commit();
+
+ s.close();
+
+ cleanup();
+ }
+
public void testRecursiveMergeTransient() {
Session s = openSession();
Transaction tx = s.beginTransaction();
16 years, 8 months
- 1
- 0
Hibernate SVN: r14609 - in core/trunk/documentation: releasenotes and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-04-28 22:06:27 -0400 (Mon, 28 Apr 2008)
New Revision: 14609
Modified:
core/trunk/documentation/jbosscache2/
core/trunk/documentation/releasenotes/
Log:
svn ignores
Property changes on: core/trunk/documentation/jbosscache2
___________________________________________________________________
Name: svn:ignore
- target
.project
.settings
+ target
local
*.ipr
*.iws
*.iml
.classpath
.project
.nbattrs
*.log
*.properties
.clover
Property changes on: core/trunk/documentation/releasenotes
___________________________________________________________________
Name: svn:ignore
+ target
local
*.ipr
*.iws
*.iml
.classpath
.project
.nbattrs
*.log
*.properties
.clover
16 years, 8 months
- 1
- 0
Hibernate SVN: r14608 - in core/trunk/documentation/manual/src/main/docbook/en-US: content and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-04-28 21:53:28 -0400 (Mon, 28 Apr 2008)
New Revision: 14608
Modified:
core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Reference.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/architecture.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/batch.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/best_practices.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/configuration.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/events.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/example_mappings.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/example_parentchild.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/example_weblog.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/filters.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/inheritance_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/preface.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/query_criteria.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/query_hql.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/session_api.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/toolset_guide.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/transactions.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/xml.xml
core/trunk/documentation/manual/src/main/docbook/en-US/legal_notice.xml
core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml
Log:
updated copyright headers
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Reference.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Reference.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Reference.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,18 +1,27 @@
<?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) 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, 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
+ ~
-->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY versionNumber "3.3.0.CR1">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/architecture.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/architecture.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/architecture.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,21 +1,31 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
<!--
- ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ ~ 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, 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
+ ~
-->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
<chapter id="architecture">
<title>Architecture</title>
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="associations">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="mapping">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/batch.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/batch.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/batch.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?xml version='1.0' encoding="iso-8859-1"?>
+<!--
+ ~ 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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="batch">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/best_practices.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/best_practices.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/best_practices.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="best-practices" revision="3">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="collections">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="components">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/configuration.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/configuration.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/configuration.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="session-configuration" revision="1">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/events.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/events.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/events.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="events">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/example_mappings.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/example_mappings.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/example_mappings.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,21 +1,31 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
<!--
- ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ ~ 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, 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
+ ~
-->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
<chapter id="example-mappings">
<title>Example: Various Mappings</title>
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/example_parentchild.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/example_parentchild.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/example_parentchild.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="example-parentchild">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/example_weblog.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/example_weblog.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/example_weblog.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="example-weblog">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/filters.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/filters.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/filters.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="filters">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/inheritance_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/inheritance_mapping.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/inheritance_mapping.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="inheritance">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="performance">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/persistent_classes.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="persistent-classes" revision="2">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/preface.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/preface.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/preface.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,22 +1,31 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
<!--
- ~ Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.
+ ~ 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, 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
+ ~
-->
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
<preface id="preface">
<title>Preface</title>
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/query_criteria.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/query_criteria.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/query_criteria.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="querycriteria">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/query_hql.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/query_hql.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/query_hql.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="queryhql" revision="1">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="querysql" revision="2">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/session_api.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/session_api.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/session_api.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="objectstate">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/toolset_guide.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/toolset_guide.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/toolset_guide.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="toolsetguide" revision="2">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/transactions.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/transactions.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/transactions.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="transactions" revision="2">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY mdash "-">
]>
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/xml.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/xml.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/xml.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="xml">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/legal_notice.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/legal_notice.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/legal_notice.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,18 +1,27 @@
<?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) 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, 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
+ ~
-->
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml 2008-04-29 01:35:59 UTC (rev 14607)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml 2008-04-29 01:53:28 UTC (rev 14608)
@@ -1,4 +1,29 @@
<?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
+ ~
+ -->
+
<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<authorgroup id="AuthorGroup">
16 years, 8 months
- 1
- 0
Hibernate SVN: r14607 - core/trunk/documentation/releasenotes.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-04-28 21:35:59 -0400 (Mon, 28 Apr 2008)
New Revision: 14607
Modified:
core/trunk/documentation/releasenotes/pom.xml
Log:
added images resource
Modified: core/trunk/documentation/releasenotes/pom.xml
===================================================================
--- core/trunk/documentation/releasenotes/pom.xml 2008-04-29 01:35:28 UTC (rev 14606)
+++ core/trunk/documentation/releasenotes/pom.xml 2008-04-29 01:35:59 UTC (rev 14607)
@@ -76,6 +76,13 @@
<configuration>
<sourceDocumentName>en-US/Release_Notes.xml</sourceDocumentName>
<masterTranslation>en-US</masterTranslation>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en-US</directory>
+ <includes>
+ <include>**/*.svg</include>
+ <include>**/*.png</include>
+ </includes>
+ </imageResource>
<formats>
<format>
<formatName>pdf</formatName>
16 years, 8 months
- 1
- 0
Hibernate SVN: r14606 - core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content.
by hibernate-commits＠lists.jboss.org
Author: bsatguna
Date: 2008-04-28 21:35:28 -0400 (Mon, 28 Apr 2008)
New Revision: 14606
Added:
core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Boilerplate.xml
core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Code-Conventions.xml
core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Conventions.xml
core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Entities.ent
core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Feedback.xml
core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Legal_Notice.xml
core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Translatable-Entities.ent
Log:
adding files in common_content folder
Added: core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Boilerplate.xml
===================================================================
--- core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Boilerplate.xml (rev 0)
+++ core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Boilerplate.xml 2008-04-29 01:35:28 UTC (rev 14606)
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Release_Notes.ent">
+%BOOK_ENTITIES;
+<!ENTITY % RH_ENTITIES SYSTEM "Entities.ent">
+%RH_ENTITIES;
+
+]>
+<legalnotice>
+ <para>
+ Copyright <trademark class="copyright"></trademark> 2007 by Red Hat,
+ Inc. This material may be distributed only subject to the terms and
+ conditions set forth in the Open Publication License, V1.0 or later
+ (the latest version is presently available at
+ <ulink url="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</ulink>).
+ </para>
+ <para>
+ Distribution of substantively modified versions of this document is
+ prohibited without the explicit permission of the copyright holder.
+ </para>
+ <para>
+ Distribution of the work or derivative of the work in any standard
+ (paper) book form for commercial purposes is prohibited unless prior
+ permission is obtained from the copyright holder.
+ </para>
+ <para>
+ Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of
+ Red Hat, Inc. in the United States and other countries.
+ </para>
+ <para>
+ All other trademarks referenced herein are the property of their
+ respective owners.
+ </para>
+ <para>
+ The GPG fingerprint of the security(a)redhat.com key is:
+ </para>
+ <para>
+ CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E
+ </para>
+ <para>
+<address><street>1801 Varsity Drive</street>
+<city>Raleigh</city>, <state>NC</state> <postcode>27606-2072</postcode>
+<country>USA</country>
+<phone>Phone: +1 919 754 3700</phone>
+<phone>Phone: 888 733 4281</phone>
+<fax>Fax: +1 919 754 3701</fax>
+<pob>PO Box 13588</pob>
+<city>Research Triangle Park</city>, <state>NC</state> <postcode>27709</postcode>
+<country>USA</country></address>
+ </para>
+</legalnotice>
Added: core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Code-Conventions.xml
===================================================================
--- core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Code-Conventions.xml (rev 0)
+++ core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Code-Conventions.xml 2008-04-29 01:35:28 UTC (rev 14606)
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Release_Notes.ent">
+%BOOK_ENTITIES;
+<!ENTITY % RH_ENTITIES SYSTEM "Entities.ent">
+%RH_ENTITIES;
+
+]>
+<section id="r-sn-code-conventions">
+ <title>Code Presentation Conventions</title>
+
+ <para>
+ In addition to the standard document conventions covered in
+ <xref
+ linkend="sn-conventions" />, there are some additional
+ conventions related specifically to discussing source code:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term><classname>classname</classname></term>
+ <listitem>
+ <para>
+ This is the name of a class in an object-oriented
+ (<firstterm>OO</firstterm>) programming language. For example, the
+ class
+ <classname>com.arsdigita.categorization.CategoryTreeNode</classname>
+ .
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><methodname>method name</methodname></term>
+ <listitem>
+ <para>
+ This is the name of a method in an OO programming language, e.g.
+ the method
+ <methodname>getBaseDataObjectType</methodname>
+ .
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><function>function</function></term>
+ <listitem>
+ <para>
+ The name of a function or subroutine, as in a programming language.
+ For example, the function
+ <function>SecurityLogger.warn()</function>
+ .
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><varname>variable name</varname></term>
+ <listitem>
+ <para>
+ The name of a variable. For example, the variable
+ <varname>BASE_DATA_OBJECT_TYPE</varname>
+ .
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>option</option></term>
+ <listitem>
+ <para>
+ An option for a software command or
+ <methodname>Method</methodname>
+ . For example, a user has been granted <option>read</option>
+ privileges on an object.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><returnvalue>return value</returnvalue></term>
+ <listitem>
+ <para>
+ The value returned by a function. For example, a method returns
+ <returnvalue>null</returnvalue>
+ .
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>program listing</term>
+ <listitem>
+ <para>
+ A literal listing of all or part of a program:
+ </para>
+<programlisting>
+<![CDATA[
+extern void sem_exit (void);
+extern struct task_struct *child_reaper;
+
+int getrusage(struct task_struct *, int, struct rusage *);
+
+static void __unhash_process(struct task_struct *p)
+{
+ nr_threads--;
+ detach_pid(p, PIDTYPE_PID);
+ detach_pid(p, PIDTYPE_TGID);
+ if (thread_group_leader(p)) {
+ detach_pid(p, PIDTYPE_PGID);
+ detach_pid(p, PIDTYPE_SID);
+ }
+
+ REMOVE_LINKS(p);
+ p->pid = 0;
+}
+]]>
+</programlisting>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>first term</term>
+ <listitem>
+ <para>
+ The first occurrence of a term, such as the first time we introduce
+ a <firstterm>bulletin-board</firstterm> and note its abbreviated
+ form, <firstterm>bboard</firstterm>.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</section>
Added: core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Conventions.xml
===================================================================
--- core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Conventions.xml (rev 0)
+++ core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Conventions.xml 2008-04-29 01:35:28 UTC (rev 14606)
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Release_Notes.ent">
+%BOOK_ENTITIES;
+]>
+<section>
+ <title>Document Conventions</title>
+
+ <para>
+ Certain words in this manual are represented in different fonts,
+ styles, and weights. This highlighting indicates that the word is part
+ of a specific category. The categories include the following:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term><literal>Courier font</literal></term>
+ <listitem>
+ <para>
+ Courier font represents <command>commands</command>, <filename>file
+ names and paths</filename>, and
+ <prompt>prompts</prompt>
+ .
+ </para>
+ <para>
+ When shown as below, it indicates computer output:
+<screen>
+Desktop about.html logs paulwesterberg.png
+Mail backupfiles mail reports
+</screen>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><userinput>bold Courier font</userinput></term>
+ <listitem>
+ <para>
+ Bold Courier font represents text that you are to type, such as:
+ <userinput>service jonas start</userinput>
+ </para>
+ <para>
+ If you have to run a command as root, the root prompt
+ (<literal>#</literal>) precedes the command:
+ </para>
+<screen>
+# <userinput>gconftool-2
+</userinput>
+ </screen>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><replaceable>italic Courier font</replaceable></term>
+ <listitem>
+ <para>
+ Italic Courier font represents a variable, such as an installation
+ directory: <filename>
+ <replaceable>install_dir</replaceable>/bin/</filename>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><application>bold font</application></term>
+ <listitem>
+ <para>
+ Bold font represents <application>application
+ programs</application> and <guilabel>text found on a graphical
+ interface</guilabel>.
+ </para>
+ <para>
+ When shown like this: <guibutton> OK </guibutton>, it indicates a
+ button on a graphical application interface.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ Additionally, the manual uses different strategies to draw your
+ attention to pieces of information. In order of how critical the
+ information is to you, these items are marked as follows:
+ </para>
+
+ <note>
+ <title>Note</title>
+
+ <para>
+ A note is typically information that you need to understand the
+ behavior of the system.
+ </para>
+ </note>
+ <tip>
+ <title>Tip</title>
+ <para>
+ A tip is typically an alternative way of performing a task.
+ </para>
+ </tip>
+ <important>
+ <title>Important</title>
+
+ <para>
+ Important information is necessary, but possibly unexpected, such as
+ a configuration change that will not persist after a reboot.
+ </para>
+ </important>
+
+ <caution>
+ <title>Caution</title>
+
+ <para>
+ A caution indicates an act that would violate your support agreement,
+ such as recompiling the kernel.
+ </para>
+ </caution>
+
+ <warning>
+ <title>Warning</title>
+
+ <para>
+ A warning indicates potential data loss, as may happen when tuning
+ hardware for maximum performance.
+ </para>
+ </warning>
+</section>
Added: core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Entities.ent
===================================================================
--- core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Entities.ent (rev 0)
+++ core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Entities.ent 2008-04-29 01:35:28 UTC (rev 14606)
@@ -0,0 +1,115 @@
+<!ENTITY RH "Red Hat">
+<!ENTITY RHI "&RH; Inc.">
+<!ENTITY HOLDER "&RHI;">
+<!ENTITY YEAR "You need to override the YEAR enity in your local ent file">
+<!ENTITY BOOKID "You need to override the BOOKID enity in your local ent file">
+<!ENTITY PRODUCT "You need to override the PRODUCT enity in your local ent file">
+
+<!-- everything below here may need to be removed? -->
+<!ENTITY CCAG "&RHI; &CC; &CAG;">
+<!ENTITY CCIG "&RHI; &CC; &CIG;">
+<!ENTITY CCRN "&RHI; &CC; &RN;">
+<!ENTITY CCUG "&RHI; &CC; &UG;">
+<!ENTITY CCVER "4.0">
+<!ENTITY CLUMANAGER-386-RPM "clumanager-1.0.4-1.i386.rpm">
+<!ENTITY CRTSAG "&CRTS; &AG;">
+<!ENTITY CRTSAGG "&CRTS; &AGG;">
+<!ENTITY CRTS "Certificate System">
+<!ENTITY CRTSCLTG "&CRTS; &CLTG;">
+<!ENTITY CRTSMG "&CRTS; &MG;">
+<!ENTITY CS "Engineering Content Services">
+<!ENTITY DG "&DCAG;">
+<!ENTITY DPG "&DCAG;">
+<!ENTITY DSAG "&DS; &AG;">
+<!ENTITY DSCCFR "&DS; &CCFR;">
+<!ENTITY DSDGG "&DS; &DGG;">
+<!ENTITY DS "Directory Server">
+<!ENTITY DSC "&DS; Console">
+<!ENTITY DSDPG "&DS; &DPG;">
+<!ENTITY DSGCG "&DS; &GCG;">
+<!ENTITY DSIG "&DS; &IG;">
+<!ENTITY DSOC "&DS; &OC;">
+<!ENTITY DSPPR "&DS; &PPR;">
+<!ENTITY DSRK "&DS; &RK;">
+<!ENTITY EM64T "Intel EM64T">
+<!ENTITY FC "&FED; Core;">
+<!ENTITY FED "Fedora">
+<!ENTITY FIGUREDASH "‒">
+<!ENTITY FORMAL-RHI "&RH;, Inc.">
+<!ENTITY FORT "Fortitude">
+<!ENTITY HYPHEN "‐">
+<!ENTITY IPVS-386-RPM "ipvsadm-1.18-8.i386.rpm">
+<!ENTITY JBEAPVER "4.2">
+<!ENTITY KERNVER "2.6.x">
+<!ENTITY LEGALNOTICE-IDM SYSTEM "./boilerplate-idm.xml">
+<!ENTITY LOCALVER "7.3">
+<!ENTITY MINUS "−">
+<!ENTITY NBHYPHEN "‑">
+<!ENTITY NES "NES">
+<!ENTITY NSS "NSS">
+<!ENTITY ORG "&RHIS;">
+<!ENTITY PG "&SELG;">
+<!ENTITY PIRANHA-386-RPM "piranha-0.7.0-1.i386.rpm">
+<!ENTITY PROD "&RHEL;">
+<!ENTITY PRODVER "&RHELVER;">
+<!ENTITY PROXYIG "&RHN; &PROXYVER; &PROXYX; &IG;">
+<!ENTITY PROXYVER "4.2.0">
+<!ENTITY QUOTEDASH "―">
+<!ENTITY RA "Registration Authority">
+<!ENTITY RHASVER "V.1.1">
+<!ENTITY RHCC "&RHI; &CC;">
+<!ENTITY RHCRTSAGG "&RHI; &CRTSAGG;">
+<!ENTITY RHCRTSAG "&RHI; &CRTSAG;">
+<!ENTITY RHCRTSCLTG "&RHI; &CRTSCLTG;">
+<!ENTITY RHCRTSMG "&RHI; &CRTSMG;">
+<!ENTITY RHCRTS "&RHI; &CRTS;">
+<!ENTITY RHCRTSVER "8.0">
+<!ENTITY RHCSG "&RHCS; &CMIAG;">
+<!ENTITY RHCSGS "rh-cs">
+<!ENTITY RHDSAG "&RHI; &DSAG;">
+<!ENTITY RHDSCCFR "&RHI; &DSCCFR;">
+<!ENTITY RHDSDGG "&RHI; &DSDGG;">
+<!ENTITY RHDSDPG "&RHI; &DSDPG;">
+<!ENTITY RHDSGCG "&RHI; &DSGCG;">
+<!ENTITY RHDSIG "&RHI; &DSIG;">
+<!ENTITY RHDSOC "&RHI; &DSOC;">
+<!ENTITY RHDSPPR "&RHI; &DSPPR;">
+<!ENTITY RHDS "&RHI; &DS;">
+<!ENTITY RHDSVER "8.0.0">
+<!ENTITY RHELIG "&RHEL; &IG;">
+<!ENTITY RHELIGS390S "rhel-ig-s390">
+<!ENTITY RHELIGX8664S "rhel-ig-x8664">
+<!ENTITY RHELISA "&RHEL; &ISA;">
+<!ENTITY RHELQIGS390S "rhel-qig-s390">
+<!ENTITY RHELQIGX8664S "rhel-qig-x8664">
+<!ENTITY RHELRG "&RHEL; &RG;">
+<!ENTITY RHELSAG "&RHEL; &SAG;">
+<!ENTITY RHELSBS "&RHEL; &SBS;">
+<!ENTITY RHELSG "&RHEL; &SG;">
+<!ENTITY RHELVER "5.0.0">
+<!ENTITY RHFORT "&RHI; &FORT;">
+<!ENTITY RHGFSG "&RHGFS; &GFSIAG;">
+<!ENTITY RHGFSGS "rh-gfsg">
+<!ENTITY RHGFS "&RH; GFS">
+<!ENTITY RHLAS "&RHELAS;">
+<!ENTITY RHLASVER "2.1">
+<!ENTITY RHLIA64ASS "rhl-ig-as-itanium">
+<!ENTITY RHLIA64ASVER "2.1">
+<!ENTITY RHLIA64AWS "rhl-ig-aw-itanium">
+<!ENTITY RHLIA64AWVER "2.1">
+<!ENTITY RHLIA64S "rhl-ig-itanium">
+<!ENTITY RHLIGIA64 "&RHL; Itanium &IG;">
+<!ENTITY RHL "&RH; Linux">
+<!ENTITY RHLS390S "rhl-ig-s390">
+<!ENTITY RHNRG "&RHN; &RG;">
+<!ENTITY RHNVER "5.0.0">
+<!ENTITY RHNX "RHN">
+<!ENTITY RHSELG "&RHI; &SELG;">
+<!ENTITY RHSELGS "rhel-selg">
+<!ENTITY ROOT "<systemitem class='username'>root</systemitem>">
+<!ENTITY SATIG "&RHN; &SATVER; &SATX; &IG;">
+<!ENTITY SATVER "4.2.0">
+<!ENTITY SEL "SELinux">
+<!ENTITY SHARED-SCSI-386-RPM "scsi_reserve-0.7-6.i386.rpm">
+<!ENTITY SMPM "solaris2mpm">
+<!ENTITY X8664 "x86, Itanium, AMD64, and &EM64TLONG; (&EM64T;)">
Added: core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Feedback.xml
===================================================================
--- core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Feedback.xml (rev 0)
+++ core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Feedback.xml 2008-04-29 01:35:28 UTC (rev 14606)
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Release_Notes.ent">
+%BOOK_ENTITIES;
+
+]>
+<section id="We_Need_Feedback">
+ <title>We Need Feedback!</title>
+ <indexterm>
+ <primary>feedback</primary>
+ <secondary>contact information for this manual</secondary>
+ </indexterm>
+ <para>
+ If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a report in Bugzilla: <ulink url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.redhat.com/bugzilla/</ulink>
+ against the product <application>&PRODUCT;.</application>
+ </para>
+
+ <para>
+ When submitting a bug report, be sure to mention the manual's identifier: <citetitle>&BOOKID;</citetitle>
+ </para>
+
+ <para>
+ If you have a suggestion for improving the documentation, try to be as specific as possible when describing it. If you have found an error, please include the section number and some of the surrounding text so we can find it easily.
+ </para>
+</section>
Added: core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Legal_Notice.xml
===================================================================
--- core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Legal_Notice.xml (rev 0)
+++ core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Legal_Notice.xml 2008-04-29 01:35:28 UTC (rev 14606)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Release_Notes.ent">
+%BOOK_ENTITIES;
+<!ENTITY % RH_ENTITIES SYSTEM "Entities.ent">
+%RH_ENTITIES;
+
+]>
+<legalnotice>
+ <para>
+ Copyright <trademark class="copyright"></trademark> &YEAR; &HOLDER;. This material may only be distributed subject to the terms and conditions set forth in the Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported License (which is presently available at <ulink url="http://creativecommons.org/licenses/by-nc-sa/3.0/">http://creativecommons.org/licenses/by-nc-sa/3.0/</ulink>).
+ </para>
+ <para>
+ Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of Red Hat, Inc. in the United States and other countries.
+ </para>
+ <para>
+ All other trademarks referenced herein are the property of their respective owners.
+ </para>
+ <para>
+ The GPG fingerprint of the security(a)redhat.com key is:
+ </para>
+ <para>
+ CA 20 86 86 2B D6 9D FC 65 F6 EC C4 21 91 80 CD DB 42 A6 0E
+ </para>
+ <para>
+<address><street>1801 Varsity Drive</street>
+<city>Raleigh</city>, <state>NC</state> <postcode>27606-2072</postcode>
+<country>USA</country>
+<phone>Phone: +1 919 754 3700</phone>
+<phone>Phone: 888 733 4281</phone>
+<fax>Fax: +1 919 754 3701</fax>
+<pob>PO Box 13588</pob>
+<city>Research Triangle Park</city>, <state>NC</state> <postcode>27709</postcode>
+<country>USA</country></address>
+ </para>
+</legalnotice>
Added: core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Translatable-Entities.ent
===================================================================
--- core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Translatable-Entities.ent (rev 0)
+++ core/trunk/documentation/releasenotes/src/main/docbook/en-US/Common_Content/Translatable-Entities.ent 2008-04-29 01:35:28 UTC (rev 14606)
@@ -0,0 +1,130 @@
+
+<!ENTITY ADS "Administration Server">
+<!ENTITY AG "Administration Guide">
+<!ENTITY AGG "Agent Guide">
+<!ENTITY AKA "Activation Key Administrator">
+<!ENTITY APACHE "Apache Web server">
+<!ENTITY BC "Update">
+<!ENTITY BIGB "<guilabel>Big Board</guilabel>">
+<!ENTITY BROKER "RHN Proxy Broker Server">
+<!ENTITY CA "certificate authority">
+<!ENTITY CACHE "HTTP Proxy Caching Server">
+<!ENTITY CAG "Check Reference Guide">
+<!ENTITY CC "Command Center">
+<!ENTITY CCFR "Configuration, Command, and File Reference">
+<!ENTITY CCMENU "<guilabel>Command Center</guilabel>">
+<!ENTITY CFA "Configuration Administrator">
+<!ENTITY CIG "Setup and Installation Guide">
+<!ENTITY CLTG "Command-Line Tools Guide">
+<!ENTITY CON "Console">
+<!ENTITY CSMENU "<guilabel>Current State</guilabel> area">
+<!ENTITY DCAG "Deployment Guide">
+<!ENTITY DG "Developer's Guide">
+<!ENTITY DGG "DSML Gateway Guide">
+<!ENTITY EM64TLONG "Intel Extended Memory 64 Technology">
+<!ENTITY EMB "Embedded Database">
+<!ENTITY ENT "Management">
+<!ENTITY FAQ "Frequently Asked Questions (FAQ)">
+<!ENTITY FP "&FED; Project">
+<!ENTITY GCG "Gateway Customization Guide">
+<!ENTITY GFSU2 "&RHGFS; &PRODVER; for &RHEL; 4 Update 2">
+<!ENTITY HTTPD "Apache HTTP Server">
+<!ENTITY IG "Installation Guide">
+<!ENTITY IGS390 "&IG; for the &S390; Architectures">
+<!ENTITY IGX8664 "&IG; for &X8664;">
+<!ENTITY ISA "Introduction to System Administration">
+<!ENTITY JBEAP "JBoss Enterprise Application Platform">
+<!ENTITY LANG "EN">
+<!ENTITY LSCAP "Scout">
+<!ENTITY LS "scout">
+<!ENTITY LSSENT "&LSCAP;">
+<!ENTITY MA "&MON; Administrator">
+<!ENTITY MG "Migration Guide">
+<!ENTITY MMENU "<guilabel>Main Menu</guilabel>">
+<!ENTITY MON "Monitoring">
+<!ENTITY NESFULL "Netscape Enterprise Server">
+<!ENTITY NG "Networking Guide">
+<!ENTITY NSSFULL "Network Security Services">
+<!ENTITY NWMAP "<guilabel>Network Map</guilabel>">
+<!ENTITY NWMENU "<guilabel>Network Status</guilabel> bar">
+<!ENTITY OA "Organization Administrator">
+<!ENTITY OC "Org Chart">
+<!ENTITY PIRANHA "Piranha Configuration Tool">
+<!ENTITY PPC "IBM POWER Architecture">
+<!ENTITY PPR "Plug-in Programmer's Guide">
+<!ENTITY PRO "Provisioning">
+<!ENTITY PROXY "RHN Proxy Server">
+<!ENTITY PROXYX "Proxy">
+<!ENTITY QIGS390 "&QIG; for the &S390; Architectures">
+<!ENTITY QIGX8664 "&QIG; for &X8664;">
+<!ENTITY REDIRECT "RHN SSL Redirect Server">
+<!ENTITY RG "Reference Guide">
+<!ENTITY RHAS "&RH; Application Stack">
+<!ENTITY RHAUTHTOOL "Authentication Configuration Tool">
+<!ENTITY RHCLUSTERSTATTOOL "Cluster Status Tool">
+<!ENTITY RHCLUSTERTOOL "Cluster Configuration Tool">
+<!ENTITY RHCM "&RH; Cluster Manager">
+<!ENTITY RHCS "&RH; Cluster Suite">
+<!ENTITY RHDATETOOL "Time and Date Properties Tool">
+<!ENTITY RHD "&RH; Desktop">
+<!ENTITY RHDSIG "&RH; &DS; Installation Guide">
+<!ENTITY RHDSRK "&RH; &DS; Resource Kit">
+<!ENTITY RHDSSR "&RH; &DS; Schema Reference">
+<!ENTITY RHELAS21 "&RHEL; AS 2.1 Update 5">
+<!ENTITY RHELAS3 "&RHEL; AS 3 Update 5">
+<!ENTITY RHELAS4 "&RHEL; AS 4">
+<!ENTITY RHELAS "&RHEL; AS">
+<!ENTITY RHEL "&RH; Enterprise Linux">
+<!ENTITY RHGFSTOOL "GFS Setup Druid">
+<!ENTITY RHKBDTOOL "Keyboard Configuration Tool">
+<!ENTITY RHLIGS390 "&RHL; for S/390 &IG;">
+<!ENTITY RHLOGTOOL "Log Viewer">
+<!ENTITY RHMAINMENU "Applications (the main menu on the panel)">
+<!ENTITY RHNAC "&RHN; Actions Control">
+<!ENTITY RHNAPPLET "&RHN; Alert Notification Tool">
+<!ENTITY RHNAUTHD "RHN Authentication Daemon">
+<!ENTITY RHNBT "RHN Bootstrap">
+<!ENTITY RHNCC "&RHN; Configuration Client">
+<!ENTITY RHNCLIENTCONF "&RHN; Client Configuration Guide">
+<!ENTITY RHNCM "&RHN; Configuration Manager">
+<!ENTITY RHNDB "RHN DB Control">
+<!ENTITY RHND "&RHN; Daemon">
+<!ENTITY RHNETWORKTOOL "Network Administration Tool">
+<!ENTITY RHNMD "&RHN; Monitoring Daemon">
+<!ENTITY RHNPM "RHN Package Manager">
+<!ENTITY RHNPUSH "RHN Push">
+<!ENTITY RHNRC "&RHN; Registration Client">
+<!ENTITY RHN "Red Hat Network">
+<!ENTITY RHNSA "RHN Satellite Activate">
+<!ENTITY RHNSE "RHN Satellite Exporter">
+<!ENTITY RHNSMT "RHN SSL Maintenance Tool">
+<!ENTITY RHNSST "RHN Satellite Synchronization Tool">
+<!ENTITY RHNTE "RHN Task Engine">
+<!ENTITY RHPRINTERTOOL "Printer Configuration Tool">
+<!ENTITY RHRPMTOOL "Package Management Tool">
+<!ENTITY RHSAMBATOOL "Samba Server Configuration Tool">
+<!ENTITY RHSECLEVELTOOL "Security Level Configuration Tool">
+<!ENTITY RHSECONDMENU "Actions (on the panel)">
+<!ENTITY RHSERVICESTOOL "Services Configuration Tool">
+<!ENTITY RHSETUPAGENT "Setup Agent">
+<!ENTITY RHTHIRDMENU "System (on the panel)">
+<!ENTITY RHUA "Red Hat Update Agent">
+<!ENTITY RHUSERTOOL "User Manager">
+<!ENTITY RHVIRTUALIZATION "Red Hat Virtualization">
+<!ENTITY RHXFREE86TOOL "X Configuration Tool">
+<!ENTITY RK "Resource Kit">
+<!ENTITY RN "Release Notes">
+<!ENTITY S390 "IBM S/390 and IBM eServer zSeries">
+<!ENTITY SAG "System Administration Guide">
+<!ENTITY SAT "RHN Satellite Server">
+<!ENTITY SATX "Satellite">
+<!ENTITY SBS "Step By Step Guide">
+<!ENTITY SELG "&SEL; Guide">
+<!ENTITY SGA "System Group Administrator">
+<!ENTITY SG "Security Guide">
+<!ENTITY SIG "&SAT; &SATVER; Installation Guide">
+<!ENTITY SR "Schema Reference">
+<!ENTITY SSM "System Set Manager">
+<!ENTITY STAN "Stand-Alone Database">
+<!ENTITY UG "User's Guide">
+<!ENTITY UNIX "UNIX Support">
16 years, 8 months
- 1
- 0