You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/07/21 22:15:23 UTC

svn commit: r220178 - in /incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs: release/jpetstore.xml release/pageflow/pageflow_overview.xml release/samples/index.xml release/samples/jpetstore.xml release/setup.xml site.xml

Author: ekoneil
Date: Thu Jul 21 13:15:21 2005
New Revision: 220178

URL: http://svn.apache.org/viewcvs?rev=220178&view=rev
Log:
Move the jpetstore.xml file from release/ into release/samples

BB: self
DRT: docs build pass


Added:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/jpetstore.xml
      - copied, changed from r220174, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/jpetstore.xml
Removed:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/jpetstore.xml
Modified:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/pageflow/pageflow_overview.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/index.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/setup.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/site.xml

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/pageflow/pageflow_overview.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/pageflow/pageflow_overview.xml?rev=220178&r1=220177&r2=220178&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/pageflow/pageflow_overview.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/pageflow/pageflow_overview.xml Thu Jul 21 13:15:21 2005
@@ -7,7 +7,6 @@
   <body>
   <section id="introduction">
     <title>Introduction</title>
-
     <p>
     A Java Page Flow (<strong>JPF</strong>) is a group of pages (often JavaServer Pages - <strong>JSPs</strong>)
     and an annotated Java "controller" class that defines the flow of an application.  In addition to allowing
@@ -45,7 +44,7 @@
 		<p><strong>Page Flows are Modular</strong></p>
 <p>A single web application can have multiple Page Flows within it, allowing you to break up the application 
 	into separate, self-contained chunks of functionality.  For an example, see the 
-		<a class="fork" href="../jpetstore.html">Petstore Sample</a>, which has different Page Flows 
+		<a class="fork" href="../samples/jpetstore.html">Petstore Sample</a>, which has different Page Flows 
 		for browsing the Petstore, buying products, and handling user accounts.</p>
 <p>Page Flow web applications also contain a global Page Flow, called the "shared flow", which is both 
 	a fallback handler for unhandled actions and exceptions and a place to store session state. An instance 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/index.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/index.xml?rev=220178&r1=220177&r2=220178&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/index.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/index.xml Thu Jul 21 13:15:21 2005
@@ -11,18 +11,6 @@
 		<p>
 			<strong>Samples</strong>
 		</p>
-<!--
-	
-            <jpetstore label="Petstore" href="jpetstore.html"/>
-            <netui-samples label="Page Flow Samples" href="pageflow/netui-samples.html"/>
-            <netui-jsf label="Page Flow: JSF Integration" href="pageflow/sample_jpf_jsf_integration.html"/>
-            <address-enhanced label="Web Service: AddressBookEnhanced" href="wsm/sample_AddressBookEnhanced.html"/>
-            <address-wsdl label=" Web Service: AddressBookFromWSDL" href="wsm/sample_AddressBookFromWSDL.html"/>
-            <netui-blank label="Page Flow Project" href="pageflow/sample_netui-blank.html"/>
-            <control-blank label="Control Project" href="controls/sample_controls-blank.html"/>
-            <wsm-blank label="Web Service Project" href="wsm/sample_wsm-blank.html"/>
-			<ws-control-blank label="Web Service Control Project" href="system-controls/webservices/sample-ws-control-blank.html" />
--->		
 		<ul>
 			<li>
 				<a href="site:jpetstore">Petstore</a>

Copied: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/jpetstore.xml (from r220174, incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/jpetstore.xml)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/jpetstore.xml?p2=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/jpetstore.xml&p1=incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/jpetstore.xml&r1=220174&r2=220178&rev=220178&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/jpetstore.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/samples/jpetstore.xml Thu Jul 21 13:15:21 2005
@@ -173,7 +173,7 @@
 				<title>To Set up the Environment</title>
                 <p>Before proceeding, complete all of the necessary and optional steps in the 
 					following topic: 
-					<a class="fork" href="setup.html">Beehive Installation and Setup</a></p>
+					<a class="fork" href="../setup.html">Beehive Installation and Setup</a></p>
 				<p>Open a command shell and confirm that you have set following variables:</p>
 					<ul>
 						<li><code>ANT_HOME</code></li>
@@ -294,4 +294,4 @@
 			Sun Microsystems, Inc. in the United States and other 
 			countries.<br/> &copy; 2004, Apache Software Foundation </legal>
 	</footer>
-</document>
\ No newline at end of file
+</document>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/setup.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/setup.xml?rev=220178&r1=220177&r2=220178&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/setup.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/release/setup.xml Thu Jul 21 13:15:21 2005
@@ -24,20 +24,17 @@
 			</ul>
             <p>(2) Make sure that the following environmental variables are set in your shell.</p>
 			    <ul>
-					<!--<li><code>BEEHIVE_HOME</code></li>-->
 					<li><code>ANT_HOME</code></li>
 					<li><code>JAVA_HOME</code></li>
 			    </ul>
 			<p>Typical values for these variables would be as follows.</p>
-			<source><!--BEEHIVE_HOME = C:\apache\apache-beehive-incubating-svn-snapshot
-
--->ANT_HOME = C:\apache\apache-ant-1.6.2
+<source>
+ANT_HOME = C:\apache\apache-ant-1.6.2
 
 JAVA_HOME = C:\jdk1.5.0</source>
 			<p>(3) Finally, ensure that <code>JAVA_HOME/bin</code> and <code>ANT_HOME/bin</code> are on your <code>PATH</code>.</p>
