shuber 2005/03/09 11:52:34 CET
Modified files:
core/src/webapp/WEB-INF/etc/config config.xml
Log:
Improved configuration to point to new location of repository file.
Revision Changes Path
1.6 +81 -81 jahia/core/src/webapp/WEB-INF/etc/config/config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/config.xml.diff?r1=1.5&r2=1.6&f=h
Index: config.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/config.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.xml 28 Feb 2005 16:10:22 -0000 1.5
+++ config.xml 9 Mar 2005 10:52:33 -0000 1.6
@@ -3,87 +3,87 @@
<!--
Application context definition.
- -->
+ -->
<beans>
- <!-- ========================= BUSINESS OBJECT DEFINITIONS
========================= -->
-
- <!-- configuration bean -->
- <bean id="jahiaConfigBean" class="org.jahia.bin.JahiaConfig">
- <property name="settings">
- <props>
- <prop
key="org.jahia.services.htmlparser.HtmlParser">org.jahia.services.htmlparser.NekoHtmlParser</prop>
- <!--
- <prop
key="org.jahia.services.htmlparser.HtmlParser">org.jahia.services.htmlparser.TidyHtmlParser</prop>
- -->
- </props>
- </property>
- </bean>
-
- <bean id="JCRConfig"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
- <property name="properties">
- <props>
- <prop
key="org.jahia.repository.name">jahiarepository</prop>
- <prop
key="org.jahia.repository.config">/WEB-INF/repository/repository.xml</prop>
- <prop
key="org.jahia.repository.homedir">/WEB-INF/var/repository</prop>
- <prop
key="org.jahia.repository.workspace">jahia</prop>
- <prop
key="org.jahia.repository.import-test">/WEB-INF/repository/import-test.xml</prop>
- </props>
- </property>
- </bean>
-
- <bean id="JCRNamespaces"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
- <property name="properties">
- <props>
- <prop
key="jahiant">http://www.jahia.org/jahia/nt/1.0</prop>
- <prop
key="jahiamix">http://www.jahia.org/jahia/mix/1.0</prop>
- <prop
key="jahiajcr">http://www.jahia.org/jahia/jcr/1.0</prop>
- <prop
key="jahia">http://www.jahia.org/jahia/1.0</prop>
- <prop
key="jahiantmetadata">http://www.jahia.org/jahia/jahiantmetadata/1.0</prop>
- </props>
- </property>
- </bean>
-
- <bean id="settings"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
- <property name="properties">
- <props>
- <prop
key="org.jahia.services.fileextractor.tmpdir">fileextraction</prop>
- </props>
- </property>
- </bean>
-
- <bean id="fileExtractors"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
- <property name="properties">
- <props>
- <prop
key="text/html">org.jahia.services.fileextraction.TextExtractor</prop>
- <prop
key="text/plain">org.jahia.services.fileextraction.TextExtractor</prop>
- <prop
key="text/x-setext">org.jahia.services.fileextraction.TextExtractor</prop>
- <prop
key="text/richtext">org.jahia.services.fileextraction.TextExtractor</prop>
- <prop
key="text/tab-separated-values">org.jahia.services.fileextraction.TextExtractor</prop>
- <prop
key="text/vnd.wap.wml">org.jahia.services.fileextraction.TextExtractor</prop>
- <prop
key="text/vnd.wap.wmls">org.jahia.services.fileextraction.TextExtractor</prop>
- <prop
key="application/msword">org.jahia.services.fileextraction.JahiaMSWordExtractor</prop>
- <prop
key="application/pdf">org.jahia.services.fileextraction.PDFExtractor</prop>
- <prop
key="application/vnd.ms-powerpoint">org.jahia.services.fileextraction.JahiaMSPowerPointExtractor</prop>
- <prop
key="application/vnd.ms-excel">org.jahia.services.fileextraction.JahiaMSExcelExtractor</prop>
- <prop
key="audio/x-mpeg">org.jahia.services.fileextraction.MP3Extractor</prop>
- <prop
key="audio/mpeg">org.jahia.services.fileextraction.MP3Extractor</prop>
- </props>
- </property>
- </bean>
-
- <bean id="searchConfig"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
- <property name="properties">
- <props>
- <prop
key="org.jahia.engines.search.searchViewHandler.default">org.jahia.engines.search.SearchViewHandlerImpl</prop>
- <prop
key="org.apache.lucene.mergeFactor">10</prop>
- <prop
key="org.apache.lucene.minMergeDocs">10</prop>
- <prop
key="org.apache.lucene.commitLockTimeout">60000</prop>
- <prop
key="org.apache.lucene.writeLockTimeout">6000</prop>
- <prop
key="org.apache.lucene.maxClauseCount">10000</prop>
- <prop
key="org.jahia.services.search.searchIndexRootDir">/WEB-INF/var/search_indexes</prop>
- </props>
- </property>
- </bean>
-
+ <!-- ========================= BUSINESS OBJECT DEFINITIONS
========================= -->
+
+ <!-- configuration bean -->
+ <bean id="jahiaConfigBean" class="org.jahia.bin.JahiaConfig">
+ <property name="settings">
+ <props>
+ <prop
key="org.jahia.services.htmlparser.HtmlParser">org.jahia.services.htmlparser.NekoHtmlParser</prop>
+ <!--
+ <prop
key="org.jahia.services.htmlparser.HtmlParser">org.jahia.services.htmlparser.TidyHtmlParser</prop>
+ -->
+ </props>
+ </property>
+ </bean>
+
+ <bean id="JCRConfig"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop key="org.jahia.repository.name">jahiarepository</prop>
+ <prop
key="org.jahia.repository.config">/WEB-INF/etc/repository/repository.xml</prop>
+ <prop
key="org.jahia.repository.homedir">/WEB-INF/var/repository</prop>
+ <prop key="org.jahia.repository.workspace">jahia</prop>
+ <prop
key="org.jahia.repository.import-test">/WEB-INF/repository/import-test.xml</prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="JCRNamespaces"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop key="jahiant">http://www.jahia.org/jahia/nt/1.0</prop>
+ <prop
key="jahiamix">http://www.jahia.org/jahia/mix/1.0</prop>
+ <prop
key="jahiajcr">http://www.jahia.org/jahia/jcr/1.0</prop>
+ <prop key="jahia">http://www.jahia.org/jahia/1.0</prop>
+ <prop
key="jahiantmetadata">http://www.jahia.org/jahia/jahiantmetadata/1.0</prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="settings"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop
key="org.jahia.services.fileextractor.tmpdir">fileextraction</prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="fileExtractors"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop
key="text/html">org.jahia.services.fileextraction.TextExtractor</prop>
+ <prop
key="text/plain">org.jahia.services.fileextraction.TextExtractor</prop>
+ <prop
key="text/x-setext">org.jahia.services.fileextraction.TextExtractor</prop>
+ <prop
key="text/richtext">org.jahia.services.fileextraction.TextExtractor</prop>
+ <prop
key="text/tab-separated-values">org.jahia.services.fileextraction.TextExtractor</prop>
+ <prop
key="text/vnd.wap.wml">org.jahia.services.fileextraction.TextExtractor</prop>
+ <prop
key="text/vnd.wap.wmls">org.jahia.services.fileextraction.TextExtractor</prop>
+ <prop
key="application/msword">org.jahia.services.fileextraction.JahiaMSWordExtractor</prop>
+ <prop
key="application/pdf">org.jahia.services.fileextraction.PDFExtractor</prop>
+ <prop
key="application/vnd.ms-powerpoint">org.jahia.services.fileextraction.JahiaMSPowerPointExtractor</prop>
+ <prop
key="application/vnd.ms-excel">org.jahia.services.fileextraction.JahiaMSExcelExtractor</prop>
+ <prop
key="audio/x-mpeg">org.jahia.services.fileextraction.MP3Extractor</prop>
+ <prop
key="audio/mpeg">org.jahia.services.fileextraction.MP3Extractor</prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="searchConfig"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop
key="org.jahia.engines.search.searchViewHandler.default">org.jahia.engines.search.SearchViewHandlerImpl</prop>
+ <prop key="org.apache.lucene.mergeFactor">10</prop>
+ <prop key="org.apache.lucene.minMergeDocs">10</prop>
+ <prop key="org.apache.lucene.commitLockTimeout">60000</prop>
+ <prop key="org.apache.lucene.writeLockTimeout">6000</prop>
+ <prop key="org.apache.lucene.maxClauseCount">10000</prop>
+ <prop
key="org.jahia.services.search.searchIndexRootDir">/WEB-INF/var/search_indexes</prop>
+ </props>
+ </property>
+ </bean>
+
</beans>
