Author: steveh
Date: Tue Mar 22 13:41:04 2005
New Revision: 158680
URL: http://svn.apache.org/viewcvs?view=rev&rev=158680
Log:
General checkin, in preparation for future integration of content from the beta
branch.
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/index.xml
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.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/skinconf.xml
incubator/beehive/trunk/docs/updating_livesite.txt
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=158679&r2=158680
==============================================================================
---
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 22 13:41:04 2005
@@ -164,10 +164,12 @@
<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>
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+
+context.path=petstoreWeb</source>
</section>
- <section id="copy_runtime">
+<!-- <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.
@@ -181,17 +183,18 @@
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>
+ </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 C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml
+ clean
build
<strong>Copy and Paste version:</strong>
-ant -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml build</source>
+ant -f C:\beehive_projects\petstoreWeb\WEB-INF\src\build.xml clean
build</source>
</section>
<section id="start_tomcat">
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/index.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/index.xml?view=diff&r1=158679&r2=158680
==============================================================================
---
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/index.xml
(original)
+++
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/index.xml
Tue Mar 22 13:41:04 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN"
"http://forrest.apache.org/dtd/document-v12.dtd";>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
<document>
<header>
<title>Introduction to Beehive Page Flows</title>
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml?view=diff&r1=158679&r2=158680
==============================================================================
---
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml
(original)
+++
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_databinding.xml
Tue Mar 22 13:41:04 2005
@@ -2,14 +2,28 @@
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
<document>
<header>
- <title>Databinding</title>
+ <title>Databinding: Passing Data Between Controller Classes and
JSP Pages</title>
</header>
<body>
<section id="intro">
<title>Introduction</title>
+ <p>Your web application's presentation layer (JSP
pages) and processing layer
+ (Controller classes) are bound together through
the process of <em>databinding</em>.
+ There are numerous databinding contexts
available, including all
+ of the JSP 2.0 implicit objects as well as
other contexts peculiar to
+ page flow apps.</p>
+ <p>Databinding syntax uses the JSP 2.0 Expression
Language. For a quick summary of the
+ JSP 2.0 EL see <a
href="http://www.onjava.com/pub/a/onjava/2003/11/05/jsp.html"; class="fork">JSP
2.0: The New Deal, Part 1</a>.</p>
+ <p>It is important to note that the databinding
contexts form a two-way street between the
+ presentation and processing layers of a web
application. Databinding contexts not
+ only pass data from the processing layer to the
presentation layer, some contexts
+ can pass data in the opposite direction from
the presentation layer to the processing layer.
+ </p>
+ <p>The one-way, read-only contexts are: requestScope,
url, sessionScope, container, pageContext, bundle, pageInput</p>
+ <p>The two-way, read-write contexts are: pageFlow,
globalApp, actionForm</p>
</section>
<section id="contexts">
- <title>Binding Contexts</title>
+ <title>Summary of Binding Contexts</title>
<table>
<tr>
<th>Context Name</th>
@@ -17,13 +31,66 @@
<th>Description</th>
</tr>
<tr>
- <td><code>actionForm</code></td>
- <td>The current form bean: the form
bean named in the current <code><netui:form></code> tag</td>
- <td>Individual fields defined in the
form bean can be referenced. Values are read-write.</td>
+ <td>
+ <code>actionForm</code>
+ </td>
+ <td>The current form bean (the form
bean named in the
+ current
<code><netui:form></code> tag)</td>
+ <td>Individual fields defined in the
form bean can be
+ referenced. Values are
read-write.</td>
</tr>
<tr>
- <td><code>pageInput</code></td>
- <td>a java.util.Map on the current
Forward object</td>
+ <td>
+ <code>applicationScope</code>
+ </td>
+ <td>an attribute map on the application
object (a JSP 2.0 implicit object)</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>
+ <code>bundle</code>
+ </td>
+ <td>Properties defined in a message
resource file</td>
+ <td>On a JSP page, declare the message
resource file using
+ the
<netui-data:declareBundle> tag. <source><netui-data:declareBundle
name="myBundle" bundlePath="properties.bundle1"/></source>
+ Reference individual properties
in the file using the
+ <code>bundle</code> databinding
context. <source><netui:span
value="${bundle.myBundle.message1}"/></source></td>
+ </tr>
+ <tr>
+ <td>
+ <code>container</code>
+ </td>
+ <td>The data set referenced in the
current
+ <netui-data:dataGrid> or
<netui-data:repeater>
+ tag</td>
+ <td>In the example below, the
<code>container</code>
+ context refers to the object
named in the
+
<code><netui-data:dataGrid></code>'s
+ <code>dataSource</code>
<source><netui-data:dataGrid <strong>dataSource="pageScope.stocks"</strong>
name="portfolio">
+ <netui-data:rows>
+ <netui-data:spanCell
value="${<strong>container.item.symbol</strong>}"/>
+ <netui-data:spanCell
value="${<strong>container.item.price</strong>}"/>
+ </netui-data:rows>
+</netui-data:dataGrid></source> See below for detailed
+ information on
<code>container</code>'s
+ sub-contexts.</td>
+ </tr>
+ <tr>
+ <td>
+ <code>pageFlow</code>
+ </td>
+ <td>The current Controller class</td>
+ <td>Public members of the current
Controller class can be referenced and written to.
+ Assume that the Controller
class contains the following public member String.
+ <source>public String someText
= "This is some text"</source>
+ Then that member can be
referenced from any JSP page in the page flow.
+ <source><netui:span
value="${pageFlow.someText}"/></source></td>
+ </tr>
+ <tr>
+ <td>
+ <code>pageInput</code>
+ </td>
+ <td>an attribute map on the current
Forward object</td>
<td>Page input data can be added to the
Forward object
using the
<code>addActionOutput(String, Object)
method.</code>. <source>Forward
forward = new Forward("success");
@@ -32,29 +99,110 @@
databinding context.
<source><netui:span value="${pageInput.name}"/></source></td>
</tr>
<tr>
- <td><code>bundle</code></td>
- <td>Properties defined in a message
resource file</td>
- <td>On a JSP page, declare the message
resource file using the <netui-data:declareBundle> tag.
-
<source><netui-data:declareBundle name="myBundle"
bundlePath="properties.bundle1"/></source>
- Reference individual properties
in the file using the <code>bundle</code> databinding context.
- <source><netui:span
value="${bundle.myBundle.message1}"/></source></td>
+ <td>
+ <code>pageScope</code>
+ </td>
+ <td>an attribute map on the current JSP
page (a JSP 2.0 implicit object)</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>
+ <code>requestScope</code>
+ </td>
+ <td>an attribute map on the request
object (a JSP 2.0 implicit object)</td>
+ <td></td>
</tr>
<tr>
- <td><code>actionForm</code></td>
- <td>The current form bean: the form
bean named in the current <code><netui:form></code> tag</td>
- <td>Individual fields defined in the
form bean can be referenced. Values are read-write.</td>
+ <td>
+ <code>sessionScope</code>
+ </td>
+ <td>an attribute map on the session
object (a JSP 2.0 implicit object)</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>
+ <code>sharedFlow</code>
+ </td>
+ <td>Attribute map of all of the shared
flows in the web application</td>
+ <td>Provided that the shared flow is
declared in the Controller file
+ <source>@Jpf.Controller(
+ sharedFlowRefs={
+ @Jpf.SharedFlowRef(name="mySharedFlow",
type=sharedFlows.SharedFlow.class)
+ }
+)
+public class Controller extends PageFlowController
+</source>
+You can access the members of the shared flow through the
<code>sharedFlow</code> context.
+<source><netui:span
value="${sharedFlow.mySharedFlow.someProperty}"/></source></td>
+ </tr>
+ <tr>
+ <td>
+ <code>url</code>
+ </td>
+ <td>Query parameters on the current
JSP's URL.</td>
+ <td>Query parameters that are part of
the URL can be
+ referenced. Values are read
only.</td>
</tr>
</table>
- <ul>
- <li><code>pageScope</code> — a
java.util.Map of all page
- scope variables</li>
- <li><code>requestScope</code> — a
java.util.Map of all
- request scope variables</li>
- <li><code>sessionScope</code> — a
java.util.Map of all
- session scope variables</li>
- <li><code>applicationScope</code> — a
java.util.Map of
- all application scope variables</li>
- </ul>
</section>
+ <section>
+ <title>Individual Binding Contexts</title>
+ <section id="actionForm">
+ <title>
+ <code>actionForm</code>
+ </title>
+ </section>
+ <section id="application">
+ <title>
+ <code>applicationScope</code>
+ </title>
+ </section>
+ <section id="bundle">
+ <title>
+ <code>bundle</code>
+ </title>
+ </section>
+ <section id="container">
+ <title>
+ <code>container</code>
+ </title>
+ </section>
+ <section id="pageInput">
+ <title>
+ <code>pageInput</code>
+ </title>
+ </section>
+ <section id="request">
+ <title>
+ <code>requestScope</code>
+ </title>
+ </section>
+ <section id="session">
+ <title>
+ <code>sessionScope</code>
+ </title>
+ </section>
+ <section id="sharedFlow">
+ <title>
+ <code>sharedFlow</code>
+ </title>
+ <p>SharedFlow properties can be accessed from a
JSP using the scope sharedFlow, for example,</p>
+
+ <source>dataSource="sharedFlow.specificSharedFlow.someProperty"</source>
+
+<p>Actions declared in a SharedFlow are accessed by specifying a fully
qualified action</p>
+
+ <source>action="specificSharedFlow.someAction"</source>
+
+ <p>where specificSharedFlow was the name given to the sharedFlow in
the JPF annotation</p>
+ </section>
+ <section id="url">
+ <title>
+ <code>url</code>
+ </title>
+ </section>
+ </section>
+ <section id="related"><title>Related Topics</title>
+ <p>For more information on the JSP 2.0 Expression
Language, see <a href="http://www.onjava.com/pub/a/onjava/2003/11/05/jsp.html";
class="fork">JSP 2.0: The New Deal, Part 1</a></p></section>
</body>
</document>
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=158679&r2=158680
==============================================================================
---
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 22 13:41:04 2005
@@ -39,17 +39,26 @@
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
+ <p>Edit the <code>beehive.home</code> property
so that it points to the
+ top-level folder of your beehive
installation.
+ </p>
+ <p>Edit the <code>context.path</code> property
to some value that is appropriate to your
+ web application.</p>
+ <p> 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>
+ <p><strong>Note:</strong> the value of
<code><SomeContext></code> will determine the
+ app's URL address.</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>
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+
+context.path=<strong><SomeContext></strong></source>
</section>
- <section id="copy_runtime">
+ <!--
+ <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>
@@ -63,20 +72,30 @@
<strong>Copy and Paste version:</strong>
ant -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
deploy-beehive</source>
</section>
+ -->
<section id="build"><title>Build the Template Web
App</title>
- <p>To build the web app, run the following Ant
command.</p>
+ <p>To build the web app, run the following Ant
command. This Ant command will delete
+ any build artifacts in the
<code>classes</code> directory, compile the web application
+ source, and archive the result as a WAR
file. The WAR file will be saved at
+
<code>C:/myDevelopmentmentDirectory/</code>. The name of the WAR file will
+ be
<code><SomeContext>.war</code>.</p>
<source>ant
-f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
+ clean
build
+ war
<strong>Copy and Paste version:</strong>
-ant -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml
build</source>
+ant -f C:\myDevelopmentDirectory\myWebApplication\WEB-INF\src\build.xml clean
build war</source>
</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>
- <p>To deploy the web application, visit the following URL in a web
browser. (We recommend that you open the
+ <p>To deploy the web application copy the applcation WAR file to
Tomcat's <code>webapps</code> dir.</p>
+ <source>copy C:\webDevelopementDirectory\<SomeContext>.war
%CATALINA_HOME%\webapps</source>
+
+ <!--<p>, 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><SomeContext></strong> with some
string that is appropriate for your
@@ -89,6 +108,7 @@
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 app by pointing
your browser at
the following link.</p>
<ul>
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=158679&r2=158680
==============================================================================
---
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 22 13:41:04 2005
@@ -43,14 +43,19 @@
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
+ <p>Edit the <code>beehive.home</code> property
points to the
+ top-level folder of your beehive
installation.</p>
+ <p>Edit the <code>context.path</code> property
so it has the value <code>pageflow_tutorial</code>.
+ (See the example below.)</p>
+ <p>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>
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+
+context.path=<strong>pageflow_tutorial</strong></source>
</section>
<section id="start_tomcat">
<title>To Start the Tomcat Server</title>
@@ -106,7 +111,7 @@
error.jsp
index.jsp</source>
</section>
- <section id="copy_JARs">
+<!-- <section id="copy_JARs">
<title>To Copy Runtime JARs to the Project Folder</title>
<p>In this step you will assemble the runtime resources for
your Page Flow application.
The runtime JARs include the Page Flow
runtime, the <netui> tag library, etc.
@@ -126,7 +131,7 @@
WEB-INF
lib
[many JAR files]</source>
- </section>
+ </section>-->
<section id="examine">
<title>To Examine the <code>Controller.jpf</code> and
<code>index.jsp</code> Files</title>
<p>There are no edits to make in this step. The point of this
step is
@@ -196,11 +201,15 @@
<p>At the command prompt, enter:</p>
<source>ant
-f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
+ clean
build
+ war
<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. We
recommend that you open the
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml clean build
war</source>
+<p>To deploy the application, copy the WAR file into Tomcat's
<code>webapps</code> directory.</p>
+<source>copy C:\beehive_projects\pageflow_tutorial.war
%CATALINA_HOME%\webapps</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">
@@ -210,7 +219,14 @@
<p>(For an explanation of this method of deploying an application to
Tomcat,
see the Tomcat 5 documentation:
<a class="fork"
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
A New Application from a Local Path</a>)</p>
- </section>
+ <p>And alternative build/deploy cycle is shown below.</p>
+ <p>cd to the directory
<code>C:/beehive_projects/pageflow_tutorial/WEB-INF/src</code></p>
+ <p>To build an application WAR file, run the following Ant command.</p>
+ <source>ant build war -DcontextPath=pageflow_tutorial</source>
+ <p>To deploy the WAR file to Tomcat, move it into Tomcat's
<code>webapps</code> directory.</p>
+ <source>copy ..\..\..\pageflow_tutorial.war
%CATALINA_HOME%\webapps</source>
+-->
+ </section>
<section id="test_2">
<title>To Test the Page Flow Web Application</title>
<p>Visit the following address:</p>
@@ -295,22 +311,43 @@
<p>Save <code>Controller.jpf</code>.</p>
</section>
<section id="compile_3">
- <title>To Compile and Redeploy the Page Flow</title>
+ <title>To Compile and Deploy the Page Flow</title>
+ <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 C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml
+ clean
build
+ war
<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>
+ant -f C:\beehive_projects\pageflow_tutorial\WEB-INF\src\build.xml clean build
war</source>
+<p>To deploy the application, copy the WAR file into Tomcat's
<code>webapps</code> directory.</p>
+<source>copy C:\beehive_projects\pageflow_tutorial.war
%CATALINA_HOME%\webapps</source>
+<p>If you are asked to overwrite the old WAR file, enter 'Yes'.</p>
+<p>Wait a few seconds for Tomcat to redeploy the WAR file, then move on to the
next step.</p>
+ <!-- <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&war=file:C:/beehive_projects/pageflow_tutorial&update=true";>http://localhost:8080/manager/deploy?path=/pageflow_tutorial&war=file:C:/beehive_projects/control_tutorial&update=true</a>
- </p></section>
+ <a class="fork"
href="http://localhost:8080/manager/deploy?path=/pageflow_tutorial&war=file:C:/beehive_projects/pageflow_tutorial&update=true";>http://localhost:8080/manager/deploy?path=/pageflow_tutorial&war=file:C:/beehive_projects/pageflow_tutorial&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,
+ see the Tomcat 5 documentation:
+ <a class="fork"
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
A New Application from a Local Path</a>)</p>
+ <p>And alternative build/deploy cycle is shown below.</p>
+ <p>cd to the directory
<code>C:/beehive_projects/pageflow_tutorial/WEB-INF/src</code></p>
+ <p>To build an application WAR file, run the following Ant command.</p>
+ <source>ant build war -DcontextPath=pageflow_tutorial</source>
+ <p>To deploy the WAR file to Tomcat, move it into Tomcat's
<code>webapps</code> directory.</p>
+ <source>copy ..\..\..\pageflow_tutorial.war
%CATALINA_HOME%\webapps</source>
+-->
+ </section>
<section id="test_3">
<title>To Test the Page Flow Web Application</title>
- <p>Visit the following link:
+
+ <p>Visit the following link:
</p>
<p><a class="fork"
href="http://localhost:8080/pageflow_tutorial";>http://localhost:8080/pageflow_tutorial</a></p>
<p>You will be directed to the index.jsp page.</p>
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=158679&r2=158680
==============================================================================
---
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 Mar 22 13:41:04 2005
@@ -3,11 +3,11 @@
"http://forrest.apache.org/dtd/document-v20.dtd";>
<document>
<header>
- <title>Beehive AddressBookWS and EmployeeWS Samples</title>
+ <title>Beehive AddressBookWSSample</title>
</header>
<body>
<section id="intro">
- <title>The AddressBookWS and EmployeeWS Samples</title>
+ <title>The AddressBookWS Sample</title>
<p>The <strong>AddressBookWS</strong> sample is an
annotation-aware
web service based on the Apache Axis sample of
the same name.
AddressBookWS is organized as an application
with POJO (Plain
@@ -16,7 +16,7 @@
provides automatic client-generation and junit
test cases for
the sample. The directory structure and Ant
build file can be
used as a template for building new standalone
web services.</p>
- <p><strong>EmployeeWS</strong> provides a web service
interface for
+ <!--<p><strong>EmployeeWS</strong> provides a web
service interface for
an Employee database. Using SOAP messages, the
web service
queries the backend database: selecting,
updating and inserting
employee data. A Beehive database control
connects the web
@@ -27,9 +27,9 @@
Note that EmployeeDBControl is a subclass of
DatabaseControl,
another Beehive sample. For more information
see <a
href="../controls/sample_controls-db.html">Database
- Control</a>. </p>
- <p>Apache Derby supplies the database implementation.
(Installing
- Derby requires a simple JAR file download,
described below.)
+ Control</a>. </p>-->
+ <p><!--Apache Derby supplies the database
implementation. (Installing
+ Derby requires a simple JAR file download,
described below.)-->
Apache Axis provides the automatic
client-generation for the
web service. Custom unit tests are provided to
exercise the
webservice methods. The unit tests create the
database table,
@@ -48,7 +48,7 @@
<li>J2SE 5</li>
<li>Ant 1.6.2</li>
<li>junit.jar (v3.8.1 or later, details
below)</li>
- <li>derby.jar (for EmployeeWS only,
details below)</li>
+ <!--<li>derby.jar (for EmployeeWS only,
details below)</li>-->
</ul>
</section>
<section id="enviro">
@@ -98,56 +98,41 @@
following directory
structure.</p>
<source>C:
beehive_projects
- AddressBookWS
- EmployeeWS</source>
+ wsm-addressbook
+ <!--EmployeeWS--></source>
</section>
- <section id="copy_runtime">
- <title>To Copy the Runtime Resources</title>
- <p>The AddressBookWS and EmployeeWS
applications are distributed without the Beehive
- runtime JAR files they need to run.
- To copy the runtime JARs into the apps,
- run the following Ant commands. </p>
-<source>ant
- -f %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
- -Dwebapp.dir=C:\beehive_projects\AddressBookWS
- 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 %BEEHIVE_HOME%\ant\webappRuntimeCore.xml
- -Dwebapp.dir=C:\beehive_projects\EmployeeWS
- 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>
+ <title>To Download Junit the JAR
File<!--and Derby JAR Files--></title>
<p>Download the junit ZIP archive from <a
href="http://prdownloads.sourceforge.net/junit/junit3.8.1.zip?download";>http://prdownloads.sourceforge.net/junit/junit3.8.1.zip?download</a>
</p>
<p>Unzip the archive, locate
<code>junit.jar</code>, and copy <code>junit.jar</code> to
<code>ANT_HOME/lib</code>.</p>
- <p> Download the derby ZIP archive from <a
+ <!--<p> Download the derby ZIP archive from <a
href="http://incubator.apache.org/derby/binaries/derby_snapshot_svnversion_46005.ZIP";>http://incubator.apache.org/derby/binaries/derby_snapshot_svnversion_46005.ZIP</a>.</p>
<p>Unzip the archive, locate
<code>derby.jar</code>, and copy <code>derby.jar</code> to
-
<code>C:/beehive_projects/EmployeeWS/WEB-INF/lib</code>.</p>
+
<code>C:/beehive_projects/EmployeeWS/WEB-INF/lib</code>.</p>-->
</section>
+<section id="edit_build_file"><title>Edit the <code>build.xml</code>
File</title>
+ <p>Open the following build file.</p>
+
<source>C:\beehive_projects\wsm-addressbook\WEB-INF\build.xml</source>
+ <p>Edit the following line</p>
+ <source> <import
file="../../../beehive-imports.xml" /></source>
+ <p>so that it points to the
+ <code>beehive-import.xml</code> file,
for example:</p>
+ <source> <import
file="C:/apache/apache-beehive-1.0/beehive-imports.xml" /></source>
+ </section>
<section id="compile">
- <title>To Compile the Apps</title>
+ <title>To Compile the App</title>
<p>To compile the AddressBookWS app, enter the following Ant
command.</p>
<source>ant
- -f %BEEHIVE_HOME%\ant\buildWebapp.xml
- -Dwebapp.dir=C:\beehive_projects\AddressBookWS
+ -f C:\beehive_projects\wsm-addressbook\WEB-INF\build.xml
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>
+ant -f C:\beehive_projects\wsm-addressbook\WEB-INF\build.xml build</source>
+<!-- <p>To compile the EmployeeWS app, enter the following Ant
command.</p>
<source>ant
-f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=C:\beehive_projects\EmployeeWS
@@ -155,14 +140,14 @@
<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=C:\beehive_projects\EmployeeWS build</source>
+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>
<p>To start Tomcat, run the following
command:</p>
<source>%CATALINA_HOME%\bin\startup.bat</source>
</section>
- <section id="deploy">
+ <section id="deploy_to_tomcat">
<title>To Deploy to Tomcat</title>
<p>To deploy the applications, click the following links. We recommend
that you open the
links in new browser windows. Each time you want to redeploy
an application,
@@ -171,78 +156,73 @@
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 class="quote">
- <a class="fork"
href="http://localhost:8080/manager/deploy?path=/AddressBookWS&war=file:C:/beehive_projects/AddressBookWS&update=true";>http://localhost:8080/manager/deploy?path=/AddressBookWS&war=file:C:/pageflow_projects/AddressBookWS&update=true</a>
+ <a class="fork"
href="http://localhost:8080/manager/deploy?path=/AddressBookWS&war=file:C:/beehive_projects/wsm-addressbook&update=true";>http://localhost:8080/manager/deploy?path=/AddressBookWS&war=file:C:/pageflow_projects/wsm-addressbook&update=true</a>
</p>
- <p class="quote">
+<!-- <p class="quote">
<a class="fork"
href="http://localhost:8080/manager/deploy?path=/EmployeeWS&war=file:C:/beehive_projects/EmployeeWS&update=true";>http://localhost:8080/manager/deploy?path=/EmployeeWS&war=file:C:/pageflow_projects/EmployeeWS&update=true</a>
- </p>
+ </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,
see the Tomcat 5 documentation:
<a class="fork"
href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/manager-howto.html#Deploy%20A%20New%20Application%20from%20a%20Local%20Path";>Deploy
A New Application from a Local Path</a>)</p>
</section>
- <section><title>To Verify the Deployments</title>
- <p>Verify that the web services are running by
pointing your
+ <section id="verify_deploy"><title>To Verify the
Deployments</title>
+ <p>Verify that the web service is running by
pointing your
browser to:</p>
<p>
<a class="fork"
href="http://localhost:8080/AddressBookWS/";>
http://localhost:8080/AddressBookWS/</a>
</p>
- <p>and</p>
+<!-- <p>and</p>
<p>
<a class="fork"
href="http://localhost:8080/EmployeeWS/";>
http://localhost:8080/EmployeeWS/</a>
- </p>
- <p>Follow the validation links (<a class="fork"
+ </p>-->
+ <p>Follow the validation link (<a class="fork"
href="http://localhost:8080/AddressBookWS/happyaxis.jsp";>http://localhost:8080/AddressBookWS/happyaxis.jsp</a>
- and <a class="fork"
+ <!--and <a class="fork"
href="http://localhost:8080/EmployeeWS/happyaxis.jsp";>http://localhost:8080/EmployeeWS/happyaxis.jsp</a>)
- to see the verification pages.</p>
+ -->
+ to see the verification page.</p>
<p>For the WSDLs visit</p>
<p>
- <a
-
href="http://localhost:8080/AddressBookWS/web/Service.jws?wsdl";>
-
-
http://localhost:8080/AddressBookWS/web/Service.jws?wsdl</a>
- </p>
- <p>
- <a
-
href="http://localhost:8080/EmployeeWS/web/Service.jws?wsdl";>
-
-
http://localhost:8080/EmployeeWS/web/Service.jws?wsdl</a>
+ <a
href="http://localhost:8080/AddressBookWS/web/Service.jws?wsdl";>http://localhost:8080/AddressBookWS/web/Service.jws?wsdl</a>
</p>
+<!-- <p>
+ <a
href="http://localhost:8080/EmployeeWS/web/Service.jws?wsdl";>http://localhost:8080/EmployeeWS/web/Service.jws?wsdl</a>
+ </p>-->
</section>
</section>
<section id="setup_clients">
<title>To Run the Web Service Clients</title>
- <p>Open the following two build files.</p>
+ <p>Open the following build file.</p>
<source>C:\beehive_projects\AddressBookWS\WEB-INF\build-client-dist.xml</source>
-
<source>C:\beehive_projects\EmployeeWS\WEB-INF\build-client-dist.xml</source>
- <p>In each file, edit the following line</p>
+
<!--<source>C:\beehive_projects\EmployeeWS\WEB-INF\build-client-dist.xml</source>-->
+ <p>Edit the following line</p>
<source> <import
file="../../../beehive-imports.xml" /></source>
<p>so that it points to the
<code>beehive-import.xml</code> file,
for example:</p>
- <source> <import
file="C:/apache/apache-beehive-incubating-svn-snapshot/beehive-imports.xml"
/></source>
- <p>To generate and run the clients run the
following build files.</p>
+ <source> <import
file="C:/apache/apache-beehive-1.0/beehive-imports.xml" /></source>
+ <p>To generate and run the client, run the
following build file.</p>
<source>ant -f
C:/beehive_projects/AddressBookWS/WEB-INF/build-client-dist.xml</source>
- <p>and</p>
-<source>ant -f
C:/beehive_projects/EmployeeWS/WEB-INF/build-client-dist.xml</source>
+<!-- <p>and</p>
+<source>ant -f
C:/beehive_projects/EmployeeWS/WEB-INF/build-client-dist.xml</source>-->
<p>Note that you do not need to run a
particular target within
- <code>client-build.xml</code>. Simply
run the Ant commands
+ <code>client-build.xml</code>. Simply
run the Ant command
shown above and the client will be
generated in
<code>WEB-INF/build/generated</code>.</p>
- <p>The clients consist of JUnit test cases that
exercise the
+ <p>The client consist of JUnit test cases that
exercise the
contract published in the WSDL. The
final result shows the
number of successfully passed JUnit
tests.</p>
<p>The code generated in
<code>/WEB-INF/build/generated/</code>
can be used as a template to write your
own client side
applications.</p>
- <p>Note that the client-build.xml scripts make
certain
- assumptions about the Tomcat deployment
context path, namely, that the apps are
+ <p>Note that the client-build.xml script makes
certain
+ assumptions about the Tomcat deployment
context path, namely, that the app is
deployed
- on the context paths
<code>AddressBookWS</code> and <code>EmployeeWS</code>.
- If the context paths differ from these
values, the URLs in
- the build-client.xml files must be
adjusted accordingly. </p>
+ on the context path
<code>AddressBookWS</code> <!--and <code>EmployeeWS</code>-->.
+ If the context path differs from these
values, the URL in
+ the build-client.xml file must be
adjusted accordingly. </p>
</section>
</section>
</body>
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml?view=diff&r1=158679&r2=158680
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml
(original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/skinconf.xml Tue Mar
22 13:41:04 2005
@@ -147,6 +147,14 @@
font-weight: bold;
font-size: 99%;
}
+<!--.ForrestTable2 { width: 90%; background-color: #7099C5; color: #ffffff;
font-size : 90%; cellpadding: 10; }
+.ForrestTable2 th a:link { color: white; }
+.ForrestTable2 th a:visited { color: #cfdced; }
+.ForrestTable2 th a:active { color: #000066; }
+.ForrestTable2 th a:hover { color: #000066; }
+.ForrestTable2 caption { text-align: left; color: black; font-weight: bold; }
+.ForrestTable2 th { text-align: center; }
+.ForrestTable2 td { background-color: #f0f0ff; color: black;}-->
</extra-css>
<colors>
<!-- These values are used for the generated CSS files. -->
Modified: incubator/beehive/trunk/docs/updating_livesite.txt
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/updating_livesite.txt?view=diff&r1=158679&r2=158680
==============================================================================
--- incubator/beehive/trunk/docs/updating_livesite.txt (original)
+++ incubator/beehive/trunk/docs/updating_livesite.txt Tue Mar 22 13:41:04 2005
@@ -61,7 +61,7 @@
This will build a ZIP file called "site.zip" and save it at
- /beehive/trunk/build/dist/archives/site.zip
+ /build/dist/archives/site.zip
Note: this ZIP file has *no* top-level directory. If you unzip it, it will
spew files all over the directory you unzip it into. For this reason, you
should
