Author: steveh
Date: Tue Mar 15 15:39:46 2005
New Revision: 157612
URL: http://svn.apache.org/viewcvs?view=rev&rev=157612
Log:
Changing the pageflow samples to reflect the new build style (i.e., editing
build.properties).
Modified:
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
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=157611&r2=157612
==============================================================================
---
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
(original)
+++
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
Tue Mar 15 15:39:46 2005
@@ -128,7 +128,6 @@
<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>
@@ -153,19 +152,33 @@
beehive_projects
petstoreWeb</source>
</section>
+ <section id="edit_properties_file"><title>Edit the
<code>build.properties</code> File</title>
+ <p>In this section you will edit the
<code>build.properties</code> file--the file
+ that sets the build-related properties
for your web application.</p>
+ <p>Open the file
<code>C:/beehive_projects/petstoreWeb/WEB-INF/src/build.properties</code>
+ in a text editor.</p>
+ <p>Edit the file so that the
<code>beehive.home</code> property points to the
+ top-level folder of your beehive
installation. For example, if you beehive installation
+ resides at
<code>C:/apache/apache-beehive-1.0</code>, then your
<code>build.properties</code> file
+ would appear as follows.</p>
+
<source>beehive.home=<strong>C:/apache/apache-beehive-1.0</strong>
+
+servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar</source>
+ </section>
+
<section id="copy_runtime">
<title>To Copy the Runtime Resources</title>
<p>The Petstore application is distributed
without the Beehive runtime JAR
files it needs to run.
To copy the runtime JARs into the
Petstore app,
run the following Ant command. </p>
- <source>ant
- -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
- -Dwebapp.dir=C:\beehive_projects\petstoreWeb
- deploy.beehive.webapp.runtime
+ <source>ant
+ -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml
+ deploy-beehive
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
-Dwebapp.dir=C:\beehive_projects\petstoreWeb
deploy.beehive.webapp.runtime</source>
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml
deploy-beehive</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>
@@ -173,13 +186,13 @@
<title>To Compile the Petstore
Application</title>
<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
+<source>ant
+ -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml
build
-
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=C:\beehive_projects\petstoreWeb build</source>
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml 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=157611&r2=157612
==============================================================================
---
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 Mar 15 15:39:46 2005
@@ -22,44 +22,57 @@
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">
+ <section id="copy_rename">
<title>Copy and Rename the Template
Folder</title>
<p>Copy the folder
<code>BEEHIVE_HOME/samples/netui-blank</code> to your
- development directory. </p>
+ development directory. Below we assume
that you have copied <code>netui-blank</code> into the
+ folder
<strong><code>C:/myDevelopmentDirectory</code></strong>.</p>
+
<source>C:/myDevelopmentDirectory/netui-blank</source>
<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
-
<strong><code><Project-Folder></code></strong>. </p>
- </section>
+ appropriate to your application. Below
we assume that <code>netui-blank</code> has been
+ renamed as
<strong><code>myWebApplication</code></strong>. </p>
+
<source>C:/myDevelopmentDirectory/myWebApplication</source>
+ </section>
+ <section id="edit_properties_file"><title>Edit the
<code>build.properties</code> File</title>
+ <p>In this section you will edit the
<code>build.properties</code> file--the file
+ that sets the build-related properties
for your web application.</p>
+ <p>Open the file
<code>C:/myDevelopmentDirectory/myWebApplication/WEB-INF/src/build.properties</code>
+ in a text editor.</p>
+ <p>Edit the file so that the
<code>beehive.home</code> property points to the
+ top-level folder of your beehive
installation. For example, if you beehive installation
+ resides at
<code>C:/apache/apache-beehive-1.0</code>, then your
<code>build.properties</code> file
+ would appear as follows.</p>
+
<source>beehive.home=<strong>C:/apache/apache-beehive-1.0</strong>
+
+servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar</source>
+ </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
and tag library JARs to
-
<code><Project-Folder>/WEB-INF/lib</code>.</p>
-<source>ant -f
- %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
- -Dwebapp.dir=<strong><Project-Folder></strong>
- deploy.beehive.webapp.runtime
-
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
-Dwebapp.dir=<strong><Project-Folder></strong>
deploy.beehive.webapp.runtime</source>
+
<code>C:/myDevelopmentDirectory/myWebApplication/WEB-INF/lib</code>.</p>
+ <source>ant
+ -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
+ deploy-beehive
+
+<strong>Copy and Paste version:</strong>
+ant -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
deploy-beehive</source>
</section>
- <section><title>Build the Template Web App</title>
+ <section id="build"><title>Build the Template Web
App</title>
<p>To build the web app, run the following Ant
command.</p>
<source>ant
- -f %BEEHIVE_HOME%\ant\buildWebapp.xml
- -Dwebapp.dir=<strong><Project-Folder></strong>
+ -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
build
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=<strong><Project-Folder></strong> build</source>
+<strong>Copy and Paste version:</strong>
+ant -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
build</source>
</section>
- <section>
+ <section id="deploy_run">
<title>To Deploy and Run the Template Web
App</title>
<p>Before deploying the application, ensure
that Tomcat is turned on.</p>
<source>%CATALINA_HOME%\bin\startup.bat</source>
@@ -68,7 +81,7 @@
simply refresh the browser.)</p>
<p>In the URL below replace <strong><SomeContext></strong> with some
string that is appropriate for your
application. This string will appear in the URL when users
visit your application.
- Replace <strong><Project-Folder></strong> with the path to
your project folder.</p>
+ Replace <strong><Project-Folder></strong> with the path to
your project folder (e.g.,
<code>C:/myDevelopmentDirectory/myWebApplication</code>).</p>
<p class="quote">
http://localhost:8080/manager/deploy?path=/<strong><SomeContext></strong>&war=file:<strong><Project-Folder></strong>&update=true
</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=157611&r2=157612
==============================================================================
---
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 Mar 15 15:39:46 2005
@@ -7,7 +7,7 @@
<body>
<section id="intro">
<title>Introduction</title>
- <section>
+ <section id="goals">
<title>Tutorial Goals</title>
<p>In this tutorial, you will learn:</p>
<ul>
@@ -28,7 +28,6 @@
<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>
@@ -39,6 +38,20 @@
<li><code>JAVA_HOME/bin</code></li>
</ul>
</section>
+ <section id="edit_properties_file"><title>Edit the
<code>build.properties</code> File</title>
+ <p>In this section you will edit the
<code>build.properties</code> file--the file
+ that sets the build-related properties
for your web application.</p>
+ <p>Open the file
<code>C:/beehive_projects/pageflow_tutorial/WEB-INF/src/build.properties</code>
+ in a text editor.</p>
+ <p>Edit the file so that the
<code>beehive.home</code> property points to the
+ top-level folder of your beehive
installation. For example, if you beehive installation
+ resides at
<code>C:/apache/apache-beehive-1.0</code>, then your
<code>build.properties</code> file
+ would appear as follows.</p>
+
<source>beehive.home=<strong>C:/apache/apache-beehive-1.0</strong>
+
+servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar</source>
+ </section>
<section id="start_tomcat">
<title>To Start the Tomcat Server</title>
<p>At the command prompt, enter:</p>
@@ -101,12 +114,11 @@
using the Ant command below.</p>
<p>At the command prompt, enter the following Ant command:</p>
<source>ant
- -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
- -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial
- deploy.beehive.webapp.runtime
+ -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
+ deploy-beehive
<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>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
deploy-beehive</source>
<p>Before proceeding, confirm that the following directory
structure exists:</p>
<source>C:
beehive_projects
@@ -183,12 +195,11 @@
<p>You are now ready to compile the Page Flow and deploy it to
Tomcat.</p>
<p>At the command prompt, enter:</p>
<source>ant
- -f %BEEHIVE_HOME%\ant\buildWebapp.xml
- -Dwebapp.dir=C:\beehive_projects\pageflow_tutorial
+ -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
build
<strong>Copy and Paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build</source>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
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>
@@ -281,18 +292,17 @@
{
...
}</source>
- </section>
<p>Save <code>Controller.jpf</code>.</p>
+ </section>
<section id="compile_3">
<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
+ -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
build
-<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build</source>
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
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">
@@ -435,13 +445,11 @@
<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
+ -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
build
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build</source>
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
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">
@@ -515,13 +523,11 @@
<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
+ -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
build
-<strong>Copy and paste version:</strong>
-
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=C:\beehive_projects\pageflow_tutorial build </source>
+<strong>Copy and Paste version:</strong>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
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">
