You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by st...@apache.org on 2005/02/23 00:44:03 UTC

svn commit: r154914 - in incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs: ./ controls/ pageflow/ wsm/

Author: steveh
Date: Tue Feb 22 15:43:59 2005
New Revision: 154914

URL: http://svn.apache.org/viewcvs?view=rev&rev=154914
Log:
Latest updates to samples/tutorials.

Modified:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-blank.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-db.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-blank.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-blank.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-blank.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-blank.xml Tue Feb 22 15:43:59 2005
@@ -23,7 +23,7 @@
 			at <a class="fork" href="../setup.html">Set Up the Dev Environment</a>.</p>
   <p>To use the template, copy the contents of <code>&lt;BeehiveRoot>/samples/controls-blank</code> into your 
 	project folder (refered to as <code>&lt;Project-Folder></code> below). (Or copy <code>controls-blank</code>
-	to another location and rename it.)  
+	to another location and rename it as <code>&lt;Project-Folder></code>.)  
 	An Ant build file is included 
 	in the template, which will compile your control project into a distributable JAR 
 	file.  After you have copied the contents of 
@@ -32,8 +32,7 @@
   src
   build.xml</source> 
   <p>The following Ant command will compile the control template. </p>
-<source>ant 
-  -f &lt;Project-Folder>\build.xml build</source>
+<source>ant -f <strong>&lt;Path-to-Project-Folder></strong>\build.xml build</source>
     <p>This will produce a distributable JAR file at: <code>&lt;Project-Folder>/build/mycontrols.jar</code>.</p>
     <p>To use the JAR in your other projects (like a web app project or a web service project), copy 
 		<code>mycontrols.jar</code> into the project's <code>WEB-INF/lib</code> directory.</p>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-db.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-db.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-db.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-db.xml Tue Feb 22 15:43:59 2005
@@ -90,7 +90,8 @@
     ...
 }
 </source>
-<p>The Java source for EmployeeDBControl is available at <code>BEEHIVE_HOME/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.jcx</code>.</p>
+<p>The Java source for EmployeeDBControl is available at</p> 
+	<source>BEEHIVE_HOME/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.jcx</source>
 </section>
 
 
@@ -98,11 +99,8 @@
 <section>
     <title>Building the Database Control</title>
     <p>To build <code>dbControl.jar</code> run the following Ant command.</p>
-					<p><strong>Note:</strong> replace <code>&lt;BeehiveRoot></code> with the path to the 
-					top level folder of your Beehive installation, for example, 
-						<code>C:\apache\apache-beehive-1.0</code>. </p>	
     <p>On Windows:</p>
-    <source>ant -f <strong>&lt;BeehiveRoot></strong>\controls-db\build.xml build</source>    
+    <source>ant -f %BEEHIVE_HOME%\controls-db\build.xml build</source>    
     <p>This produces the file <code>dbControl.jar</code> in the directory <code>&lt;BeehiveRoot>/samples/controls-db/build</code>.</p>
     <p></p>
 </section>     </body>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/tutorial_controls.xml Tue Feb 22 15:43:59 2005
@@ -107,7 +107,7 @@
   -Dwebapp.dir=C:\beehive_projects\controls_tutorial_test 
   deploy.beehive.webapp.runtime
   
-<strong>Cut and paste version:</strong>
+<strong>Copy and paste version:</strong>
 ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml -Dwebapp.dir=C:\beehive_projects\controls_tutorial_test deploy.beehive.webapp.runtime</source>
                 <p>Before proceeding, confirm that the following directory structure exists:</p>
 <source>C:
@@ -249,14 +249,14 @@
   -f C:\beehive_projects\controls_tutorial\build.xml 
   build
   
-<strong>Cut and Paste version:</strong>
+<strong>Copy and Paste version:</strong>
 ant -f C:\beehive_projects\controls_tutorial\build.xml build</source>
 <p>Now copy the JAR file into the test web application.</p>
 <source>copy 
   C:\beehive_projects\controls_tutorial\build\mycontrols.jar 
   C:\beehive_projects\controls_tutorial_test\WEB-INF\lib
 
