Hibernate SVN: r19158 - search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine.
by hibernate-commits@lists.jboss.org
Author: epbernard
Date: 2010-04-02 08:54:17 -0400 (Fri, 02 Apr 2010)
New Revision: 19158
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
Log:
HSEARCH-333 removing warning until further investigation
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java 2010-04-02 12:33:49 UTC (rev 19157)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java 2010-04-02 12:54:17 UTC (rev 19158)
@@ -427,9 +427,10 @@
protected void checkDocumentId(XProperty member, PropertiesMetadata propertiesMetadata, boolean isRoot, String prefix, InitContext context) {
Annotation documentIdAnn = member.getAnnotation( DocumentId.class );
if ( documentIdAnn != null ) {
- log.warn(
- "@DocumentId specified on an entity which is not indexed by itself. Annotation gets ignored. Use @Field instead."
- );
+ //FIXME commented until HSEARCH-333 is resolved
+// log.warn(
+// "@DocumentId specified on an entity which is not indexed by itself. Annotation gets ignored. Use @Field instead."
+// );
}
}
13 years, 12 months
Hibernate SVN: r19157 - in search/trunk: hibernate-search and 1 other directories.
by hibernate-commits@lists.jboss.org
Author: epbernard
Date: 2010-04-02 08:33:49 -0400 (Fri, 02 Apr 2010)
New Revision: 19157
Modified:
search/trunk/hibernate-search/pom.xml
search/trunk/hibernate-search/src/main/docbook/en-US/modules/getting-started.xml
search/trunk/hibernate-search/src/main/docbook/en-US/modules/mapping.xml
search/trunk/readme.txt
Log:
HSEARCH-428 refresh the geting started guide.
Modified: search/trunk/hibernate-search/pom.xml
===================================================================
--- search/trunk/hibernate-search/pom.xml 2010-04-02 10:06:25 UTC (rev 19156)
+++ search/trunk/hibernate-search/pom.xml 2010-04-02 12:33:49 UTC (rev 19157)
@@ -158,9 +158,9 @@
<sourceDocumentName>master.xml</sourceDocumentName>
<sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
<masterTranslation>en-US</masterTranslation>
- <translations>
+ <!-- translations>
<translation>zh-CN</translation>
- </translations>
+ </translations -->
<imageResource>
<directory>${basedir}/src/main/docbook/en-US/images</directory>
</imageResource>
Modified: search/trunk/hibernate-search/src/main/docbook/en-US/modules/getting-started.xml
===================================================================
--- search/trunk/hibernate-search/src/main/docbook/en-US/modules/getting-started.xml 2010-04-02 10:06:25 UTC (rev 19156)
+++ search/trunk/hibernate-search/src/main/docbook/en-US/modules/getting-started.xml 2010-04-02 12:33:49 UTC (rev 19157)
@@ -3,10 +3,10 @@
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ Copyright (c) 2010, Red Hat Inc. 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.
+ ~ distributed under license by Red Hat Inc.
~
~ 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
@@ -28,10 +28,9 @@
<!ENTITY version "WORKING">
]>
<chapter id="getting-started">
-
<title>Getting started</title>
- <para>Welcome to Hibernate Search! The following chapter will guide you
+ <para>Welcome to Hibernate Search. The following chapter will guide you
through the initial steps required to integrate Hibernate Search into an
existing Hibernate enabled application. In case you are a Hibernate new
timer we recommend you start <ulink
@@ -57,16 +56,14 @@
<entry>Hibernate Search</entry>
<entry><literal>hibernate-search.jar</literal> and all runtime
- dependencies from the <literal>lib</literal> directory of the
- Hibernate Search distribution. Please refer to
- <filename>README.txt </filename>in the lib directory to understand
- which dependencies are required.</entry>
+ dependencies from the <literal>dist/lib</literal> directory of the
+ Hibernate Search distribution.</entry>
</row>
<row>
<entry>Hibernate Core</entry>
- <entry>This instructions have been tested against Hibernate 3.3.x.
+ <entry>This instructions have been tested against Hibernate 3.5.
You will need <literal>hibernate-core.jar</literal> and its
transitive dependencies from the <literal>lib</literal> directory
of the distribution. Refer to <literal>README.txt</literal> in the
@@ -85,17 +82,15 @@
has its own set of annotations (<emphasis>@Indexed, @DocumentId,
@Field,...</emphasis>) for which there exists so far no
alternative configuration. The tutorial is tested against version
- 3.4.x of Hibernate Annotations.</entry>
+ 3.5 of Hibernate Annotations (part of the Hibernate Core
+ distribution). </entry>
</row>
</tbody>
</tgroup>
</table>
- <para>You can download all dependencies from the Hibernate <ulink
- url="http://www.hibernate.org/6.html">download site</ulink>. You can also
- verify the dependency versions against the <ulink
- url="http://www.hibernate.org/6.html#A3">Hibernate Compatibility
- Matrix</ulink>.</para>
+ <para>You can download all dependencies from the Hibernate download
+ site.</para>
</section>
<section>
@@ -112,14 +107,12 @@
<title>Adding the JBoss maven repository to
<filename>settings.xml</filename></title>
- <programlisting>
-<repository>
+ <programlisting><repository>
<id>repository.jboss.org</id>
<name>JBoss Maven Repository</name>
<url>http://repository.jboss.org/maven2</url>
<layout>default</layout>
-</repository>
- </programlisting>
+</repository> </programlisting>
</example>
<para>Then add the following dependencies to your pom.xml:</para>
@@ -127,54 +120,83 @@
<example>
<title>Maven dependencies for Hibernate Search</title>
- <programlisting>
-<dependency>
+ <programlisting><dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
<version>&version;</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
-</dependency>
-<dependency>
- <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.5.0-Final</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>solr-common</artifactId>
- <version>1.3.0</version>
+ <artifactId>solr-core</artifactId>
+ <version>1.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-lucene-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>1.3.0</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ <version>2.9.2</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-snowball</artifactId>
- <version>2.4.0</version>
+ <version>2.9.2</version>
</dependency>
- </programlisting>
+<dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ <version>2.9.2</version>
+</dependency></programlisting>
</example>
<para>Not all dependencies are required. Only the
<emphasis>hibernate-search</emphasis> dependency is mandatory. This
dependency, together with its required transitive dependencies, contain
- all required classes needed to use Hibernate Search.
- <emphasis>hibernate-annotations</emphasis> is only needed if you want to
- use annotations to configure your domain model as we do in this tutorial.
- However, even if you choose not to use Hibernate Annotations you still
- have to use the Hibernate Search specific annotations, which are bundled
- with the hibernate-search jar file, to configure your Lucene index.
- Currently there is no XML configuration available for Hibernate Search.
- <emphasis>hibernate-entitymanager</emphasis> is required if you want to
- use Hibernate Search in conjunction with JPA. The Solr dependencies are
- needed if you want to utilize Solr's analyzer framework. More about this
- later. And finally, the <literal>lucene-snowball</literal> dependency is
+ all required classes needed to use Hibernate Search. </para>
+
+ <para><emphasis>hibernate-annotations</emphasis> is needed if you want to
+ use annotations to configure your domain model but don't want to use JPA's
+ runtime APIs. If you choose not to use Hibernate Annotations and describe
+ your ORM mapping using <filename>cfg.xml</filename> files, you still have
+ to use the Hibernate Search specific annotations, which are bundled with
+ the hibernate-search jar file, to configure your Lucene index. There is no
+ XML configuration available for Hibernate Search but we provide a powerful
+ programmatic mapping API that elegantly replace this kind of deployment
+ descriptor (see <xref linkend="hsearch-mapping-programmaticapi" /> for
+ more information). </para>
+
+ <para><emphasis>hibernate-entitymanager</emphasis> is required if you want
+ to use Hibernate Search in conjunction with JPA. </para>
+
+ <para>The Solr dependencies are needed if you want to utilize Solr's
+ analyzer framework. More about this later. </para>
+
+ <para>And finally, the <literal>lucene-snowball</literal> dependency is
needed if you want to use Lucene's snowball stemmer.</para>
</section>
@@ -197,14 +219,13 @@
<literal><filename>hibernate.cfg.xml</filename></literal> or
<filename>persistence.xml</filename></title>
- <programlisting>
-...
+ <programlisting>...
<property name="hibernate.search.default.directory_provider"
- value="org.hibernate.search.store.FSDirectoryProvider"/>
+ value="org.hibernate.search.store.FSDirectoryProvider"/>
-<property name="hibernate.search.default.indexBase" value="/var/lucene/indexes"/>
-...
- </programlisting>
+<property name="hibernate.search.default.indexBase"
+ value="/var/lucene/indexes"/>
+... </programlisting>
</example>
<para>First you have to tell Hibernate Search which
@@ -234,8 +255,7 @@
<title>Example entities Book and Author before adding Hibernate Search
specific annotations</title>
- <programlisting>
-package example;
+ <programlisting>package example;
...
@Entity
public class Book {
@@ -253,16 +273,13 @@
private Date publicationDate;
- public Book() {
- }
+ public Book() {}
// standard getters/setters follow here
...
-}
- </programlisting>
+}</programlisting>
- <programlisting>
-package example;
+ <programlisting>package example;
...
@Entity
public class Author {
@@ -273,14 +290,11 @@
private String name;
- public Author() {
- }
+ public Author() {}
// standard getters/setters follow here
...
-}
-
-</programlisting>
+}</programlisting>
</example>
<para>To achieve this you have to add a few annotations to the
@@ -308,7 +322,7 @@
to do with the ability to search for it. From Lucene's perspective it is
not necessary to keep the data once the index is created. The benefit of
storing it is the ability to retrieve it via projections (<xref
- linkend="projections" />). </para>
+ linkend="projections" />).</para>
<para>Without projections, Hibernate Search will per default execute a
Lucene query in order to find the database identifiers of the entities
@@ -348,8 +362,7 @@
<title>Example entities after adding Hibernate Search
annotations</title>
- <programlisting>
-package example;
+ <programlisting>package example;
...
@Entity
<emphasis role="bold">@Indexed</emphasis>
@@ -357,7 +370,6 @@
@Id
@GeneratedValue
- <emphasis role="bold">@DocumentId</emphasis>
private Integer id;
<emphasis role="bold">@Field(index=Index.TOKENIZED, store=Store.NO)</emphasis>
@@ -379,11 +391,9 @@
// standard getters/setters follow here
...
-}
- </programlisting>
+}</programlisting>
- <programlisting>
-package example;
+ <programlisting>package example;
...
@Entity
public class Author {
@@ -400,8 +410,7 @@
// standard getters/setters follow here
...
-}
- </programlisting>
+}</programlisting>
</example>
</section>
@@ -410,25 +419,23 @@
<para>Hibernate Search will transparently index every entity persisted,
updated or removed through Hibernate Core. However, you have to trigger an
- initial indexing to populate the Lucene index with the data already present
- in your database. Once you have added the above properties and annotations
- it is time to trigger an initial batch index of your books. You can
- achieve this by using one of the following code snippets (see also <xref
- linkend="search-batchindex" />):</para>
+ initial indexing to populate the Lucene index with the data already
+ present in your database. Once you have added the above properties and
+ annotations it is time to trigger an initial batch index of your books.
+ You can achieve this by using one of the following code snippets (see also
+ <xref linkend="search-batchindex" />):</para>
<example>
<title>Using Hibernate Session to index data</title>
- <programlisting>
-FullTextSession fullTextSession = Search.getFullTextSession(session);
+ <programlisting>FullTextSession fullTextSession = Search.getFullTextSession(session);
fullTextSession.createIndexer().startAndWait();</programlisting>
</example>
<example>
<title>Using JPA to index data</title>
- <programlisting>
-EntityManager em = entityManagerFactory.createEntityManager();
+ <programlisting>EntityManager em = entityManagerFactory.createEntityManager();
FullTextEntityManager fullTextEntityManager = Search.getFullTextEntityManager(em);
fullTextEntityManager.createIndexer().startAndWait();</programlisting>
</example>
@@ -448,13 +455,12 @@
org.hibernate.Query in order to get all the functionality one is used to
from the Hibernate API. The following code will prepare a query against
the indexed fields, execute it and return a list of
- <classname>Book</classname>s. </para>
+ <classname>Book</classname>s.</para>
<example>
<title>Using Hibernate Session to create and execute a search</title>
- <programlisting>
-FullTextSession fullTextSession = Search.getFullTextSession(session);
+ <programlisting>FullTextSession fullTextSession = Search.getFullTextSession(session);
Transaction tx = fullTextSession.beginTransaction();
// create native Lucene query
@@ -469,15 +475,13 @@
List result = hibQuery.list();
tx.commit();
-session.close();
- </programlisting>
+session.close(); </programlisting>
</example>
<example>
<title>Using JPA to create and execute a search</title>
- <programlisting>
-EntityManager em = entityManagerFactory.createEntityManager();
+ <programlisting>EntityManager em = entityManagerFactory.createEntityManager();
FullTextEntityManager fullTextEntityManager =
org.hibernate.search.jpa.Search.getFullTextEntityManager(em);
em.getTransaction().begin();
@@ -494,9 +498,7 @@
List result = persistenceQuery.getResultList();
em.getTransaction().commit();
-em.close();
-
- </programlisting>
+em.close(); </programlisting>
</example>
</section>
@@ -560,9 +562,7 @@
<title>Using <classname>@AnalyzerDef</classname> and the Solr framework
to define and use an analyzer</title>
- <programlisting>
-
-package example;
+ <programlisting>package example;
...
@Entity
@Indexed
@@ -602,9 +602,7 @@
// standard getters/setters follow here
...
-}
-
- </programlisting>
+}</programlisting>
</example>
</section>
@@ -622,7 +620,7 @@
<programlisting>mvn archetype:create \
-DarchetypeGroupId=org.hibernate \
-DarchetypeArtifactId=hibernate-search-quickstart \
- -DarchetypeVersion=3.2.0.Beta1 \
+ -DarchetypeVersion=&version; \
-DgroupId=my.company -DartifactId=quickstart</programlisting>
</example>
Modified: search/trunk/hibernate-search/src/main/docbook/en-US/modules/mapping.xml
===================================================================
--- search/trunk/hibernate-search/src/main/docbook/en-US/modules/mapping.xml 2010-04-02 10:06:25 UTC (rev 19156)
+++ search/trunk/hibernate-search/src/main/docbook/en-US/modules/mapping.xml 2010-04-02 12:33:49 UTC (rev 19157)
@@ -1508,7 +1508,7 @@
</section>
</section>
- <section>
+ <section id="hsearch-mapping-programmaticapi">
<title>Programmatic API</title>
<para><warning>
@@ -2221,8 +2221,8 @@
<section>
<title>Mapping dynamic boost</title>
- <para>You can apply a dynamic boost
- factor on either a field or a whole entity: </para>
+ <para>You can apply a dynamic boost factor on either a field or a whole
+ entity:</para>
<example>
<title>DynamicBoost mapping using programmatic model</title>
@@ -2244,7 +2244,7 @@
<para>The next example shows the equivalent mapping using the
<classname>@DynamicBoost</classname> annotation: <example>
- <title>Using the @DynamicBoost </title>
+ <title>Using the @DynamicBoost</title>
<programlisting>@Entity
@Indexed
Modified: search/trunk/readme.txt
===================================================================
--- search/trunk/readme.txt 2010-04-02 10:06:25 UTC (rev 19156)
+++ search/trunk/readme.txt 2010-04-02 12:33:49 UTC (rev 19157)
@@ -19,7 +19,7 @@
Instructions
------------
-Unzip to installation directory and read docs/manual
+Unzip to installation directory and read the documentation available in dist/docs/manual
Contact
13 years, 12 months
Hibernate SVN: r19156 - in search/trunk/hibernate-search/src: main/java/org/hibernate/search/sandbox and 2 other directories.
by hibernate-commits@lists.jboss.org
Author: epbernard
Date: 2010-04-02 06:06:25 -0400 (Fri, 02 Apr 2010)
New Revision: 19156
Added:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/package-info.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/sandbox/package-info.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/sandbox/standalone/package-info.java
Modified:
search/trunk/hibernate-search/src/test/resources/log4j.properties
Log:
Add various package level docs for experimental APIs
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/package-info.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/package-info.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/package-info.java 2010-04-02 10:06:25 UTC (rev 19156)
@@ -0,0 +1,30 @@
+/* $Id: FullTextQuery.java 19002 2010-03-16 01:28:07Z hardy.ferentschik $
+ *
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates 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, Inc.
+ *
+ * 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
+ */
+/**
+ * This package contains various experimentations. Do not use.
+ *
+ * Provide a domain specific language to write Lucene queries.
+ */
+package org.hibernate.search.query.dsl;
\ No newline at end of file
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/sandbox/package-info.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/sandbox/package-info.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/sandbox/package-info.java 2010-04-02 10:06:25 UTC (rev 19156)
@@ -0,0 +1,28 @@
+/* $Id: FullTextQuery.java 19002 2010-03-16 01:28:07Z hardy.ferentschik $
+ *
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates 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, Inc.
+ *
+ * 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
+ */
+/**
+ * This package contains various experimentations. Do not use.
+ */
+package org.hibernate.search.sandbox;
\ No newline at end of file
Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/sandbox/standalone/package-info.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/sandbox/standalone/package-info.java (rev 0)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/sandbox/standalone/package-info.java 2010-04-02 10:06:25 UTC (rev 19156)
@@ -0,0 +1,31 @@
+/* $Id: FullTextQuery.java 19002 2010-03-16 01:28:07Z hardy.ferentschik $
+ *
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates 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, Inc.
+ *
+ * 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
+ */
+/**
+ * This package contains various experimentations. Do not use.
+ * \
+ * Temptative to externalize the query functions from Hibernate Core specifics.
+ * This will open the doors to easier back end alternatives, including search-wise.
+ */
+package org.hibernate.search.sandbox.standaloone;
\ No newline at end of file
Modified: search/trunk/hibernate-search/src/test/resources/log4j.properties
===================================================================
--- search/trunk/hibernate-search/src/test/resources/log4j.properties 2010-04-02 09:53:24 UTC (rev 19155)
+++ search/trunk/hibernate-search/src/test/resources/log4j.properties 2010-04-02 10:06:25 UTC (rev 19156)
@@ -16,6 +16,8 @@
log4j.appender.socket.port=4560
log4j.appender.socket.locationInfo=true
+log4j.logger.org.hibernate.search.backend=debug
+
### set log levels - for more verbose logging change 'info' to 'debug' ###
log4j.rootLogger=warn, stdout
13 years, 12 months
Hibernate SVN: r19155 - search/trunk.
by hibernate-commits@lists.jboss.org
Author: epbernard
Date: 2010-04-02 05:53:24 -0400 (Fri, 02 Apr 2010)
New Revision: 19155
Modified:
search/trunk/readme.txt
Log:
HSEARCH-483 update readme.txt
Modified: search/trunk/readme.txt
===================================================================
--- search/trunk/readme.txt 2010-04-01 17:34:21 UTC (rev 19154)
+++ search/trunk/readme.txt 2010-04-02 09:53:24 UTC (rev 19155)
@@ -19,7 +19,7 @@
Instructions
------------
-Unzip to installation directory, read doc/reference
+Unzip to installation directory and read docs/manual
Contact
@@ -27,7 +27,7 @@
Latest Documentation:
- http://hibernate.org
+ http://search.hibernate.org
Bug Reports:
13 years, 12 months
Hibernate SVN: r19153 - core/patches.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-04-01 13:33:40 -0400 (Thu, 01 Apr 2010)
New Revision: 19153
Added:
core/patches/hibernate-3.3.2.GA_CP01_JBPAPP-4038/
Log:
JBPAPP-4038 one-off patch
Copied: core/patches/hibernate-3.3.2.GA_CP01_JBPAPP-4038 (from rev 19152, core/tags/hibernate-3.3.2.GA_CP01)
14 years
Hibernate SVN: r19152 - in search/trunk: hibernate-search and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: sannegrinovero
Date: 2010-04-01 11:26:50 -0400 (Thu, 01 Apr 2010)
New Revision: 19152
Modified:
search/trunk/hibernate-search/pom.xml
search/trunk/pom.xml
Log:
HSEARCH-482 Update dependencies to Hibernate Core 3.5.0-Final
Modified: search/trunk/hibernate-search/pom.xml
===================================================================
--- search/trunk/hibernate-search/pom.xml 2010-04-01 15:12:56 UTC (rev 19151)
+++ search/trunk/hibernate-search/pom.xml 2010-04-01 15:26:50 UTC (rev 19152)
@@ -50,8 +50,8 @@
<artifactId>hibernate-commons-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate.java-persistence</groupId>
- <artifactId>jpa-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -72,16 +72,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-codec</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
<optional>true</optional>
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2010-04-01 15:12:56 UTC (rev 19151)
+++ search/trunk/pom.xml 2010-04-01 15:26:50 UTC (rev 19152)
@@ -127,7 +127,7 @@
<properties>
<slf4jVersion>1.5.8</slf4jVersion>
<luceneVersion>2.9.2</luceneVersion>
- <hibernateVersion>3.5.0-CR-2</hibernateVersion>
+ <hibernateVersion>3.5.0-Final</hibernateVersion>
<hibernateCommonsAnnotationVersion>3.2.0.Final</hibernateCommonsAnnotationVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -164,9 +164,9 @@
<version>${hibernateCommonsAnnotationVersion}</version>
</dependency>
<dependency>
- <groupId>org.hibernate.java-persistence</groupId>
- <artifactId>jpa-api</artifactId>
- <version>2.0-cr-1</version>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -238,16 +238,6 @@
<version>${luceneVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
<version>1.1</version>
@@ -263,12 +253,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
14 years
Hibernate SVN: r19151 - core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-04-01 11:12:56 -0400 (Thu, 01 Apr 2010)
New Revision: 19151
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Versioning.java
Log:
correct javadoc typo
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Versioning.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Versioning.java 2010-04-01 14:28:32 UTC (rev 19150)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Versioning.java 2010-04-01 15:12:56 UTC (rev 19151)
@@ -31,7 +31,7 @@
import org.hibernate.type.VersionType;
/**
- * Utilities for dealing with optimisitic locking values.
+ * Utilities for dealing with optimistic locking values.
*
* @author Gavin King
*/
@@ -42,19 +42,19 @@
public static final int OPTIMISTIC_LOCK_NONE = -1;
/**
- * Apply optimisitc locking based on the defined version or timestamp
+ * Apply optimistic locking based on the defined version or timestamp
* property.
*/
public static final int OPTIMISTIC_LOCK_VERSION = 0;
/**
- * Apply optimisitc locking based on the a current vs. snapshot comparison
+ * Apply optimistic locking based on the a current v.s. snapshot comparison
* of <b>all</b> properties.
*/
public static final int OPTIMISTIC_LOCK_ALL = 2;
/**
- * Apply optimisitc locking based on the a current vs. snapshot comparison
+ * Apply optimistic locking based on the a current v.s. snapshot comparison
* of <b>dirty</b> properties.
*/
public static final int OPTIMISTIC_LOCK_DIRTY = 1;
@@ -67,12 +67,12 @@
private Versioning() {}
/**
- * Create an initial optimisitc locking value according the {@link VersionType}
+ * Create an initial optimistic locking value according the {@link VersionType}
* contract for the version property.
*
* @param versionType The version type.
* @param session The originating session
- * @return The initial optimisitc locking value
+ * @return The initial optimistic locking value
*/
private static Object seed(VersionType versionType, SessionImplementor session) {
Object seed = versionType.seed( session );
@@ -81,14 +81,14 @@
}
/**
- * Create an initial optimisitc locking value according the {@link VersionType}
+ * Create an initial optimistic locking value according the {@link VersionType}
* contract for the version property <b>if required</b> and inject it into
* the snapshot state.
*
* @param fields The current snapshot state
* @param versionProperty The index of the version property
* @param versionType The version type
- * @param session The orginating session
+ * @param session The originating session
* @return True if we injected a new version value into the fields array; false
* otherwise.
*/
@@ -119,7 +119,7 @@
/**
- * Generate the next increment in the optimisitc locking value according
+ * Generate the next increment in the optimistic locking value according
* the {@link VersionType} contract for the version property.
*
* @param version The current version
@@ -141,10 +141,10 @@
}
/**
- * Inject the optimisitc locking value into the entity state snapshot.
+ * Inject the optimistic locking value into the entity state snapshot.
*
* @param fields The state snapshot
- * @param version The optimisitc locking value
+ * @param version The optimistic locking value
* @param persister The entity persister
*/
public static void setVersion(Object[] fields, Object version, EntityPersister persister) {
@@ -155,11 +155,11 @@
}
/**
- * Extract the optimisitc locking value out of the entity state snapshot.
+ * Extract the optimistic locking value out of the entity state snapshot.
*
* @param fields The state snapshot
* @param persister The entity persister
- * @return The extracted optimisitc locking value
+ * @return The extracted optimistic locking value
*/
public static Object getVersion(Object[] fields, EntityPersister persister) {
if ( !persister.isVersioned() ) {
14 years
Hibernate SVN: r19150 - search/trunk.
by hibernate-commits@lists.jboss.org
Author: sannegrinovero
Date: 2010-04-01 10:28:32 -0400 (Thu, 01 Apr 2010)
New Revision: 19150
Modified:
search/trunk/readme.txt
Log:
HSEARCH-483 update readme.txt
Modified: search/trunk/readme.txt
===================================================================
--- search/trunk/readme.txt 2010-03-31 17:39:24 UTC (rev 19149)
+++ search/trunk/readme.txt 2010-04-01 14:28:32 UTC (rev 19150)
@@ -14,11 +14,8 @@
queries.
Hibernate Search is using Apache Lucene(tm) under the cover.
+This version of Hibernate Search requires Hibernate Core 3.5 and above.
-Hibernate Search Requires Hibernate Core 3.3 and above.
-This version runs well with Hibernate Annotations 3.4.x and Hibernate EntityManager 3.4.x
-
-
Instructions
------------
@@ -35,7 +32,7 @@
Bug Reports:
Hibernate JIRA (preferred)
- hibernate-devel(a)lists.sourceforge.net
+ hibernate-dev(a)lists.jboss.org
Free Technical Support:
@@ -45,7 +42,7 @@
Notes
-----------
-If you want to contribute, go to http://www.hibernate.org/
+If you want to contribute, read http://community.jboss.org/wiki/ContributingtoHibernateSearch
This software and its documentation are distributed under the terms of the
FSF Lesser Gnu Public License (see lgpl.txt).
\ No newline at end of file
14 years