[Cayenne-cvs] cayenne/xdocs/userguide/quickstart comline.xml,1.19,1.20 webapp.xml,1.12,1.13

[<me...@us...>]

Update of /cvsroot/cayenne/cayenne/xdocs/userguide/quickstart
In directory usw-pr-cvs1:/tmp/cvs-serv15171/xdocs/userguide/quickstart

Modified Files:
	comline.xml webapp.xml 
Log Message:
fixed web tutorial


Index: comline.xml
===================================================================
RCS file: /cvsroot/cayenne/cayenne/xdocs/userguide/quickstart/comline.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- comline.xml	3 Oct 2002 03:41:14 -0000	1.19
+++ comline.xml	3 Oct 2002 04:14:39 -0000	1.20
@@ -143,33 +143,21 @@
 			would match the word "metro"), the following output will be printed:
 			</p>
 <source>
---- will run 1 query.
-SELECT t0.GALLERY_NAME, t0.GALLERY_ID FROM GALLERY t0 WHERE UPPER(t0.GALLERY_NAME) LIKE UPPER(?) 
-[params: '%metro%'] - prepared in 20 ms.
-=== returned 1 row. - took 10 ms.
+WARN  QueryLogger: --- will run 1 query.
+WARN  QueryLogger: SELECT t0.GALLERY_NAME, t0.GALLERY_ID FROM GALLERY t0 WHERE UPPER(t0.GALLERY_NAME
+) LIKE UPPER(?) [params: '%metro%'] - prepared in 20 ms.
+WARN  QueryLogger: === returned 1 row. - took 0 ms.
 
 Found gallery 'The Metropolitan Museum of Art'.
 
---- will run 2 queries.
-SELECT NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = 'ARTIST'
-=== returned 1 row. - took 0 ms.
-UPDATE AUTO_PK_SUPPORT SET NEXT_ID = NEXT_ID + 20 WHERE TABLE_NAME = 'ARTIST'
-=== updated 1 row.
-+++ transaction committed.
---- will run 2 queries.
-SELECT NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = 'PAINTING'
-=== returned 1 row. - took 0 ms.
-UPDATE AUTO_PK_SUPPORT SET NEXT_ID = NEXT_ID + 20 WHERE TABLE_NAME = 'PAINTING'
-=== updated 1 row.
-+++ transaction committed.
---- will run 2 queries.
-INSERT INTO ARTIST (ARTIST_ID, DATE_OF_BIRTH, ARTIST_NAME) VALUES (?, ?, ?) 
-[params: 280, NULL, 'Salvador Dali']
-=== updated 1 row.
-INSERT INTO PAINTING (PAINTING_ID, ARTIST_ID, ESTIMATED_PRICE, PAINTING_TITLE) VALUES (?, ?, ?, ?) 
-[params: 280, 280, NULL, 'Sleep']
-=== updated 1 row.
-+++ transaction committed.
+WARN  QueryLogger: --- will run 2 queries.
+WARN  QueryLogger: INSERT INTO ARTIST (ARTIST_ID, DATE_OF_BIRTH, ARTIST_NAME) VALUES (?, ?, ?) 
+[params: 320, NULL, 'Salvador Dali']
+WARN  QueryLogger: === updated 1 row.
+WARN  QueryLogger: INSERT INTO PAINTING (PAINTING_ID, ARTIST_ID, ESTIMATED_PRICE, PAINTING_TITLE) 
+VALUES (?, ?, ?, ?) [params: 320, 320, NULL, 'Sleep']
+WARN  QueryLogger: === updated 1 row.
+WARN  QueryLogger: +++ transaction committed.
 </source>
     	</subsection>
     	</subsection>

Index: webapp.xml
===================================================================
RCS file: /cvsroot/cayenne/cayenne/xdocs/userguide/quickstart/webapp.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- webapp.xml	2 Oct 2002 04:54:21 -0000	1.12
+++ webapp.xml	3 Oct 2002 04:14:39 -0000	1.13
@@ -42,10 +42,9 @@
        		All references to Tomcat below should apply in some form to other web containers
        		as well.</p>
     		
-    		<p>- Create a new folder named <code>cayenne-web-app</code> 
-    		anywhere in the filesystem. This directory is referred to as 
-    		"project directory" further in this chapter. For a sample project
-    		layout look at the tutorial source distributed with Cayenne.</p>
+    		<p>- Use tutorial source directory distributed with Cayenne at
+    		<code>$CAYENNE_HOME/src/tutorials/cayenne-web-app</code> 
+    		as a project directory.</p>
     		
     		<p>- Copy <code>cayenne.jar</code> to the <code>WEB-INF/lib</code> subdirectory of 
     		the tutorial project directory.</p>
@@ -115,7 +114,7 @@
     			<li><a href="../../tutorials/cayenne-web-app/WEB-INF/driverinfo.xml">driverinfo.xml</a></li>
     		</ul>
     		
-    		Open <code>cayenne.xml</code> 
+    		Save these files under WEB-INF subdirectory of the tutorial project folder. Open <code>cayenne.xml</code> 
     		file in CayenneModeler and make the following changes:
     		<ul>
     			<li>if the database used is NOT MySQL, <code>cayenne.xml</code>
@@ -160,11 +159,12 @@
     		</p>    	
     	</subsection>
     	   	<subsection name="3.2.6 Compile and Deploy the Application" anchor="6">
-    		<p>Compile the source code lime ypou would normally compile a webapplications.
+    		<p>Compile the source code like you would normally compile a webapplication.
     		The example is given for javac from the command line (assuming that JAVA_HOME variable 
-    		points to the JSDK 1.4 installation). 
-    		On Windows (substitute <code>[servlet.jar]</code> with the path to the actiual JAR file,
-    		for instance tomcat/common/lib/servlet.jar):</p>
+    		points to the JDK 1.3 or 1.4 installation). Substitute <code>[servlet.jar]</code> 
+    		with the path to the actiual JAR file,
+    		for instance tomcat/common/lib/servlet.jar
+    		On Windows:</p>
 <source>
 cayenne-web-app> cd WEB-INF\classes
 cayenne-web-app\WEB-INF\classes> set CLASSPATH=%CLASSPATH%;[servlet.jar]