Author: steveh
Date: Wed May 11 14:45:30 2005
New Revision: 169700
URL: http://svn.apache.org/viewcvs?rev=169700&view=rev
Log:
Fix for BEEHIVE-678: need to remove the "to.dir" support from the WSM samples
Misc. fixes to TOC.
Modified:
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/docs/index.xml
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/getting_started.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_wsmAnnoSamples.xml
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/tutorial_wsm.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
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?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
---
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
Wed May 11 14:45:30 2005
@@ -91,7 +91,7 @@
</section>
<p>The Database control is currently included in the Beehive distribution as a
sample control (\samples\controls-db). Building this control with the Ant
script provided will create a <code>dbControl.jar</code> in
\samples\controls-db\build\. You can start creating your own database control
extension by simply including this JAR file in your classpath.</p>
-<section>
+<!--<section>
<title>The EmployeeWS Sample</title>
<p>Notice that the sample <a href="site:employee">EmployeeWS</a> uses this
same technique (subclassing DatabaseControl) for database access. The
EmployeeWS sample is a database control exposed as a web service. The exposed
database control, EmployeeDBControl, is a subclass of DatabaseControl (archived
in <code>dbControl.jar</code>).</p>
<source>public interface EmployeeDBControl extends DatabaseControl
@@ -101,7 +101,7 @@
</source>
<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>
+</section>-->
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?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
---
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
Wed May 11 14:45:30 2005
@@ -253,15 +253,15 @@
<section id="compile_2">
<title>To Compile and Deploy the Control</title>
<p>You are now ready to compile the test web application and
the embedded the control.</p>
- <p>At the command prompt, change to the directory
c:\beehive_projects\control_tutorial\WEB-INF\src.</p>
<p>To build the web application, enter:</p>
<source>ant
+ -f C:\beehive_projects\control_tutorial\WEB-INF\src\build.xml
clean
build
war
<strong>Copy and Paste version:</strong>
-ant clean build war
+ant -f C:\beehive_projects\control_tutorial\WEB-INF\src\build.xml clean build
war
</source>
<p>To deploy the web application to Tomcat, copy the WAR file into Tomcat's
<code>webapps/</code> directory.</p>
<source>copy C:\beehive_projects\control_tutorial.war %CATALINA_HOME%\webapps
/Y</source>
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
---
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
(original)
+++
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/docs/index.xml
Wed May 11 14:45:30 2005
@@ -32,7 +32,7 @@
<li><a href="site:netui-samples">Page Flow Samples</a></li>
<li><a href="site:db-sample">Database Control Sample</a></li>
<li><a href="site:address">AddressBookWS Sample</a></li>
- <li><a href="site:employee">EmployeeWS Sample</a></li>
+ <!--<li><a href="site:employee">EmployeeWS Sample</a></li>-->
<li><a href="site:wsm-samples">Web Service Annotation
Samples</a></li>
</ul>
<p>The following <strong>application templates</strong> will help you
get a project started:</p>
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
---
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
(original)
+++
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml
Wed May 11 14:45:30 2005
@@ -71,7 +71,7 @@
<!--<dash label="Petstore Dashboard"
href="wsm/sample_Dashboard.html"/>-->
<db-sample label="Database Control"
href="controls/sample_controls-db.html"/>
<address label="AddressBook Web Service"
href="wsm/sample_AddressBook.html"/>
- <employee label="Employee Web Service"
href="wsm/sample_Employee.html"/>
+ <!--<employee label="Employee Web Service"
href="wsm/sample_Employee.html"/>-->
<wsm-samples label="Web Service Annotation Samples"
href="wsm/sample_wsmAnnoSamples.html"/>
<netui-blank label="Page Flow Project"
href="pageflow/sample_netui-blank.html"/>
<control-blank label="Control Project"
href="controls/sample_controls-blank.html"/>
@@ -82,19 +82,19 @@
<control label="Controls Annotations"
href="controls/annotations/control_annotations.html"/>
<control label="Controls Javadoc"
href="apidocs/classref_controls/index.html"/>
</controls>
+ <system-controls label="System Controls">
+ <sys_control_javadoc label="System Controls Javadoc"
href="apidocs/classref_systemcontrols/index.html"/>
+ <ejb_control_anno label="Ejb Control Annotations"
href="system-controls/ejb/ejb-annotations.html"/>
+ <db_control_anno label="Jdbc Control Annotations"
href="system-controls/jdbc/jdbc-annotations.html"/>
+ <jms_control_anno label="Jms Control Annotations"
href="system-controls/jms/jms-annotations.html"/>
+ <ws_control_anno label="Webservices Control Annotations"
href="system-controls/webservices/webservices-annotations.html"/>
+ </system-controls>
<netui label="Page Flows">
<netui_taglib label="<netui> Tags"
href="apidocs/taglib/index.html"/>
<netui_annotations label="@Jpf Annotations"
href="pageflow/jpf-annotations/pageflow_annotations.html"/>
<netui_config label="beehive-netui-config.xml"
href="pageflow/config/beehive-netui-config.html"/>
<netui_api label="Page Flow Javadoc"
href="apidocs/classref_pageflows/index.html"/>
</netui>
- <system-controls label="System Controls">
- <control label="System Controls Javadoc"
href="apidocs/classref_systemcontrols/index.html"/>
- <control label="Ejb Control Annotations"
href="system-controls/ejb/ejb-annotations.html"/>
- <control label="Jdbc Control Annotations"
href="system-controls/jdbc/jdbc-annotations.html"/>
- <control label="Jms Control Annotations"
href="system-controls/jms/jms-annotations.html"/>
- <control label="Webservices Control Annotations"
href="system-controls/webservices/webservices-annotations.html"/>
- </system-controls>
<ws label="Web Services">
<control label="Web Services Annotations"
href="wsm/annotations/wsm_annotations.html"/>
<ws label="Web Services Javadoc"
href="apidocs/classref_wsm/index.html"/>
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/getting_started.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/getting_started.xml?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
---
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/getting_started.xml
(original)
+++
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/getting_started.xml
Wed May 11 14:45:30 2005
@@ -17,8 +17,8 @@
<p>The following <strong>sample</strong> shows more
advanced web service features, such as web parameters
and "one way" methods.</p>
<ul><li><a href="site:address">AddressBook-Enhanced
sample</a></li></ul>
- <p>The following <strong>sample</strong> shows how to
invoke a control from within a web service: </p>
- <ul><li><a href="site:employee">Employee
sample</a></li></ul>
+ <!--<p>The following <strong>sample</strong> shows how
to invoke a control from within a web service: </p>
+ <ul><li><a href="site:employee">Employee
sample</a></li></ul>-->
</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/sample_AddressBook.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_AddressBook.xml?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
---
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
Wed May 11 14:45:30 2005
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
- "http://forrest.apache.org/dtd/document-v20.dtd";>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
<document>
<header>
<title>Beehive AddressBookWS and EnhancedAddressBookWS
Samples</title>
@@ -138,38 +137,39 @@
</section>
<section id="compile">
<title>To Compile the Apps</title>
- <p>To compile the AddressBookWS app, enter the following Ant
command.</p>
+ <p>To compile the <strong>AddressBookWS</strong> app, enter
the following Ant command.</p>
<source>ant
- -f C:\beehive_projects\wsm-addressbook\WEB-INF\build.xml
- -Dto.dir=%CATALINA_HOME%\webapps
+ -f C:\beehive_projects\wsm-addressbook\WEB-INF\src\build.xml
clean
build
deploy
<strong>Copy and paste version:</strong>
-ant -f C:\beehive_projects\wsm-addressbook\WEB-INF\build.xml
-Dto.dir=%CATALINA_HOME%\webapps clean build deploy</source>
+ant -f C:\beehive_projects\wsm-addressbook\WEB-INF\src\build.xml clean build
deploy</source>
+
+<p>The command above creates a WAR file named <code>AddressBookWS.war</code>
and saves it
+ at C:\beehive_projects.</p>
+<p>To deploy the app to Tomcat, run the following command:</p>
+
+<source>copy C:\beehive_projects\AddressBookWS.war %CATALINA_HOME%\webapps
/Y</source>
- <p>To compile the EnhancedAddressBookWS
app, enter the following Ant command.</p>
+ <p>To compile the
<strong>EnhancedAddressBookWS</strong> app, enter the following Ant
command.</p>
<source>ant
- -f C:\beehive_projects\wsm-addressbook-enhanced\WEB-INF\build.xml
- -Dto.dir=%CATALINA_HOME%\webapps
+ -f C:\beehive_projects\wsm-addressbook-enhanced\WEB-INF\src\build.xml
clean
build
deploy
<strong>Copy and paste version:</strong>
-ant -f C:\beehive_projects\wsm-addressbook-enhanced\WEB-INF\build.xml
-Dto.dir=%CATALINA_HOME%\webapps clean build deploy</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
- build
+ant -f C:\beehive_projects\wsm-addressbook-enhanced\WEB-INF\src\build.xml
clean build deploy</source>
+<p>The command above creates a WAR file named
<code>EnhancedAddressBookWS.war</code> and saves it
+ at C:\beehive_projects.</p>
+<p>To deploy the app to Tomcat, run the following command:</p>
-<strong>Copy and paste version:</strong>
+<source>copy C:\beehive_projects\EnhancedAddressBookWS.war
%CATALINA_HOME%\webapps /Y</source>
-ant -f %BEEHIVE_HOME%\ant\buildWebapp.xml
-Dwebapp.dir=C:\beehive_projects\EmployeeWS build</source>-->
</section>
<section id="verify_deploy"><title>To Verify the
Deployments</title>
<p>Verify that the web services is running by
pointing your
@@ -190,10 +190,9 @@
<title>To Run the Web Service Clients</title>
<p>To generate and run the client, run the
following build files.</p>
-<source>ant -f
C:\beehive_projects\wsm-addressbook\WEB-INF\build-client.xml</source>
-<source>ant -f
C:\beehive_projects\wsm-addressbook-enhanced\WEB-INF\build-client.xml</source>
-<!-- <p>and</p>
-<source>ant -f
C:/beehive_projects/EmployeeWS/WEB-INF/build-client-dist.xml</source>-->
+<source>ant -f
C:\beehive_projects\wsm-addressbook\WEB-INF\src\build-client.xml</source>
+<source>ant -f
C:\beehive_projects\wsm-addressbook-enhanced\WEB-INF\src\build-client.xml</source>
+
<p>Note that you do not need to run a
particular target within the build files
<code>client-build.xml</code>. Simply
run the Ant command
shown above and the clients will be
generated in
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsmAnnoSamples.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsmAnnoSamples.xml?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
---
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsmAnnoSamples.xml
(original)
+++
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_wsmAnnoSamples.xml
Wed May 11 14:45:30 2005
@@ -82,16 +82,18 @@
<title>To Compile the App</title>
<p>To compile the app, enter the following Ant command.</p>
<source>ant
- -f %BEEHIVE_HOME%\samples\wsm-sample\WEB-INF\build.xml
- -Dto.dir=%CATALINA_HOME%\webapps
+ -f C:\beehive_projects\wsm-sample\WEB-INF\src\build.xml
clean
build
deploy
<strong>Copy and paste version:</strong>
-ant -f %BEEHIVE_HOME%\samples\wsm-samples\WEB-INF\build.xml
-Dto.dir=%CATALINA_HOME%\webapps clean build deploy</source>
-
+ant -f C:\beehive_projects\wsm-samples\WEB-INF\src\build.xml clean build
deploy</source>
+ <p>The command above builds a JAR file named wsm-samplesWS.jar
and saves it in
+ the directory
<code>C:\beehive_projects</code>.</p>
+ <p>To deploy the JAR file to Tomcat server, run
the following command:</p>
+<source>copy C:\beehive_projects\wsm-samplesWS.war %CATALINA_HOME%\webapps
/Y</source>
</section>
<section id="test_the_app"><title>To Test the Samples</title>
<p>Verify that the web services is running by
pointing your
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?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
---
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
Wed May 11 14:45:30 2005
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
"http://forrest.apache.org/dtd/document-v20.dtd";>
-<!--<!DOCTYPE document SYSTEM
"C:\apache-forrest-0.5.1\context\resources\schema\dtd\document-v12.dtd">-->
<document>
<header>
<title>Beehive Web Service Tutorial</title>
@@ -56,7 +55,7 @@
<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 service application.</p>
- <p>Open the file
<code>C:/beehive_projects/ws_tutorial/WEB-INF/build.properties</code>
+ <p>Open the file
<code>C:/beehive_projects/ws_tutorial/WEB-INF/src/build.properties</code>
in a text editor.</p>
<p>Edit the <code>beehive.home</code> property
points to the
top-level folder of your beehive
installation.</p>
@@ -128,19 +127,23 @@
add an IN parameter, and explain the difference between OUT and
IN parameters, in a future step.)</p>-->
</section>
<section id="compile_2">
- <title>To Compile and Deploy the Web Service</title>
+ <title>To Compile the Web Service and Deploy it to
Tomcat</title>
<p>You are now ready to compile the web service and deploy it
to Tomcat.</p>
<p>At the command prompt, enter:</p>
<source>ant
- -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml
- -Dto.dir=%CATALINA_HOME%\webapps
+ -f C:\beehive_projects\ws_tutorial\WEB-INF\src\build.xml
clean
build
deploy
<strong>Copy and Paste version:</strong>
-ant -f C:\beehive_projects\ws_tutorial\WEB-INF\build.xml
-Dto.dir=%CATALINA_HOME%\webapps clean build deploy</source>
+ant -f C:\beehive_projects\ws_tutorial\WEB-INF\src\build.xml clean build
deploy</source>
+<note>The 'deploy' target builds a WAR file named tutorialWS.war and saves it
at C:/beehive_projects.</note>
+<p>To copy the WAR file to the Tomcat server, enter the following command:</p>
+ <source>copy C:\beehive_projects\tutorialWS.war %CATALINA_HOME%\webapps
/Y</source>
+
</section>
+
<section id="run_2">
<title>To Run the Web Service</title>
<p>Visit the index.jsp page: <a class="fork"
href="http://localhost:8080/tutorialWS/index.html";>http://localhost:8080/tutorialWS/index.html</a>.</p>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml?rev=169700&r1=169699&r2=169700&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml Wed
May 11 14:45:30 2005
@@ -63,7 +63,7 @@
<!-- ========================================= -->
<target name="deploy.war">
- <jar jarfile="$../../../${webservice.war}">
+ <jar jarfile="../../../${webservice.war}">
<fileset dir="../..">
<exclude name="${src.dir}/**" />
<exclude name="${gen.dir}/**" />
