continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
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 GMT
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 <<</opt/continuum-1.1>>>.)
+ such as <<</opt/continuum-1.2>>>.)
 
 ~~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}
 
-    <<Note:>>Continuum 1.1 has been tested with Apache Derby 10.1.3.1
+    <<Note:>>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.
 
     <<Extra Jars:>>
 
@@ -127,7 +127,7 @@
         the internal JAXP implementation in JDK 1.5, we recommend that you remove the files
in <<<$CATALINA_HOME/common/endorsed/>>>.
 
 ------------------------------------------
-<Context path="/continuum" docBase="/path/to/continuum-webapp-1.1.war" debug="0">
+<Context path="/continuum" docBase="/path/to/continuum-webapp-1.2.war" debug="0">
 
   <!-- JNDI Datasource for User/Security Database (REQUIRED) -->
   <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"/>
@@ -197,7 +197,7 @@
 
 ------------------------------------------
 <Context path="/continuum"
-         docBase="/path/to/continuum-webapp-1.1.war">
+         docBase="/path/to/continuum-webapp-1.2.war">
 
   <Resource name="jdbc/users"
             auth="Container"
@@ -231,7 +231,7 @@
 
 ------------------------------------------
 <Context path="/continuum"
-         docBase="/path/to/continuum-webapp-1.1.war">
+         docBase="/path/to/continuum-webapp-1.2.war">
 
   <Resource name="jdbc/users"
             auth="Container"

Modified: continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt?rev=690801&r1=690800&r2=690801&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt Sun Aug 31 15:19:14
2008
@@ -14,6 +14,8 @@
     When upgrading continuum, it could have some database model changes.  This tool exports
data from old database model and imports the data into the new database model.
 
     There are 2 databases that need to be converted, one for the builds and one for the users.
+    
+    <<Note>> If you are upgrading from 1.1 to 1.2, no upgrade tool is needed.
 
 * Download The Tool
 



Mime
View raw message