Scarab commit: svn commit: r10870 - branches/release/0.22
Johannes Höchstädter <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jhoech Date: 2010-01-21 07:35:24-0800 New Revision: 10870 Modified: branches/release/0.22/minimal.properties branches/release/0.22/project.properties branches/release/0.22/scarab_properties.xml branches/release/0.22/wizzard.properties Log: FIX - Comments for analyzer class of org.tigris.scarab.util.word.PorterStemAnalyzer are now shown in property file again. ADD - Did an "update-properties" Modified: branches/release/0.22/minimal.properties Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/minimal.properties?view=diff&pathrev=10870&r1=10869&r2=10870 ============================================================================== --- branches/release/0.22/minimal.properties (original) +++ branches/release/0.22/minimal.properties 2010-01-21 07:35:24-0800 @@ -17,7 +17,7 @@ # NEVER change this file by hand! If you want to introduce a new property, # please update # -# xdocs/scarab_properties.xml +# scarab_properties.xml # # instead and afterwards call # Modified: branches/release/0.22/project.properties Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/project.properties?view=diff&pathrev=10870&r1=10869&r2=10870 ============================================================================== --- branches/release/0.22/project.properties (original) +++ branches/release/0.22/project.properties 2010-01-21 07:35:24-0800 @@ -17,7 +17,7 @@ # NEVER change this file by hand! If you want to introduce a new property, # please update # -# xdocs/scarab_properties.xml +# scarab_properties.xml # # instead and afterwards call # @@ -795,6 +795,80 @@ # End of Group NTLM domain # ======================== + +# ========================== +# Group: LDAP authentication +# ========================== +# +# scarab.login.ldap.synchronizeOnStartUp +# scarab.login.ldap.providerFactory +# scarab.login.ldap.providerUrl +# scarab.login.ldap.ldapQuery +# scarab.login.ldap.baseDn +# + + +# -------------------------------------- +# scarab.login.ldap.synchronizeOnStartUp +# -------------------------------------- +# +# +# This property lets you choose to synchronize the database with +# the useraccounts in the LDAP server during intialization of the +# ScarabLDAPDBSecurityService. (true/false) +# + +scarab.login.ldap.synchronizeOnStartUp=true + +# --------------------------------- +# scarab.login.ldap.providerFactory +# --------------------------------- +# +# +# This property lets you choose the LDAP providerfactory instead of relying +# on the default settings for your container (from jndi.properties usually). +# + +scarab.login.ldap.providerFactory=com.sun.jndi.ldap.LdapCtxFactory + +# ----------------------------- +# scarab.login.ldap.providerUrl +# ----------------------------- +# +# +# This property lets you choose the LDAP providerURL instead of relying +# on the default settings for your container (from jndi.properties usually). +# + +scarab.login.ldap.providerUrl=ldap://localhost/ + +# --------------------------- +# scarab.login.ldap.ldapQuery +# --------------------------- +# +# +# This property lets you choose to limit the records returned by using the +# LDAP query you provide here. This is to avoid to add dummy accounts which +# do not correspond to real users and might have weak passwords +# + +scarab.login.ldap.ldapQuery=(objectClass=posixAccount) + +# ------------------------ +# scarab.login.ldap.baseDn +# ------------------------ +# +# +# This property lets you choose to limit the records returned by specifying +# the base dn below which to search for records. +# + +scarab.login.ldap.baseDn=dc=example,dc=com + +# ================================ +# End of Group LDAP authentication +# ================================ + # ------------------------- # scarab.workflow.classname # ------------------------- @@ -876,7 +950,7 @@ # session.timeout # services.UploadService.repository # searchindex.path -# searchindex.analyuerClass +# searchindex.analyzerClass # # Turbine related properties # @@ -891,16 +965,17 @@ # searchindex.analyzerClass # ------------------------- # -# -# Analyzer class which Lucene uses to index text entered into Scarab. # -# The default Analyzer is optimized for indexing English text. -# If your Scarab contains mostly non-English text you may want to -# switch to an Analyzer optimized for your language. -# Eg. for German you could use: org.apache.lucene.analysis.de.GermanAnalyzer -# The package org.apache.lucene.analysis contains Analyzers for a lot of -# other Languages. -# Of course you are free to write your own Analyzer. +# Analyzer class which Lucene uses to index text entered into Scarab. +# +# The default Analyzer is optimized for indexing English text. +# If your Scarab contains mostly non-English text you may want to +# switch to an Analyzer optimized for your language. +# Eg. for German you could use: org.apache.lucene.analysis.de.GermanAnalyzer +# The package org.apache.lucene.analysis contains Analyzers for a lot of +# other Languages. +# Of course you are free to write your own Analyzer. +# searchindex.analyzerClass=org.tigris.scarab.util.word.PorterStemAnalyzer @@ -1224,11 +1299,11 @@ scarab.issue.max.copy=25 -# --------------------- -# scarab.issue.dependencies.displayattributes -# --------------------- +# ----------------------------------------------------- +# scarab.issue.dependencies.additionalDisplayAttributes +# ----------------------------------------------------- # -# Additional Attributes which are displayed for dependencies. +# Additional Attributes which are displayed for in the Dependencies-Tab. scarab.issue.dependencies.additionalDisplayAttributes= @@ -1790,7 +1865,7 @@ # maven.multiproject.type=war -maven.repo.remote=file:www/repository,http://www.ibiblio.org/maven/,http://mirrors.ibiblio.org/pub/mirrors/maven/,http://guest:[email protected]/svn/scarab/trunk/www/repository/,http://maven-plugins.sourceforge.net/maven, http://www.apache.org/dist/java-repository/ +maven.repo.remote=file:www/repository,http://mirrors.ibiblio.org/pub/mirrors/maven,http://guest:[email protected]/svn/scarab/trunk/www/repository/,http://maven-plugins.sourceforge.net/maven,http://www.apache.org/dist/java-repository/ maven.docbook.src=www/book maven.sdocbook.src.dir=www/book maven.sdocbook.files=**/scarab-*.xml @@ -1875,6 +1950,7 @@ # maven.checkstyle.format # maven.xdoc.version # maven.dist.bin.assembly.dir +# maven.nsis.build.dir # # Maven Site Properties # @@ -1909,8 +1985,17 @@ # maven.dist.bin.assembly.dir=${root.dir}/target/dist + +# -------------------- +# maven.nsis.build.dir +# -------------------- +# +# +# Maven NSIS Properties +# + maven.nsis.build.dir=${root.dir}/target/dist # ======================= # End of Group maven-site -# ======================= +# ======================= \ No newline at end of file Modified: branches/release/0.22/scarab_properties.xml Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/scarab_properties.xml?view=diff&pathrev=10870&r1=10869&r2=10870 ============================================================================== --- branches/release/0.22/scarab_properties.xml (original) +++ branches/release/0.22/scarab_properties.xml 2010-01-21 07:35:24-0800 @@ -1099,7 +1099,7 @@ <property> <name>searchindex.analyzerClass</name> <default>org.tigris.scarab.util.word.PorterStemAnalyzer</default> - <comment> + <details> Analyzer class which Lucene uses to index text entered into Scarab. The default Analyzer is optimized for indexing English text. @@ -1109,7 +1109,7 @@ The package org.apache.lucene.analysis contains Analyzers for a lot of other Languages. Of course you are free to write your own Analyzer. - </comment> + </details> <type>Runtime</type> <customization modification="optional">advanced</customization> <file/> Modified: branches/release/0.22/wizzard.properties Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/wizzard.properties?view=diff&pathrev=10870&r1=10869&r2=10870 ============================================================================== --- branches/release/0.22/wizzard.properties (original) +++ branches/release/0.22/wizzard.properties 2010-01-21 07:35:24-0800 @@ -17,7 +17,7 @@ # NEVER change this file by hand! If you want to introduce a new property, # please update # -# xdocs/scarab_properties.xml +# scarab_properties.xml # # instead and afterwards call # @@ -209,8 +209,8 @@ hsqldb.dbname=${scarab.database.name} scarab.jdbc.handler.hypersonic=hsqldb scarab.database.port.hypersonic=3306 -scarab.database.admin.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/${hsqldb.database}/${hsqldb.dbname} -scarab.database.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/${hsqldb.database}/${hsqldb.dbname} +scarab.database.admin.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/embedded_hsqldb/${hsqldb.dbname};shutdown=true +scarab.database.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/embedded_hsqldb/${hsqldb.dbname};shutdown=true scarab.database.url.extension.hypersonic= scarab.database.pool.validationQuery.hypersonic=SELECT ATTRIBUTE_ID FROM SCARAB_ATTRIBUTE WHERE ATTRIBUTE_ID='0' scarab.database.jdbc.driver.hypersonic=org.hsqldb.jdbcDriver @@ -366,4 +366,4 @@ # ================ # End of Group db2 -# ================ +# ================ \ No newline at end of file ------------------------------------------------------ http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2440972