svn commit: r532502 - in /lenya/trunk/src: modules/lucene/ modules/lucene/java/src/org/apache/cocoon/components/search/components/impl/ pubs/default/config/search/ pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/

Author: nettings
Date: Wed Apr 25 15:08:29 2007
New Revision: 532502

URL: http://svn.apache.org/viewvc?view=rev&rev=532502
Log:
finish rename from config/lucene_index.xconf to
config/search/lucene_index.xml, thanks to richard for spotting this!
committed despite the code freeze, because this change had
been agreed on and announced to the users list well before the freeze...

Added:
    lenya/trunk/src/pubs/default/config/search/lucene_index.xml
      - copied unchanged from r532371, 
lenya/trunk/src/pubs/default/config/search/lucene_index.xconf
Removed:
    lenya/trunk/src/pubs/default/config/search/lucene_index.xconf
Modified:
    lenya/trunk/src/modules/lucene/README.txt
    
lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
    
lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java

Modified: lenya/trunk/src/modules/lucene/README.txt
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/lucene/README.txt?view=diff&rev=532502&r1=532501&r2=532502
==============================================================================
--- lenya/trunk/src/modules/lucene/README.txt (original)
+++ lenya/trunk/src/modules/lucene/README.txt Wed Apr 25 15:08:29 2007
@@ -6,7 +6,7 @@
   Configuration
   -------------
 
-  Each publication has a configuration at PUB/config/search/lucene_index.xconf 
which is being defined
+  Each publication has a configuration at PUB/config/search/lucene_index.xml 
which is being defined
   by 
java/src/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
 
 

Modified: 
lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java?view=diff&rev=532502&r1=532501&r2=532502
==============================================================================
--- 
lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
 (original)
+++ 
lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
 Wed Apr 25 15:08:29 2007
@@ -123,7 +123,7 @@
     /**
      * The name of the index configuration file.
      */
-    public static final String INDEX_CONF_FILE = "search/lucene_index.xconf";
+    public static final String INDEX_CONF_FILE = "search/lucene_index.xml";
 
     /**
      * check the config file each time the getIndex is called to update if 
necessary the

Modified: 
lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java?view=diff&rev=532502&r1=532501&r2=532502
==============================================================================
--- 
lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java
 (original)
+++ 
lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java
 Wed Apr 25 15:08:29 2007
@@ -215,7 +215,8 @@
             String indexDir = "lenya/pubs/" + newPublicationId + 
"/work/lucene/index";
 
             indexSource = (ModifiableSource) 
resolver.resolveURI(publicationsUri + "/"
-                    + newPublicationId + "/config/search/lucene_index.xconf");
+                    + newPublicationId + "/config/" 
+                    + 
org.apache.cocoon.components.search.components.impl.IndexManagerImpl.INDEX_CONF_FILE);
             Document indexDoc = 
DocumentHelper.readDocument(indexSource.getInputStream());
             Element[] indexElement = 
DocumentHelper.getChildren(indexDoc.getDocumentElement(), null, "index");