-<strong>Cut and Paste version:</strong>  
+<strong>Copy and Paste version:</strong>  
 copy C:\beehive_projects\controls_tutorial\build\mycontrols.jar C:\beehive_projects\controls_tutorial_test\WEB-INF\lib
 </source>
 	<p>To deploy the web application (with the control imbedded in it), click the following link. We 
@@ -351,14 +351,14 @@
   -f C:\beehive_projects\controls_tutorial\build.xml 
   build
   
-<strong>Cut and Paste version:</strong>
+<strong>Copy and Paste version:</strong>
 ant -f C:\beehive_projects\controls_tutorial\build.xml build</source>
 <p>Now copy the JAR file into the test web application.</p>
 <source>copy 
   C:\beehive_projects\controls_tutorial\build\mycontrols.jar 
   C:\beehive_projects\controls_tutorial_test\WEB-INF\lib
 
-<strong>Cut and Paste version:</strong>  
+<strong>Copy and Paste version:</strong>  
 copy C:\beehive_projects\controls_tutorial\build\mycontrols.jar C:\beehive_projects\controls_tutorial_test\WEB-INF\lib
 </source>
 	<p>To deploy the web application (with the control imbedded in it), click the following link. We 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml Tue Feb 22 15:43:59 2005
@@ -128,6 +128,7 @@
 				<p>Open a command shell and confirm that you have the following variables 
 					have been set:</p>
 					<ul>
+						<li><code>BEEHIVE_HOME</code></li>
 						<li><code>ANT_HOME</code></li>
 						<li><code>JAVA_HOME</code></li>
 						<li><code>CATALINA_HOME</code></li>
@@ -158,24 +159,27 @@
 					files it needs to run.
 					To copy the runtime JARs into the Petstore app, 
 					run the following Ant command.  </p>
-					<p><strong>Note:</strong> replace <code>&lt;BeehiveRoot></code> with the path to the 
-					top level folder of your Beehive installation, for example, 
-						<code>C:\apache\apache-beehive-1.0</code>. </p>
 				<source>ant 
-  -f <strong>&lt;BeehiveRoot></strong>\ant\webappRuntimeCore.xml
+  -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
   -Dwebapp.dir=C:\beehive_projects\petstoreWeb
-  deploy.beehive.webapp.runtime</source>
+  deploy.beehive.webapp.runtime
+  
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml -Dwebapp.dir=C:\beehive_projects\petstoreWeb deploy.beehive.webapp.runtime</source>
 				<p>This will copy the Beehive webapp runtime JARs into the following location.</p>
 				<source>  C:/beehive_projects/petstoreWeb/WEB-INF/lib</source>
 			</section>
 			<section id="compile">
 				<title>To Compile the Petstore Application</title>
-                <p>To compile the Petstore app, enter the following Ant command:</p>
-<source>ant 
-  -f <strong>&lt;BeehiveRoot></strong>\ant\buildWebapp.xml 
+				<p>To compile the Petstore app, enter the following Ant 
+					command:</p>
+				<source>ant 
+  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\petstoreWeb 
-  build</source>
-		
+  build
+  
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\petstoreWeb build</source>
 			</section>
 			<section id="start_tomcat">
 				<title>To Start Tomcat</title>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sample_netui-blank.xml Tue Feb 22 15:43:59 2005
@@ -25,15 +25,12 @@
 			<section id="copy">
 				<title>Copy and Rename the Template Folder</title>
 				<p>Copy the folder 
-					<code>&lt;BeehiveRoot>/samples/netui-blank</code> to your 
-					development directory. (&lt;BeehiveRoot> refers to the path 
-					to the top-level directory of your Beehive distribution. A 
-					typical path would be <code>C:/apache-beehive-1.0</code>.) 
-					</p>
+					<code>BEEHIVE_HOME/samples/netui-blank</code> to your 
+					development directory. </p>
 				<p>Rename <code>netui-blank</code> to something more 
 					appropriate to your application. Below we assume that the path to
 					the renamed <code>netui-blank</code> is 
