Scarab commit: svn commit: r10749 - trunk: . xdocs
Hussayn Dabbous <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2009-06-05 05:41:03-0700
New Revision: 10749
Modified:
trunk/project.properties
trunk/wizzard.properties
trunk/xdocs/scarab_properties.xml
Log:
inconsistent data in project.properties. i updated xdocs/scarab_properties.xml and run maven scarab:update-properties
Modified: trunk/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.properties?view=diff&pathrev=10749&r1=10748&r2=10749
==============================================================================
--- trunk/project.properties (original)
+++ trunk/project.properties 2009-06-05 05:41:03-0700
@@ -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
@@ -917,6 +992,9 @@
# scarab.http.domain
# scarab.http.port
# scarab.context
+# email.notification.host
+# email.notification.port
+# email.notification.uri
# scarab.http.scriptname
# scarab.attachment.remove.permanent
# scarab.attachments.repository
@@ -951,6 +1029,39 @@
scarab.http.port=8080
scarab.context=scarab
+# -----------------------
+# email.notification.host
+# -----------------------
+#
+#
+# This property is considered experimental at the moment.
+# y be possible, that it will be dropped in favor to a more generic solution.
+#
+
+email.notification.host=
+
+# -----------------------
+# email.notification.port
+# -----------------------
+#
+#
+# This property is considered experimental at the moment.
+# y be possible, that it will be dropped in favor to a more generic solution.
+#
+
+email.notification.port=80
+
+# ----------------------
+# email.notification.uri
+# ----------------------
+#
+#
+# This property is considered experimental at the moment.
+# y be possible, that it will be dropped in favor to a more generic solution.
+#
+
+email.notification.uri=
+
# ----------------------
# scarab.http.scriptname
# ----------------------
@@ -1224,11 +1335,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 in the Dependencies-Tab.
scarab.issue.dependencies.additionalDisplayAttributes=
@@ -1675,7 +1786,7 @@
#
#######################################################################
Name=Scarab
-version=1.0-b22-dev
+version=1.0-b23-dev
project=scarab
year=2000-2004
@@ -1875,6 +1986,7 @@
# maven.checkstyle.format
# maven.xdoc.version
# maven.dist.bin.assembly.dir
+# maven.nsis.build.dir
#
# Maven Site Properties
#
@@ -1909,8 +2021,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: trunk/wizzard.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/wizzard.properties?view=diff&pathrev=10749&r1=10748&r2=10749
==============================================================================
--- trunk/wizzard.properties (original)
+++ trunk/wizzard.properties 2009-06-05 05:41:03-0700
@@ -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
Modified: trunk/xdocs/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/scarab_properties.xml?view=diff&pathrev=10749&r1=10748&r2=10749
==============================================================================
--- trunk/xdocs/scarab_properties.xml (original)
+++ trunk/xdocs/scarab_properties.xml 2009-06-05 05:41:03-0700
@@ -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/>
@@ -1188,6 +1188,63 @@
<customization modification="optional">basic</customization>
<file/>
</property>
+
+
+ <property>
+ <name>email.notification.host</name>
+ <default></default>
+ <comment>
+ See email.notification.uri below
+ </comment>
+ <type>Runtime</type>
+ <customization modification="optional">advanced</customization>
+ <file/>
+ <details>
+ This property is considered experimental at the moment.
+ It may be possible, that it will be dropped in favor to a more generic solution.
+ </details>
+ </property>
+
+ <property>
+ <name>email.notification.port</name>
+ <default>80</default>
+ <comment>
+ See email.notification.uri below
+ </comment>
+ <type>Runtime</type>
+ <customization modification="optional">advanced</customization>
+ <file/>
+ <details>
+ This property is considered experimental at the moment.
+ It may be possible, that it will be dropped in favor to a more generic solution.
+ </details>
+ </property>
+
+ <property>
+ <name>email.notification.uri</name>
+ <default></default>
+ <comment>
+ In some cases, the Link generated within an email notification differs from the link
+ generated for online usage. This is in particular true, if Scarab runs within a
+ secure access environment (like Juniper SA as an example). In that case the URL
+ which is generated by Scarab will be rewritten by the secure access system. But since
+ the Email notification does not pass the secure system, the link needs to be rewritten
+ by Scarab itself. This property contains the template to be used in that case.
+ If the property is empty, the default scarab email link will be generated.
+ The working template for Juniper-SA is:
+
+ email.notification.uri=${email.notification.host}:${email.notification.port}/${scarab.context}/issues/id/${issueId},DanaInfo=${scarab.http.domain},Port=${scarab.http.port}
+
+ </comment>
+ <type>Runtime</type>
+ <customization modification="optional">advanced</customization>
+ <file/>
+ <details>
+ This property is considered experimental at the moment.
+ It may be possible, that it will be dropped in favor to a more generic solution.
+ </details>
+ </property>
+
<property>
<name>scarab.http.scriptname</name>
<default>/${scarab.context}/issues</default>
@@ -1436,7 +1493,7 @@
<property>
<name>scarab.issue.dependencies.additionalDisplayAttributes</name>
<default></default>
- <details>Additional Attributes which are displayed for in the Dependencies-Tab.</details>
+ <details>Additional Attributes which are displayed in the Dependencies-Tab.</details>
</property>
<property>
<name>scarab.viewIssue.singleScreenOnly</name>
@@ -2562,7 +2619,7 @@
</property>
<property>
<name>version</name>
- <default>1.0-b21</default>
+ <default>1.0-b23-dev</default>
<comment>Project version.</comment>
<type>Build</type>
<customization modification="optional">advanced</customization>
@@ -2774,7 +2831,7 @@
</property>
<property>
<name>maven.repo.remote</name>
- <default>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/</default>
+ <default>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/</default>
<comment/>
<type>Build</type>
<customization modification="optional">advanced</customization>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2359693