-			<p>That's it! That's all you need to begin developing Beehive 
-					applications. The remaining steps are only necessary if you 
-					intend to run the Beehive tutorials and samples.</p>				
+			<p>That's it! That's all you need to begin developing Beehive applications. The remaining steps are only
+                           necessary if you intend to run the Beehive tutorials and samples.</p>				
 		</section>
 		<section id="optional">
 			<title>Optional Installation Steps</title>
@@ -71,70 +68,57 @@
 				following tutorials introduce the basic development cycle:</p>
 			<ul>
 				<li>
-					<a href="controls/tutorial_controls.html">Controls 
-						Tutorial</a>
+					<a href="controls/tutorial_controls.html">Controls Tutorial</a>
 				</li>
 				<li>
-					<a href="pageflow/tutorial_pageflow.html">Page Flow 
-						Tutorial</a>
+					<a href="pageflow/tutorial_pageflow.html">Page Flow Tutorial</a>
 				</li>
 				<li>
-					<a href="wsm/tutorial_wsm.html">Web Service 
-						Tutorial</a>
+					<a href="wsm/tutorial_wsm.html">Web Service Tutorial</a>
 				</li>
 			</ul>
 			<p>You can also begin running the following samples:</p>
 			<ul>
 				<li>
-					<a href="jpetstore.html">Beehive Sample: Petstore</a>
+					<a href="samples/jpetstore.html">Beehive Sample: Petstore</a>
 				</li>
 				<li>
-					<a href="wsm/sample_Dashboard.html">Web Service 
-						Sample: Petstore Dashboard</a>
+					<a href="wsm/sample_Dashboard.html">Web Service Sample: Petstore Dashboard</a>
 				</li>
 				<!--<li>
-					<a href="wsm/sample_AddressBook.html">Beehive AddressBookWS 
-						and EnhancedAddressBookWS Samples</a>
+					<a href="wsm/sample_AddressBook.html">Beehive AddressBookWS and EnhancedAddressBookWS Samples</a>
 				</li>-->
 				<!--<li>
-					<a href="controls/sample_controls-db.html">Database Control 
-						Sample</a>
+					<a href="controls/sample_controls-db.html">Database Control Sample</a>
 				</li>-->
 				<li>
 					<a href="site:address-enhanced">Web Service Sample: EnhancedAddressBookWS</a>
 				</li>
 			</ul>
-			<p>The following application templates will help you get a project 
-				started:</p>
+			<p>The following application templates will help you get a project started:</p>
 			<ul>
 				<li>
-					<a href="pageflow/sample_netui-blank.html">Page Flow 
-						Project Template</a>
+					<a href="pageflow/sample_netui-blank.html">Page Flow Project Template</a>
 				</li>
 				<li>
-					<a href="controls/sample_controls-blank.html">Control 
-						Project Template</a>
+					<a href="controls/sample_controls-blank.html">Control Project Template</a>
 				</li>
 				<li>
-					<a href="wsm/sample_wsm-blank.html">Web Service Project 
-						Template</a>
+					<a href="wsm/sample_wsm-blank.html">Web Service Project Template</a>
 				</li>
 				<li>
-					<a href="site:ws-control-blank">Web Service Control	Template</a>
+					<a href="site:ws-control-blank">Web Service Control Template</a>
 				</li>
 			</ul>
 		</section>
 		<section>
 			<title>Troubleshooting</title>
 			<p>
-				<strong>I Can't Decompress the <code>.tar.gz</code> 
-					File</strong>
+				<strong>I Can't Decompress the <code>.tar.gz</code>File</strong>
 			</p>
-			<p>Note: The <code>.tar.gz</code> distribution files are created 
-				using Ant's <code>&lt;tar></code> task (<a class="fork" 
+			<p>Note: The <code>.tar.gz</code> distribution files are created using Ant's <code>&lt;tar></code> task (<a class="fork" 
 				href="http://ant.apache.org/manual/CoreTasks/tar.html">http://ant.apache.org/manual/CoreTasks/tar.html</a>). 
-				This generates <code>.tar</code> files that can only be 
-				decompressed using a compatible <code>tar</code> utility.</p>
+				This generates <code>.tar</code> files that can only be decompressed using a compatible <code>tar</code> utility.</p>
 			<p>Known compatible utilities include: </p>
 			<ul>
 				<li>GNU tar 1.14 (<a class="fork" 
@@ -146,8 +130,8 @@
 		</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/> &copy; 2004, Apache Software Foundation </legal>
-	</footer>
-</document>
\ No newline at end of file
+<legal>
+Java, J2EE, and JCP are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.<br/> &copy; 2004, Apache Software Foundation
+</legal>
+</footer>
+</document>

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=220178&r1=220177&r2=220178&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 Thu Jul 21 13:15:21 2005
@@ -66,7 +66,7 @@
           -->
         <samples label="Samples">
             <sam_index label="Samples" href="release/samples/index.html"/>
-            <jpetstore label="Petstore" href="release/jpetstore.html"/>
+            <jpetstore label="Petstore" href="release/samples/jpetstore.html"/>
             <netui-samples label="Page Flow Samples" href="release/pageflow/netui-samples.html"/>
             <netui-jsf label="Page Flow: JSF Integration" href="release/pageflow/sample_jpf_jsf_integration.html"/>
             <address-enhanced label="Web Service: AddressBook Enhanced" href="release/wsm/sample_AddressBookEnhanced.html"/>