Scarab commit: svn commit: r10905 - trunk: . xdocs xdocs/howto
Johannes Höchstädter <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jhoech
Date: 2010-02-09 02:28:23-0800
New Revision: 10905
Added:
trunk/xdocs/howto/jira-import-howto.xml
- copied unchanged from r10904, /branches/release/0.22/xdocs/howto/jira-import-howto.xml
Removed:
trunk/xdocs/tasks.xml
Modified:
trunk/ (props changed)
trunk/xdocs/howto/debian-package-howto.xml
trunk/xdocs/navigation.xml
Log:
MRG - Merged current changes from 0.22 branch back into trunk. Branch was in revision 10904.
ENH - XDoc files for documentation.
Modified: trunk/xdocs/howto/debian-package-howto.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/howto/debian-package-howto.xml?view=diff&pathrev=10905&r1=10904&r2=10905
==============================================================================
--- trunk/xdocs/howto/debian-package-howto.xml (original)
+++ trunk/xdocs/howto/debian-package-howto.xml 2010-02-09 02:28:23-0800
@@ -7,11 +7,12 @@
<author>Peter Tillemans</author>
</properties>
- <body>
+ <body>
+ <section name="Debian Package">
<p>
Installation instructions for the debian packages generated by the scarab:debian-package
</p>
- <section name="Debian Package Support">
+ <subsection name="Debian Package Overview">
<p>
The debian package has support for
</p>
@@ -21,8 +22,8 @@
<li>configurable through /etc/default/scarab-<contextname></li>
<li>running the tomcat server using a security manager.</li>
</ul>
- </section>
- <section name="Generating the debian package">
+ </subsection>
+ <subsection name="Generating the debian package">
<p>
Contrary to the normal install instructions these assume that multiple scarab
instances will be deployed on the same server. The package name is defined to
@@ -40,18 +41,18 @@
Note : It is needed to define the maven.war.final.name to reflect the context
name, as tomcat will use the name of the war file as context.
</p>
- </section>
+ </subsection>
- <section name="Support for different debian distributions">
+ <subsection name="Support for different debian distributions">
<p>
The only relevant difference between the debian distributions is the version number of tomcat provided in the apt reporsitories. (e.g. debian sarge uses tomcat4 and ubuntu edgy has tomcat5). This is handled by this parameter
</p>
<pre>
debian.tomcat.version=tomcat5
</pre>
- </section>
+ </subsection>
- <section name="Enabling LDAP support">
+ <subsection name="Enabling LDAP support">
<p>
To use LDAP under debian deployed scarab instances add the following properties
@@ -82,6 +83,7 @@
CATALINA_OPTS="-Djava.security.auth.login.config=/etc/tomcat5/conf/jaas.conf -Djava.awt.headless=true -Xmx128M -server"
</pre>
- </section>
+ </subsection>
+ </section>
</body>
</document>
Modified: trunk/xdocs/navigation.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/navigation.xml?view=diff&pathrev=10905&r1=10904&r2=10905
==============================================================================
--- trunk/xdocs/navigation.xml (original)
+++ trunk/xdocs/navigation.xml 2010-02-09 02:28:23-0800
@@ -27,8 +27,11 @@
<item name="Howto Build Docs" href="/howto/build-docs-howto.html"/>
<item name="Releasing Scarab" href="/howto/release-howto.html"/>
<item name="Scarab and Firewalls" href="/howto/firewall-howto.html"/>
- <item name="Windows domain auth" href="/howto/windowsdomain-howto.html"/>
- <item name="Customizing Scarab" href="/howto/customize-howto.html"/>
+ <item name="NTLM Authentication" href="/howto/windowsdomain-howto.html"/>
+ <item name="LDAP Authentication" href="/howto/ldap-howto.html"/>
+ <item name="Customizing Scarab" href="/howto/customize-howto.html"/>
+ <item name="Import issues from Jira" href="/howto/jira-import-howto.html"/>
+ <item name="Debian package" href="/howto/debian-package-howto.html"/>
</item>
<item name="Databases" href="/databases/index.html" collapse="true">
Removed: trunk/xdocs/tasks.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/tasks.xml?view=markup&pathrev=10904
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2446110