more schema configuration support

kimchy · Mar 4, 2006 · 716de67 · 716de67
1 parent 86a214d
commit 716de67
Show file tree

Hide file tree

Showing 9 changed files with 686 additions and 85 deletions.
diff --git a/docs/reference/src/core-configuration.xml b/docs/reference/src/core-configuration.xml
@@ -826,7 +826,7 @@
               resources, excluding from the index terms that occur further in the resource. Defaults to 10,000 terms.</entry>
             </row>
             <row>
-              <entry>copmass.engine.useCompoundFile</entry>
+              <entry>compass.engine.useCompoundFile</entry>
               <entry>Turn on (<literal>true</literal>) or off (<literal>false</literal>) the use of compound files. If used lowers the number of files open, but have very small performance overhead. Defaults to <literal>true</literal>. Note, when compass starts up, it will validate that the current index structure maps the configured setting, and if it is not, it will automatically try and convert it to the correct structure.
               </entry>
             </row>
@@ -1038,7 +1038,7 @@
         </para>
 
         <para>
-            Setting file entry handlers is done using the following setting prefix: <literal>compass.engine.store.jdbc.fe.[name]</literal>. The name can be either <literal>default</literal> which is used for all unmapped files, it can be the full name of the file stored, or the suffix of the file (the last 3 charecters). Some of the currently supported settings are:
+            Setting file entry handlers is done using the following setting prefix: <literal>compass.engine.store.jdbc.fe.[name]</literal>. The name can be either <literal>__default__</literal> which is used for all unmapped files, it can be the full name of the file stored, or the suffix of the file (the last 3 charecters). Some of the currently supported settings are:
 
             <table>
               <title>File Entry Handler Settings</title>

diff --git a/docs/reference/src/core-introduction.xml b/docs/reference/src/core-introduction.xml
@@ -8,7 +8,7 @@
     </para>
 
     <para>
-      <emphasis>Compass</emphasis> provide access to search engine management functionality and <literal>CompassSession</literal>'s for managing data within the Search Engine. It is created using <literal> CompassConfiguration</literal> (loads configuration and mappings files). When <literal>Compass</literal> is created, it will either join an existing index or create a new one if none is available, then instantiates the configured Search Engine Optimizer. After this, an application will use <literal>Compass</literal> to obtain a <literal>CompassSession</literal> in order to start managing the data with the Search Engine. <literal>Compass</literal> is a heavyweight object, usually created at application startup and shared within an application for <literal>CopmassSession</literal> creation.
+      <emphasis>Compass</emphasis> provide access to search engine management functionality and <literal>CompassSession</literal>'s for managing data within the Search Engine. It is created using <literal> CompassConfiguration</literal> (loads configuration and mappings files). When <literal>Compass</literal> is created, it will either join an existing index or create a new one if none is available, then instantiates the configured Search Engine Optimizer. After this, an application will use <literal>Compass</literal> to obtain a <literal>CompassSession</literal> in order to start managing the data with the Search Engine. <literal>Compass</literal> is a heavyweight object, usually created at application startup and shared within an application for <literal>CompassSession</literal> creation.
     </para>
 
     <para>

diff --git a/running-tests.txt b/running-tests.txt
@@ -16,7 +16,7 @@ compass.engine.store.jdbc.dialect=org.apache.lucene.store.jdbc.dialect.MySQLInno
 compass.engine.store.jdbc.connection.driverClass=com.mysql.jdbc.Driver
 compass.engine.store.jdbc.connection.username=root
 compass.engine.store.jdbc.connection.password=
-copmass.engine.useCompoundFile=false
+compass.engine.useCompoundFile=false
 # END TEST PROPERTIES
 
 
diff --git a/src/main/src/org/compass/core/compass-core-config.xsd b/src/main/src/org/compass/core/compass-core-config.xsd
diff --git a/src/main/src/org/compass/core/config/builder/SmartConfigurationBuilder.java b/src/main/src/org/compass/core/config/builder/SmartConfigurationBuilder.java
@@ -24,7 +24,6 @@
 import org.compass.core.config.CompassConfiguration;
 import org.compass.core.config.CompassEnvironment;
 import org.compass.core.config.ConfigurationException;
-import org.springframework.beans.FatalBeanException;
 
 /**
  * @author kimchy
@@ -110,7 +109,7 @@ private int detectValidationMode(InputStream stream, String resourceName) {
             return (isDtdValidated ? VALIDATION_DTD : VALIDATION_XSD);
         }
         catch (IOException ex) {
-            throw new FatalBeanException(
+            throw new ConfigurationException(
                     "Unable to determine validation mode for [" + resourceName +
                             "]. Did you attempt to load directly from a SAX InputSource?", ex);
         }

diff --git a/src/main/src/org/compass/core/lucene/LuceneEnvironment.java b/src/main/src/org/compass/core/lucene/LuceneEnvironment.java
@@ -626,7 +626,7 @@ public static abstract class SearchEngineIndex {
          * finished. This is done regardless of what directory is in use. <p/>
          * Default value id <code>true</code>
          */
-        public static final String USE_COMPOUND_FILE = "copmass.engine.useCompoundFile";
+        public static final String USE_COMPOUND_FILE = "compass.engine.useCompoundFile";
 
         /**
          * The maximum number of terms that will be indexed for a single field in a

diff --git a/src/main/test/org/compass/core/load/multi/compass.cfg.xml b/src/main/test/org/compass/core/load/multi/compass.cfg.xml
@@ -55,7 +55,7 @@
         <setting name="compass.engine.store.jdbc.connection.autoCommit">false</setting>
         <!--<setting name="compass.engine.store.jdbc.lockType">org.apache.lucene.store.jdbc.lock.SelectForUpdateLock</setting>-->
 
-        <setting name="copmass.engine.useCompoundFile">false</setting>
+        <setting name="compass.engine.useCompoundFile">false</setting>
 
         <setting name="compass.transaction.isolation.class">
             org.compass.core.lucene.engine.transaction.ReadCommittedTransaction</setting>

diff --git a/src/main/test/org/compass/core/load/simple/compass.cfg.xml b/src/main/test/org/compass/core/load/simple/compass.cfg.xml
@@ -48,7 +48,7 @@
         <setting name="compass.engine.store.jdbc.connection.autoCommit">false</setting>
         <!--<setting name="compass.engine.store.jdbc.lockType">org.apache.lucene.store.jdbc.lock.SelectForUpdateLock</setting>-->
 
-        <setting name="copmass.engine.useCompoundFile">false</setting>
+        <setting name="compass.engine.useCompoundFile">false</setting>
 
         <setting name="compass.transaction.isolation.class">
             org.compass.core.lucene.engine.transaction.ReadCommittedTransaction</setting>

diff --git a/upgrade.txt b/upgrade.txt
@@ -32,6 +32,7 @@ VERSION 0.9.0 ()
    Compass will try to auto-detect the correct Dialect.
 7. compass.transaction.managerLookup is no longer required when using JTA. 
    Compass will try to auto-detect it based on the JTA implementation used.
+8. The setting for compound file format was wrongly named, changed to: compass.engine.useCompoundFile.
 
 VERSION 0.8.1 (Jan 22, 2006)
 ============================