Author: vdedik
Date: 2012-08-10 05:49:01 -0400 (Fri, 10 Aug 2012)
New Revision: 15028
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/pages.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/search.xhtml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/pages.xml
branches/community/Seam_2_3/examples-ee6/pom.xml
Log:
JBSEAM-4984
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/pages.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/pages.xml
2012-08-10 08:49:24 UTC (rev 15027)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/pages.xml
2012-08-10 09:49:01 UTC (rev 15028)
@@ -57,5 +57,11 @@
<page view-id="*">
<action execute="#{blog.hitCount.hit}"/>
</page>
+
+ <exception class="org.hibernate.search.errors.EmptyQueryException">
+ <redirect view-id="/search.xhtml">
+ <message severity="warn">Given query is too simple. Try
again.</message>
+ </redirect>
+ </exception>
</pages>
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/search.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/search.xhtml
2012-08-10 08:49:24 UTC (rev 15027)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/search.xhtml
2012-08-10 09:49:01 UTC (rev 15028)
@@ -8,6 +8,7 @@
template="#{theme.template}">
<ui:define name="content">
+ <h:messages id="messages" globalOnly="true"/>
<h:dataTable id="searchResultTable" value="#{searchResults}"
var="blogEntry">
<h:column>
<div>
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/pages.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/pages.xml
2012-08-10 08:49:24 UTC (rev 15027)
+++
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/src/main/webapp/WEB-INF/pages.xml
2012-08-10 09:49:01 UTC (rev 15028)
@@ -75,7 +75,7 @@
<exception class="org.jboss.seam.security.NotLoggedInException">
- <redirect view-id="/home.xhtml">
+ <redirect view-id="/home.xhtml">
<message>You must be logged in to access administrative
pages.</message>
</redirect>
</exception>
@@ -91,5 +91,11 @@
<message>The page you tried to access is no longer
available.</message>
</redirect>
</exception>
+
+ <exception class="org.hibernate.search.errors.EmptyQueryException">
+ <redirect view-id="/browse.xhtml">
+ <message severity="warn">Given query is too simple. Try
again.</message>
+ </redirect>
+ </exception>
</pages>
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-08-10 08:49:24 UTC
(rev 15027)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-08-10 09:49:01 UTC
(rev 15028)
@@ -43,6 +43,8 @@
</organization>
<properties>
+
<version.org.hibernate.search>4.2.0.Beta1</version.org.hibernate.search>
+
<!-- Excluded TestNG groups (ex: slow annotated tests won't run during
the test phase) -->
<tests.excludedGroups>slow</tests.excludedGroups>
@@ -310,6 +312,33 @@
<artifactId>trinidad-impl</artifactId>
<version>2.0.1</version>
</dependency>
+
+ <!-- Hibernate search version override due to JBSEAM-4984 -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>${version.org.hibernate.search}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-analyzers</artifactId>
+ <version>${version.org.hibernate.search}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-engine</artifactId>
+ <version>${version.org.hibernate.search}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-infinispan</artifactId>
+ <version>${version.org.hibernate.search}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-orm</artifactId>
+ <version>${version.org.hibernate.search}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
