svn commit: r1195139 - in /myfaces/tobago/trunk: build-nightly.sh readme.txt src/site/apt/getting-started.apt

[bo...@apache.org]

Author: bommel
Date: Sun Oct 30 09:53:17 2011
New Revision: 1195139

URL: http://svn.apache.org/viewvc?rev=1195139&view=rev
Log:
update documentation

Removed:
    myfaces/tobago/trunk/build-nightly.sh
Modified:
    myfaces/tobago/trunk/readme.txt
    myfaces/tobago/trunk/src/site/apt/getting-started.apt

Modified: myfaces/tobago/trunk/readme.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/readme.txt?rev=1195139&r1=1195138&r2=1195139&view=diff
==============================================================================
--- myfaces/tobago/trunk/readme.txt (original)
+++ myfaces/tobago/trunk/readme.txt Sun Oct 30 09:53:17 2011
@@ -1,6 +1,6 @@
 Building
 --------
-You need Maven2 (at least 2.0.6) and Java 5 to build Tobago.
+You need Maven2 (at least 2.2.1) and Java 5 (Tobago 1.0.x) or Java 6 (Tobago 1.5.x) to build Tobago.
 
 In the main directory you can use
 
@@ -17,25 +17,7 @@ mvn install -Pall-modules
 
 Demo
 ----
-To deploy the demo on your local Tomcat 5.5 create a
-~/.m2/settings.xml file based on settings-example.xml.
-
-Make sure the manager user has the role manager; see
-<tomcat>/conf/tomcat-users.xml.
-
-
-  mvn tomcat:deploy
-  or
-  mvn tomcat:undeploy tomcat:deploy
-
-Alternatively, you can run
-
-  mvn package
-
-and deploy the WAR from the target directory
-manually.
-
-It will create a log file in the app-server starting folder.
-You may want to change that in the src/main/webapp/WEB-INF/classes/log4j.xml
 
+In the directory tobago-demo/tobago-example-demo
 
+mvn jetty:run

Modified: myfaces/tobago/trunk/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/getting-started.apt?rev=1195139&r1=1195138&r2=1195139&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/getting-started.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/getting-started.apt Sun Oct 30 09:53:17 2011
@@ -59,26 +59,9 @@ Building All
 +----------------------------------------
 
 
-Deploying the Demo
+The Demo
 
-  To deploy the demo on your local Tomcat 5.5 create a
-  ~/.m2/settings.xml file based on
-  {{{http://svn.apache.org/repos/asf/myfaces/tobago/trunk/settings-example.xml}settings-example.xml}}.
-
-  Make sure the manager user has the role manager; see
-  $TOMCAT_HOME/conf/tomcat-users.xml.
-
-  Change into the demo directory
-  {{{http://svn.apache.org/repos/asf/myfaces/tobago/trunk/tobago-example/tobago-example-demo/}example/demo}}
-  and run
-
-+----------------------------------------
-  mvn tomcat:deploy
-  or
-  mvn tomcat:undeploy tomcat:deploy
-+----------------------------------------
-
-  Alternatively, you can run the demo with jetty
+You can run the demo in tobago-example/tobago-example-demo with jetty
 
 +----------------------------------------
   mvn jetty:run-exploded