-					<code>&lt;Project-Folder></code>. </p>
+					<strong><code>&lt;Project-Folder></code></strong>. </p>
 			</section>
 			<section id="copy_runtime">
 				<title>Copy the Runtime JARs into the Template Folder</title>
@@ -42,22 +39,30 @@
 				<p>The following Ant command will copy the necessary runtime 
 					and tag library JARs to 
 					<code>&lt;Project-Folder>/WEB-INF/lib</code>.</p>
-				<source> ant -f 
-  &lt;BeehiveRoot>\ant\webappRuntimeCore.xml 
-  -Dwebapp.dir=&lt;Project-Folder> 
-  deploy.beehive.webapp.runtime</source>
+<source>ant -f 
+  %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
+  -Dwebapp.dir=<strong>&lt;Project-Folder></strong>
+  deploy.beehive.webapp.runtime
+
+<strong>Copy and paste version:</strong>  
+
+ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml -Dwebapp.dir=<strong>&lt;Project-Folder></strong> deploy.beehive.webapp.runtime</source>
 			</section>
 			<section><title>Build the Template Web App</title>
 				<p>To build the web app, run the following Ant command.</p>
 <source>ant 
-  -f &lt;BeehiveRoot>\ant\buildWebapp.xml 
-  -Dwebapp.dir=&lt;Project-Folder> 
-  build</source>
+  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
+  -Dwebapp.dir=<strong>&lt;Project-Folder></strong>
+  build
+
+<strong>Copy and paste version:</strong>
+
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=<strong>&lt;Project-Folder></strong> build</source>
 </section>
 			<section>
 				<title>To Deploy and Run the Template Web App</title>
-				<p>Before deploying the application, ensure that Tomcat is turned on: 
-					<code>%CATALINA_HOME%\bin\startup.bat</code>.</p>
+				<p>Before deploying the application, ensure that Tomcat is turned on.</p>
+<source>%CATALINA_HOME%\bin\startup.bat</source>				
 	<p>To deploy the web application, visit the following URL in a web browser.  (We recommend that you open the 
 		link in a new browser window.  Each time you want to redeploy the application,
 		simply refresh the browser.)</p>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml Tue Feb 22 15:43:59 2005
@@ -103,7 +103,10 @@
                 <source>ant 
   -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
-  deploy.beehive.webapp.runtime</source>
+  deploy.beehive.webapp.runtime
+  
+<strong>Copy and Paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial deploy.beehive.webapp.runtime</source>
                 <p>Before proceeding, confirm that the following directory structure exists:</p>
 <source>C:
   beehive_projects
@@ -182,12 +185,15 @@
 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
-  build</source>
+  build
+
+<strong>Copy and Paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml  -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build</source>
 	<p>To deploy the web application, click the following link.  We recommend that you open the 
 		link in a new browser window.  Each time you want to redeploy the application,
 		simply refresh the browser.</p>  
     <p class="quote">
