8:39 a.m.
Author: hardy.ferentschik
Date: 2009-05-13 09:39:03 -0400 (Wed, 13 May 2009)
New Revision: 16560
Added:
search/branches/Branch_3_1/src/main/assembly/
search/branches/Branch_3_1/src/main/assembly/dist.xml
Modified:
search/branches/Branch_3_1/pom.xml
search/branches/Branch_3_1/src/main/docbook/en-US/master.xml
search/branches/Branch_3_1/src/main/docbook/en-US/modules/architecture.xml
search/branches/Branch_3_1/src/main/docbook/en-US/modules/configuration.xml
Log:
Backporting HSEARCH-82 - Maven migration. This hopefully makes it easier to maintain this
branch for EAP
Modified: search/branches/Branch_3_1/pom.xml
===================================================================
--- search/branches/Branch_3_1/pom.xml 2009-05-13 13:08:01 UTC (rev 16559)
+++ search/branches/Branch_3_1/pom.xml 2009-05-13 13:39:03 UTC (rev 16560)
@@ -224,8 +224,7 @@
<artifactId>maven-release-plugin</artifactId>
<configuration>
<releaseProfiles>release</releaseProfiles>
- <goals>package javadoc:javadoc
org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:resources
- org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:generate
assembly:assembly
+ <goals>package javadoc:javadoc
org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:resources
org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:generate assembly:assembly
</goals>
</configuration>
</plugin>
Added: search/branches/Branch_3_1/src/main/assembly/dist.xml
===================================================================
--- search/branches/Branch_3_1/src/main/assembly/dist.xml (rev 0)
+++ search/branches/Branch_3_1/src/main/assembly/dist.xml 2009-05-13 13:39:03 UTC (rev
16560)
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<assembly>
+ <id>dist</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>/dist/lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/dist</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>/dist/docs/api</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/docbook/publish/en-US</directory>
+ <outputDirectory>/dist/docs/manual</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: search/branches/Branch_3_1/src/main/docbook/en-US/master.xml
===================================================================
--- search/branches/Branch_3_1/src/main/docbook/en-US/master.xml 2009-05-13 13:08:01 UTC
(rev 16559)
+++ search/branches/Branch_3_1/src/main/docbook/en-US/master.xml 2009-05-13 13:39:03 UTC
(rev 16560)
@@ -40,10 +40,15 @@
<releaseinfo>&versionNumber;</releaseinfo>
<mediaobject>
- <imageobject>
- <imagedata fileref="images/hibernate_logo_a.png"
format="PNG" />
+ <imageobject role="fo">
+ <imagedata align="center" fileref="hibernate_logo_a.png"
/>
</imageobject>
+
+ <imageobject role="html">
+ <imagedata depth="3cm" fileref="hibernate_logo_a.png"
/>
+ </imageobject>
</mediaobject>
+
</bookinfo>
<toc></toc>
Modified: search/branches/Branch_3_1/src/main/docbook/en-US/modules/architecture.xml
===================================================================
--- search/branches/Branch_3_1/src/main/docbook/en-US/modules/architecture.xml 2009-05-13
13:08:01 UTC (rev 16559)
+++ search/branches/Branch_3_1/src/main/docbook/en-US/modules/architecture.xml 2009-05-13
13:39:03 UTC (rev 16560)
@@ -119,14 +119,13 @@
<mediaobject>
<imageobject role="html">
- <imagedata align="center"
- fileref="../shared/images/lucene-backend.png"
+ <imagedata align="center"
fileref="lucene-backend.png"
format="PNG" />
</imageobject>
<imageobject role="fo">
- <imagedata align="center"
fileref="images/lucene-backend.png"
- format="PNG" />
+ <imagedata align="center"
fileref="lucene-backend.png"
+ format="PNG" scalefit="1"
width="12cm" />
</imageobject>
<caption>
@@ -156,13 +155,12 @@
<mediaobject>
<imageobject role="html">
- <imagedata align="center"
- fileref="../shared/images/jms-backend.png"
format="PNG" />
+ <imagedata align="center" fileref="jms-backend.png"
format="PNG" />
</imageobject>
<imageobject role="fo">
- <imagedata align="center"
fileref="images/jms-backend.png"
- format="PNG" />
+ <imagedata align="center" fileref="jms-backend.png"
format="PNG"
+ scalefit="1" width="12cm" />
</imageobject>
<caption>
Modified: search/branches/Branch_3_1/src/main/docbook/en-US/modules/configuration.xml
===================================================================
--- search/branches/Branch_3_1/src/main/docbook/en-US/modules/configuration.xml 2009-05-13
13:08:01 UTC (rev 16559)
+++ search/branches/Branch_3_1/src/main/docbook/en-US/modules/configuration.xml 2009-05-13
13:39:03 UTC (rev 16560)
@@ -424,13 +424,12 @@
<para><mediaobject>
<imageobject role="html">
- <imagedata align="center"
fileref="../shared/images/jms-backend.png"
- format="PNG" />
+ <imagedata align="center" fileref="jms-backend.png"
format="PNG" />
</imageobject>
<imageobject role="fo">
- <imagedata align="center"
fileref="images/jms-backend.png"
- format="PNG" />
+ <imagedata align="center" fileref="jms-backend.png"
format="PNG"
+ scalefit="1" width="12cm" />
</imageobject>
<caption><para>JMS Master/Slave architecture
@@ -600,8 +599,9 @@
<para>To enable Hibernate Search in Hibernate Core (ie. if you don't use
Hibernate Annotations), add the
<literal>FullTextIndexEventListener</literal> for the following six
- Hibernate events and also add it after the default
- <literal>DefaultFlushEventListener</literal>, as in the following
example.</para>
+ Hibernate events and also add it after the default
+ <literal>DefaultFlushEventListener</literal>, as in the following
+ example.</para>
<example>
<title>Explicitly enabling Hibernate Search by configuring the