Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 28050 invoked from network); 31 Aug 2008 22:20:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Aug 2008 22:20:06 -0000 Received: (qmail 74850 invoked by uid 500); 31 Aug 2008 22:20:04 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 74826 invoked by uid 500); 31 Aug 2008 22:20:04 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 74817 invoked by uid 99); 31 Aug 2008 22:20:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Aug 2008 15:20:04 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Aug 2008 22:19:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA56723889C0; Sun, 31 Aug 2008 15:19:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690801 - in /continuum/trunk: ./ continuum-docs/src/site/apt/administrator_guides/security/ continuum-docs/src/site/apt/installation/ Date: Sun, 31 Aug 2008 22:19:15 -0000 To: commits@continuum.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080831221915.AA56723889C0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Sun Aug 31 15:19:14 2008 New Revision: 690801 URL: http://svn.apache.org/viewvc?rev=690801&view=rev Log: svn merge -r690688:HEAD https://svn.apache.org/repos/asf/continuum/branches/continuum-1.2.x merge doc update from branch to be able to release from trunk Modified: continuum/trunk/ (props changed) continuum/trunk/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt continuum/trunk/continuum-docs/src/site/apt/installation/index.apt continuum/trunk/continuum-docs/src/site/apt/installation/standalone.apt continuum/trunk/continuum-docs/src/site/apt/installation/tomcat.apt continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt Propchange: continuum/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 31 15:19:14 2008 @@ -1 +1 @@ -/continuum/branches/continuum-1.2.x:690684 +/continuum/branches/continuum-1.2.x:690684,690689-690799 Modified: continuum/trunk/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt?rev=690801&r1=690800&r2=690801&view=diff ============================================================================== --- continuum/trunk/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt (original) +++ continuum/trunk/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt Sun Aug 31 15:19:14 2008 @@ -1,6 +1,7 @@ ----- Continuum Security Configuration ----- + 2008-09-01 Continuum Security Configuration @@ -15,7 +16,7 @@ (In the above list, <<<~>>> is the home directory of the user who is running Continuum, and <<<$CONTINUUM_HOME>>> is the directory where Continuum is installed, - such as <<>>.) + such as <<>>.) ~~TODO: Link to Redback documentation when available Modified: continuum/trunk/continuum-docs/src/site/apt/installation/index.apt URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/installation/index.apt?rev=690801&r1=690800&r2=690801&view=diff ============================================================================== --- continuum/trunk/continuum-docs/src/site/apt/installation/index.apt (original) +++ continuum/trunk/continuum-docs/src/site/apt/installation/index.apt Sun Aug 31 15:19:14 2008 @@ -14,6 +14,6 @@ * {{{installation.html}Installation in different environment (standalone, webapp, service)}} - * {{{release-notes.html}Release Notes}} + * {{{../release-notes.html}Release Notes}} * {{{upgrade.html}How to upgrade from a previous version?}} Modified: continuum/trunk/continuum-docs/src/site/apt/installation/standalone.apt URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/installation/standalone.apt?rev=690801&r1=690800&r2=690801&view=diff ============================================================================== --- continuum/trunk/continuum-docs/src/site/apt/installation/standalone.apt (original) +++ continuum/trunk/continuum-docs/src/site/apt/installation/standalone.apt Sun Aug 31 15:19:14 2008 @@ -3,7 +3,7 @@ ------ Emmanuel Venisse ------ - Oct 9 2007 + 2008-09-01 ------ Installing Continuum Standalone @@ -63,7 +63,7 @@ ------------------ #!/bin/sh -CONTINUUM_HOME=/opt/continuum-1.1 +CONTINUUM_HOME=/opt/continuum-1.2 su - continuum_user -c "$CONTINUUM_HOME/bin/continuum console $@ &" ------------------ Modified: continuum/trunk/continuum-docs/src/site/apt/installation/tomcat.apt URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/installation/tomcat.apt?rev=690801&r1=690800&r2=690801&view=diff ============================================================================== --- continuum/trunk/continuum-docs/src/site/apt/installation/tomcat.apt (original) +++ continuum/trunk/continuum-docs/src/site/apt/installation/tomcat.apt Sun Aug 31 15:19:14 2008 @@ -4,7 +4,7 @@ Joakim Erdfelt Emmanuel Venisse ------ - Oct 30 2007 + 2008-09-01 ------ Guide to Install Continuum on Tomcat @@ -82,7 +82,7 @@ ** {The Apache Derby JAR files} - <>Continuum 1.1 has been tested with Apache Derby 10.1.3.1 + <>Continuum 1.2 has been tested with Apache Derby 10.1.3.1 Default installation of Continuum utilizes the Apache Derby 100% Java Database to maintain Continuum specific information, and also the Users / Security Database. @@ -117,7 +117,7 @@ Tested on Tomcat v5.0.28 - These instructions explain how to deploy the Continuum 1.1 web application in an existing installation of Tomcat 5.0.x. + These instructions explain how to deploy the Continuum 1.2 web application in an existing installation of Tomcat 5.0.x. <> @@ -127,7 +127,7 @@ the internal JAXP implementation in JDK 1.5, we recommend that you remove the files in <<<$CATALINA_HOME/common/endorsed/>>>. ------------------------------------------ - + @@ -197,7 +197,7 @@ ------------------------------------------ + docBase="/path/to/continuum-webapp-1.2.war"> + docBase="/path/to/continuum-webapp-1.2.war"> > If you are upgrading from 1.1 to 1.2, no upgrade tool is needed. * Download The Tool