-	  <a class="fork" href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/pageflow_projects/pageflow_tutorial&amp;update=true</a>
+	  <a class="fork" href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true</a>
 	</p>
 	<p>If you are prompted for a username/password, enter: <code>manager/manager</code></p>
 	<p>(For an explanation of this method of deploying an application to Tomcat, 
@@ -283,11 +289,14 @@
 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
-  build</source>
+  build
+
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build</source>
 	<p>To deploy the web application, click the following link. (Or, if you have the link below
 		open in a dedicated browser window, refresh that browser window.)</p>  
     <p class="quote">
-	  <a class="fork" href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/pageflow_projects/control_tutorial&amp;update=true</a>
+	  <a class="fork" href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true</a>
 	</p></section>
             <section id="test_3">
                 <title>To Test the Page Flow Web Application</title>
@@ -428,11 +437,15 @@
 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
-  build</source>
+  build
+
+<strong>Copy and paste version:</strong>
+
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build</source>
 	<p>To deploy the web application, click the following link. (Or, if you have the link below
 		open in a dedicated browser window, refresh that browser window.)</p>  
     <p class="quote">
-	  <a class="fork" href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/pageflow_projects/control_tutorial&amp;update=true</a>
+	  <a class="fork" href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true</a>
 	</p></section>
            <section id="test">
                 <title>To Test the Page Flow Web Application</title>
@@ -498,17 +511,21 @@
     ...</source>
 			<p>Save <code>Controller.jpf</code>.</p>
             </section>
-            <section>
+            <section id="compile_5">
                 <title>To Compile and Redeploy the Page Flow</title>
                 <p>At the command prompt, enter:</p>
 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial 
-  build</source>
+  build
+
+<strong>Copy and paste version:</strong>
+
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build  </source>
 	<p>To deploy the web application, click the following link. (Or, if you have the link below
 		open in a dedicated browser window, refresh that browser window.)</p>  
     <p class="quote">
-	  <a class="fork" href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/pageflow_projects/control_tutorial&amp;update=true</a>
+	  <a class="fork" href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/pageflow_tutorial&amp;update=true">http://localhost:8080/manager/deploy?path=/pageflow_tutorial&amp;war=file:C:/beehive_projects/control_tutorial&amp;update=true</a>
 	</p></section>
             <section>
                 <title>To Test the Page Flow Web Application</title>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml Tue Feb 22 15:43:59 2005
@@ -63,11 +63,14 @@
 						<code>ANT_HOME</code>
 					</li>
 					<li>
-						<code>JAVA_HOME</code>
+						<code>BEEHIVE_HOME</code>
 					</li>
 					<li>
 						<code>CATALINA_HOME</code>
 					</li>
+					<li>
+						<code>JAVA_HOME</code>
+					</li>
 				</ul>
 				<p>Also ensure that the following elements are on your 
 					<code>PATH</code>:</p>
@@ -104,17 +107,20 @@
 					runtime JAR files they need to run.
 					To copy the runtime JARs into the apps, 
 					run the following Ant commands.  </p>
-					<p><strong>Note:</strong> replace <code>&lt;BeehiveRoot></code> with the path to the 
-					top level folder of your Beehive installation, for example, 
-						<code>C:\apache\apache-beehive-1.0</code>. </p>
 <source>ant 
-  -f <strong>&lt;BeehiveRoot></strong>\ant\webappRuntimeCore.xml
+  -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
   -Dwebapp.dir=C:\beehive_projects\AddressBookWS
-  deploy.beehive.webapp.runtime</source>
+  deploy.beehive.webapp.runtime
+
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml -Dwebapp.dir=C:\beehive_projects\AddressBookWS deploy.beehive.webapp.runtime</source>
 <source>ant 
-  -f <strong>&lt;BeehiveRoot></strong>\ant\webappRuntimeCore.xml
+  -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
   -Dwebapp.dir=C:\beehive_projects\EmployeeWS
-  deploy.beehive.webapp.runtime</source>
+  deploy.beehive.webapp.runtime
+
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml -Dwebapp.dir=C:\beehive_projects\EmployeeWS deploy.beehive.webapp.runtime</source>
 			</section>
 				<section id="external_jars">
 					<title>To Download Junit and Derby JAR Files</title>
@@ -132,14 +138,20 @@
 				<title>To Compile the Apps</title>
                 <p>To compile the AddressBookWS app, enter the following Ant command.</p>						
 <source>ant 
-  -f <strong>&lt;BeehiveRoot></strong>\ant\buildWebapp.xml 
+  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\AddressBookWS 
-  build</source>
+  build
+
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\AddressBookWS build</source>
                 <p>To compile the EmployeeWS app, enter the following Ant command:</p>
 <source>ant 
-  -f <strong>&lt;BeehiveRoot></strong>\ant\buildWebapp.xml 
+  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\EmployeeWS 
-  build</source>
+  build
+
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\EmployeeWS build</source>
 			</section>
 			<section id="start_tomcat">
 				<title>To Start Tomcat</title>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Dashboard.xml Tue Feb 22 15:43:59 2005
@@ -73,25 +73,25 @@
             <title>To Download Required JAR Files</title>
 <p> Before you can build Petstore Dashboard you must download 1) <code>activation.jar</code> and 2) <code>mailapi.jar</code>.</p>
 
