[portal-commits] JBoss Portal SVN: r11778 - in modules/cms/trunk/cms-jackrabbit: src/test/java/org/jboss/portal/cms/test/commands and 2 other directories.

[portal-commits at lists.jboss.org]

Author: sohil.shah at jboss.com
Date: 2008-09-01 12:03:43 -0400 (Mon, 01 Sep 2008)
New Revision: 11778

Modified:
   modules/cms/trunk/cms-jackrabbit/pom.xml
   modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java
   modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml
   modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml
Log:
fixing Search testcases. Test Suite passes 100% now with JackRabbit upgraded to 1.4

Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml	2008-09-01 10:47:26 UTC (rev 11777)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml	2008-09-01 16:03:43 UTC (rev 11778)
@@ -272,15 +272,13 @@
             <configuration>
                <skip>false</skip>                              	           
                <excludes>               		
-               		<exclude>**/TestFileCreateFailed$1TestCommand.java</exclude>
-               		<exclude>**/TestSearch.java</exclude>               		
-               </excludes>   
-               <!--                                 
+               		<exclude>**/TestFileCreateFailed$1TestCommand.java</exclude>               	
+               </excludes>                                              
+               
+               <!--
                <includes>                    	          		
-	          		<include>**/TestReadAccess.java</include>		          		          		      		
-	          		<include>**/TestWriteAccess.java</include>	          		
-	          		<include>**/TestManageAccess.java</include>	          			          			          			          			          			          			          			          			          			          			          			          			          			          			          			          			          		
-	           </includes>	     	           	           	           
+	          		<include>**/TestSearch.java</include>
+	           </includes>	     	           	           	           	           
 	           -->
             </configuration>
          </plugin> 

Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java	2008-09-01 10:47:26 UTC (rev 11777)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestSearch.java	2008-09-01 16:03:43 UTC (rev 11778)
@@ -32,7 +32,6 @@
 import org.jboss.portal.search.QueryConversionException;
 
 import java.util.List;
-import java.util.Locale;
 
 
 /** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */

Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml	2008-09-01 10:47:26 UTC (rev 11777)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/hibernates.xml	2008-09-01 16:03:43 UTC (rev 11778)
@@ -5,7 +5,7 @@
       <properties>
          <property>
             <name>hibernate.show_sql</name>
-            <value>true</value>
+            <value>false</value>
          </property>
          <property>
             <name>hibernate.auto_close_session</name>

Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml	2008-09-01 10:47:26 UTC (rev 11777)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jcr/repository.xml	2008-09-01 16:03:43 UTC (rev 11778)
@@ -49,22 +49,20 @@
           <param name="schemaObjectPrefix" value="WSP"/>
           <param name="JNDIName" value="java:/SessionFactory"/>
           <param name="externalBLOBs" value="false"/>
-       </PersistenceManager> 
-       <!--      
+       </PersistenceManager>              
        <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-                  <param name="path" value="${wsp.home}/index"/>
-                  <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/>
-                  <param name="useCompoundFile" value="true"/>
-                  <param name="minMergeDocs" value="100"/>
-                  <param name="volatileIdleTime" value="3"/>
-                  <param name="maxMergeDocs" value="100000"/>
-                  <param name="mergeFactor" value="10"/>
-                  <param name="bufferSize" value="10"/>
-                  <param name="cacheSize" value="1000"/>
-                  <param name="forceConsistencyCheck" value="false"/>
-                  <param name="autoRepair" value="true"/>
-       </SearchIndex>       
-       -->
+	      <param name="path" value="${wsp.home}/index"/>
+	      <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.HTMLTextExtractor"/>
+	      <param name="useCompoundFile" value="true"/>
+	      <param name="minMergeDocs" value="100"/>
+	      <param name="volatileIdleTime" value="3"/>
+	      <param name="maxMergeDocs" value="100000"/>
+	      <param name="mergeFactor" value="10"/>
+	      <param name="bufferSize" value="10"/>
+	      <param name="cacheSize" value="1000"/>
+	      <param name="forceConsistencyCheck" value="false"/>
+	      <param name="autoRepair" value="true"/>
+       </SearchIndex>             
     </Workspace>
     <Versioning rootPath="${rep.home}/versions">              
        <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">