-<p> 1) download <code>activation.jar</code> (<a href="http://java.sun.com/products/javabeans/glasgow/jaf.html">http://java.sun.com/products/javabeans/glasgow/jaf.html</a>) </p>
+<p> 1) Download <code>activation.jar</code> (<a href="http://java.sun.com/products/javabeans/glasgow/jaf.html">http://java.sun.com/products/javabeans/glasgow/jaf.html</a>) </p>
  
  <p>Note that <code>activation.jar</code> is archived in the JAF 1.0.2 distribution ZIP file. Download the JAF 1.0.2 ZIP, extract <code>activation.jar</code>, and copy <code>activation.jar</code> into both </p>
 
-<source>    C:/beehive_projects/PetstoreDashboard/lib/ </source>
+<source>C:/beehive_projects/PetstoreDashboard/lib/ </source>
 
 <p>and</p> 
 
-<source>    C:/beehive_projects/petstoreWeb/WEB-INF/lib</source>
+<source>C:/beehive_projects/petstoreWeb/WEB-INF/lib</source>
  
-<p>2) <code>mailapi.jar</code> (<a href="http://java.sun.com/products/javamail/downloads/index.html">http://java.sun.com/products/javamail/downloads/index.html</a>)</p>
+<p>2) Dowload <code>mailapi.jar</code> (<a href="http://java.sun.com/products/javamail/downloads/index.html">http://java.sun.com/products/javamail/downloads/index.html</a>)</p>
  
-<p> <code>mailapi.jar</code> is archived in the JavaMail 1.3.2 distribution ZIP file.  Download the JavaMail 1.3.2 ZIP, extract <code>mailapi.jar</code>, and copy <code>mailapi.jar</code> into both </p>
+<p>Note that <code>mailapi.jar</code> is archived in the JavaMail 1.3.2 distribution ZIP file.  Download the JavaMail 1.3.2 ZIP, extract <code>mailapi.jar</code>, and copy <code>mailapi.jar</code> into both </p>
 
-<source>    C:/beehive_projects/PetstoreDashboard/lib/ </source>
+<source>C:/beehive_projects/PetstoreDashboard/lib/ </source>
 
 <p>and</p> 
 
-<source>    C:/beehive_projects/petstoreWeb/WEB-INF/lib</source>
+<source>C:/beehive_projects/petstoreWeb/WEB-INF/lib</source>
 
         </section>
 <section id="build_petstore">
@@ -100,13 +100,13 @@
 	up and running on an instance of Tomcat server.  If Petstore is not up and running, complete the following
 	instructions before proceeding: <a href="site:jpetstore">Beehive Sample: Petstore</a>.</p>
 	<p>To recompile the Petstore web app, run the following Ant command.</p>
-					<p><strong>Note:</strong> replace <code>&lt;BeehiveRoot></code> with the path to the 
-					top level folder of your Beehive installation, for example, 
-						<code>C:\apache\apache-beehive-1.0</code>. </p>	
 <source>ant 
-  -f <strong>&lt;BeehiveRoot></strong>\ant\buildWebapp.xml 
+  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\petstoreWeb 
-  build</source>	
+  build
+  
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\petstoreWeb build</source>	
 	<p>To redeploy the Petstore web app, click the following link. (We recommend opening the link in a new window.
 		after deployment has completed, the browser window will display a status message.  After the 
 		status message has been displayed, you may close the browser window.)</p>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsm-blank.xml Tue Feb 22 15:43:59 2005
@@ -15,72 +15,73 @@
 <p>The template contains everything needed in a basic web service application, except for the runtime JAR files.
 </p>
     </section>
-	<section>
-		<title>Using the Web Service Template</title>
-		<p>The following instruction assume that you have completed the basic 
-			Beehive set up procedure at <a class="fork" 
-			href="site:setup">Beehive Installation and Setup</a>.</p>
-		<p>To use the template, (1) copy the contents of 
-			<code>BEEHIVE_HOME/samples/wsm-blank</code> into your project 
-			folder, and (2) copy the runtime JARs to the project's WEB-INF/lib 
-			directory. It is important to copy the <em>contents</em> of 
-			<code>wsm-blank</code> into your project folder, not the folder 
-			<code>wsm-blank</code> itself. After you have copied the contents 
-			of <code>wsm-blank</code> into your project folder, the following 
-			directory structure should exist:</p>
-		<source>&lt;Project-Folder> WEB-INF happyaxis.jsp index.html</source>
-		<p> The following Ant command will copy the necessary runtime JARs to 
-			<code>&lt;Project-Folder>/WEB-INF/lib</code>, where 
-			<code>&lt;Project-Folder></code> is the path to your web service 
-			project folder: </p>
-		<source> ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-			-Dwebapp.dir=&lt;Project-Folder> deploy.wsm.webapp.runtime</source>
-		<p>To build and run the template, run the following Ant command. 
-			(Before running ensure that Tomcat is turned on: 
-			<code>%CATALINA_HOME%\bin\startup.bat</code>. Or use the Ant 
-			command provided in the distribution: <code>ant -f 
-			%BEEHIVE_HOME%\ant\buildWebapp.xml start</code>. If you use the 
-			provided Ant command, you will have to press <code>Ctrl+C</code> to 
-			continue issuing commands in that command window.)</p>
-		<source> ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-			-Dwebapp.dir=&lt;Project-Folder> -Dcontext.path=HelloWorldWS 
-			build.webapp deploy</source>
-		<p>If the HelloWorldWS web service is already deployed, use the 
-			redeploy target:</p>
-		<source> ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
-			-Dwebapp.dir=&lt;Project-Folder> -Dcontext.path=HelloWorldWS 
-			build.webapp redeploy</source>
-		<p>You can now try out the HelloWorldWS web service by pointing your 
-			browser at the following links.</p>
-		<ul>
-			<li>Start Page: <a class="fork" 
-				href="http://localhost:8080/HelloWorldWS/">http://localhost:8080/HelloWorldWS/</a> 
-				</li>
-			<li>WSDL: <a class="fork" 
-				href="http://localhost:8080/HelloWorldWS/template/Blank.jws?wsdl">http://localhost:8080/HelloWorldWS/template/Blank.jws?wsdl</a></li>
-			<li>Invoke the sayHelloWorld() method in Blank.java: <a 
-				class="fork" 
-				href="http://localhost:8080/HelloWorldWS/template/Blank.jws?method=sayHelloWorld">http://localhost:8080/HelloWorldWS/template/Blank.jws?method=sayHelloWorld</a></li>
-		</ul>
-		<!--<source>
-netui-blank
-  resources
-    beehive
-      version
-        images
-          error-handling.jpg - header image for the error.jsp page
-        javascript
-          netui-tree.js - JavaScript file to support the &lt;netui:tree> tag
-  WEB-INF
-  src
-    global
-      Global.app - a global Page Flow useful for common operations, error handling, etc.   
-    log4j.xml - the log4j configuration file
-  netui-config.xml - 
-  netui-validator-rules.xml
-  web.xml
-</source>-->
-	</section>
+		<section id="using">
+			<title>Using the Web Service Template</title>
+			<p>The following instruction assume that you have completed all of 
+				required and optional steps in the Beehive set up procedure at 
+				<a href="site:../setup">Installation and Setup</a>.</p>
+			<p>To use the template, follow these steps:</p>
+			<section id="copy">
+				<title>Copy and Rename the Template Folder</title>
+				<p>Copy the folder 
+					<code>BEEHIVE_HOME/samples/wsm-blank</code> to your 
+					development directory. </p>
+				<p>Rename <code>wsm-blank</code> to something more 
+					appropriate to your application. Below we assume that the path to
+					the renamed <code>wsm-blank</code> is 
+					<strong><code>&lt;Project-Folder></code></strong>. </p>
+			</section>
+			<section id="copy_runtime">
+				<title>Copy the Runtime JARs into the Template Folder</title>
+				<p>Copy the runtime JARs to the project's WEB-INF/lib 
+					directory.</p>
+				<p>The following Ant command will copy the necessary runtime JARs to 
+					<code>&lt;Project-Folder>/WEB-INF/lib</code>.</p>
+<source>ant -f 
+  %BEEHIVE_HOME%\ant\webappRuntimeCore.xml 
+  -Dwebapp.dir=<strong>&lt;Path-to-Project-Folder></strong>
+  deploy.wsm.webapp.runtime
+
+<strong>Copy and paste version:</strong>  
+
+ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml -Dwebapp.dir=<strong>&lt;Path-to-Project-Folder></strong> deploy.wsm.webapp.runtime</source>
+			</section>
+			<section><title>Build the Template Web App</title>
+				<p>To build the template web service, run the following Ant command.</p>
+<source>ant 
+  -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
+  -Dwebapp.dir=<strong>&lt;Path-to-Project-Folder></strong>
+  build
+
+<strong>Copy and paste version:</strong>
+
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=<strong>&lt;Path-to-Project-Folder></strong> build</source>
+</section>
+			<section>
+				<title>To Deploy and Run the Template Web Service</title>
+				<p>Before deploying the web service, ensure that Tomcat is turned on.</p>
+<source>%CATALINA_HOME%\bin\startup.bat</source>				
+	<p>To deploy the web service, visit the following URL in a web browser.  (We recommend that you open the 
+		link in a new browser window.  Each time you want to redeploy the application,
+		simply refresh the browser.)</p>
+	<p>In the URL below replace <strong>&lt;SomeContext></strong> with some string that is appropriate for 
+your web service.
+		Replace <strong>&lt;Path-to-Project-Folder></strong> with the path to your project folder.</p>  
+    <p class="quote">
+	  http://localhost:8080/manager/deploy?path=/<strong>&lt;SomeContext></strong>&amp;war=file:<strong>&lt;Path-to-Project-Folder></strong>&amp;update=true
+	</p>
+	<p>This method of application deployment assumes that you have added the <code>manager</code>
+		role to your Tomcat installation.  For instructions on adding the <code>manager</code> role, 
+		see <a class="fork" href="../setup.html#optional">Beehive Installation and Setup</a>.</p>
+	<p>If you are prompted for a username/password, enter: <code>manager/manager</code></p>
+				<p>You can now try out the web service by pointing your browser at 
+					the following link.</p>
+				<ul>
+					<li>Run the controller file's begin() method:
+						http://localhost:8080/<strong>&lt;SomeContext></strong>/</li>
+				</ul>
+			</section>
+		</section>
     </body>
     <footer>
         <legal>Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml?view=diff&r1=154913&r2=154914
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml Tue Feb 22 15:43:59 2005
@@ -72,7 +72,10 @@
 	<source>ant 
   -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
   -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  deploy.wsm.webapp.runtime</source>
+  deploy.wsm.webapp.runtime
+
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial deploy.wsm.webapp.runtime</source>
             </section>
             <section id="examine_JWS">
                 <title>To Examine the Blank.jws Web Service</title>
@@ -133,7 +136,10 @@
                 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  build</source>
+  build
+  
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial build</source>
 	<p>To deploy the web service, click the following link. 
 		</p>
 		<p>We recommend that you open the 
@@ -196,7 +202,10 @@
                 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  build</source>
+  build
+  
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial build</source>
 	<p>To redeploy the web service, click the following link. 
 		(Or, if you have the link below
 		open in a dedicated browser window, refresh that browser window.)</p>  
@@ -261,7 +270,10 @@
                 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  build</source>
+  build
+  
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial build</source>
 	<p>To redeploy the web service, click the following link. 
 		(Or, if you have the link below
 		open in a dedicated browser window, refresh that browser window.)</p>  
@@ -330,7 +342,10 @@
                 <source>ant 
   -f %BEEHIVE_HOME%\ant\buildWebapp.xml 
   -Dwebapp.dir=C:\beehive_projects\ws_tutorial 
-  build</source>
+  build
+  
+<strong>Copy and paste version:</strong>
+ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml -Dwebapp.dir=C:\beehive_projects\ws_tutorial build</source>
 	<p>To redeploy the web service, click the following link. 
 		(Or, if you have the link below
 		open in a dedicated browser window, refresh that browser window.)</p>