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/05/16 20:49:20 UTC

svn commit: r170428 - in /incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs: ./ controls/ pageflow/ pageflow/config/ system-controls/ejb/ system-controls/jdbc/ system-controls/jms/ wsm/

Author: steveh
Date: Mon May 16 11:49:18 2005
New Revision: 170428

URL: http://svn.apache.org/viewcvs?rev=170428&view=rev
Log:
Fix for BEEEHIVE-700: tutorials / documentation should remove references to .jpf / .jcx / .jcs / .jpfs

Modified:
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/index.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/sample_controls-db.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/glossary.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/guide.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/index.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sharedFlow.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/tutorial_pageflow.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsControlTutorial.xml
    incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Employee.xml

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/index.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/index.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/index.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/controls/index.xml Mon May 16 11:49:18 2005
@@ -157,9 +157,9 @@
 
 <p>A special JSP tag library named netui-tags-html.tld is referenced. WebLogic Workshop provides this tag library and several others to help you develop dynamic web applications. The &lt;netui:anchor...> tag used here is simply invoking an action (toPageB) with a hyperlink. (For more information about the page flow tag library, see Designing User Interfaces in JSPs.) </p>
 
-<p>In the controller file SimpleNavigationController.jpf, the toPageB action method is defined as follows:
+<p>In the controller file SimpleNavigationController.java, the toPageB action method is defined as follows:
 
-SimpleNavigationController.jpf
+SimpleNavigationController.java
 
     import com.bea.wlw.netui.pageflow.Forward;
 	
@@ -210,9 +210,9 @@
 
 
 
-<p>Form Beans are simple Java classes with fields and setter and getter methods for accessing those fields. Form Beans classes are contained within the controller file. In most cases, Form Beans are designed to accept data submitted from JSP forms. For example, if a JSP page has input elements for name, eye_color, and height, then the Form Bean will have corresponding fields for name, eye_color, and height. The following example Form Bean can be found in the controller file SimpleSubmitController.jpf. It contains one field, name, and setter and getter methods for that field.</p>
+<p>Form Beans are simple Java classes with fields and setter and getter methods for accessing those fields. Form Beans classes are contained within the controller file. In most cases, Form Beans are designed to accept data submitted from JSP forms. For example, if a JSP page has input elements for name, eye_color, and height, then the Form Bean will have corresponding fields for name, eye_color, and height. The following example Form Bean can be found in the controller file SimpleSubmitController.java. It contains one field, name, and setter and getter methods for that field.</p>
 
-<p>SimpleSubmitController.jpf
+<p>SimpleSubmitController.java
 
     public class SimpleSubmitController extends PageFlowController
     {
@@ -293,7 +293,7 @@
 
 <p>In the following example, an action method places data on the name attribute of the request object.</p>
 
-<p>SimpleSubmitController.jpf
+<p>SimpleSubmitController.java
 
 
 @JpfAction(forwards = {

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=170428&r1=170427&r2=170428&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 Mon May 16 11:49:18 2005
@@ -100,7 +100,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>
+	<source>BEEHIVE_HOME/samples/EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.java</source>
 </section>-->
 
 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/glossary.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/glossary.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/glossary.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/glossary.xml Mon May 16 11:49:18 2005
@@ -11,11 +11,11 @@
 				<dt><strong>Control</strong></dt>
 				<dd>Controls are designed to make it easier to integrate complex resources 
 					into your Java application.  Controls consist 
-					of two JAVA files: a Control implementation file (JCS file), and a Control interface 
+					of two JAVA files: a Control implementation file, and a Control interface 
 					file.</dd>
 			</dl>
             <dl id="controller_file">
-				<dt><strong>Controller class / Controller file / JPF file</strong></dt>
+				<dt><strong>Controller class / Controller file</strong></dt>
 				<dd>The Controller class is a JAVA class that handles the data processing 
 					tasks in a <a href="#page_flow">Page Flow</a>.
 					Controller classes 
@@ -78,14 +78,6 @@
             <dl id="jws">
 				<dt><strong>JWS file</strong></dt>
 				<dd>A Java Web Service file.</dd>
-			</dl>
-            <dl id="jcs">
-				<dt><strong>JCS file</strong></dt>
-				<dd>Java Control Source file.  The JCS file forms the implementation file for 
-					a Java control
-					If a control's interface file is named HelloWorld, then the JCS 
-					implementation
-					file is named HelloWorldImpl. </dd>
 			</dl>
             <dl id="netui_tag_lib">
 				<dt><strong>&lt;netui> tag library</strong></dt>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/config/beehive-netui-config.xml Mon May 16 11:49:18 2005
@@ -1065,11 +1065,11 @@
             </action-interceptor>
         </global>
         <per-pageflow>
-            <pageflow-uri>/example/intercepted1/Controller.jpf</pageflow-uri>
-            <!-- This simple interceptor is run before any action in /example/nested/SomeNestedController.jpf.
+            <pageflow-uri>/example/intercepted1/Controller.java</pageflow-uri>
+            <!-- This simple interceptor is run before any action in /example/nested/SomeNestedController.java.
                  It "injects" a nested page flow before allowing the original action to run. -->
             <simple-action-interceptor>
-                <intercept-path>/example/nested/SomeNestedController.jpf</intercept-path>
+                <intercept-path>/example/nested/SomeNestedController.java</intercept-path>
             </simple-action-interceptor>
         </per-pageflow>
     </pageflow-action-interceptors>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/guide.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/guide.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/guide.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/guide.xml Mon May 16 11:49:18 2005
@@ -48,7 +48,7 @@
             <p>Suppose the link above is clicked.  When clicked, the following method, <code>navigate</code>, is invoked.</p>
             <p>The method below, when invoked, navigates the user to pageB.jsp.  The code within the method body is very simple: upon invocation, the method immediately returns a Forward object, with the String parameter "success".  The code <em>above</em> the method does the real work of determining the navigational target.  The code above the method consists of two metadata annotations.  "Metadata" means that the annotation configures or sets a property on some part of the Java code.  In the example below, the @Jpf.Action annotation makes the method available to invocation (by netui tags), while the @Jpf.Forward annotation configures the navigation information.  In the this case the method it configured to navigate to pageB.jsp whenever it is invoked.  </p>
             <p>
-                <strong>Controller.jpf</strong>
+                <strong>Controller.java</strong>
             </p>
             <source>
 import org.apache.beehive.netui.pageflow.Forward;
@@ -87,13 +87,13 @@
             <p>The following example is from the Petstore sample.  The <code>begin</code> method checks to see if the user is logged in or not, and navigates the user appropriately.</p>
             <p>
                 <strong>
-                    <code>beehive/trunk/samples/petstoreWeb/Controller.jpf</code>
+                    <code>beehive/trunk/samples/petstoreWeb/Controller.java</code>
                 </strong>
             </p>
             <source>
     @Jpf.Action(
         forwards = { 
-            @Jpf.Forward(name = "shop", path = "/shop/Controller.jpf"),
+            @Jpf.Forward(name = "shop", path = "/shop/Controller.java"),
             @Jpf.Forward(name = "index", path = "/index.jsp")
         }
     )
@@ -121,9 +121,9 @@
 
     
 
-Form Beans are simple Java classes with fields and setter and getter methods for accessing those fields. Form Beans classes are contained within the controller file. In most cases, Form Beans are designed to accept data submitted from JSP forms. For example, if a JSP page has input elements for name, eye_color, and height, then the Form Bean will have corresponding fields for name, eye_color, and height. The following example Form Bean can be found in the controller file SimpleSubmitController.jpf. It contains one field, name, and setter and getter methods for that field.
+Form Beans are simple Java classes with fields and setter and getter methods for accessing those fields. Form Beans classes are contained within the controller file. In most cases, Form Beans are designed to accept data submitted from JSP forms. For example, if a JSP page has input elements for name, eye_color, and height, then the Form Bean will have corresponding fields for name, eye_color, and height. The following example Form Bean can be found in the controller file SimpleSubmitController.java. It contains one field, name, and setter and getter methods for that field.
 
-    SimpleSubmitController.jpf
+    SimpleSubmitController.java
 
     public class SimpleSubmitController extends PageFlowController
     {
@@ -206,7 +206,7 @@
 
 In the following example, an action method places data on the name attribute of the request object.
 
-    SimpleSubmitController.jpf
+    SimpleSubmitController.java
 
     /**
      * @jpf:action

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?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- 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 Mon May 16 11:49:18 2005
@@ -157,9 +157,9 @@
 
 <p>A special JSP tag library named netui-tags-html.tld is referenced. WebLogic Workshop provides this tag library and several others to help you develop dynamic web applications. The &lt;netui:anchor...> tag used here is simply invoking an action (toPageB) with a hyperlink. (For more information about the page flow tag library, see Designing User Interfaces in JSPs.) </p>
 
-<p>In the controller file SimpleNavigationController.jpf, the toPageB action method is defined as follows:
+<p>In the controller file SimpleNavigationController.java, the toPageB action method is defined as follows:
 
-SimpleNavigationController.jpf
+SimpleNavigationController.java
 
     import com.bea.wlw.netui.pageflow.Forward;
 	
@@ -210,9 +210,9 @@
 
 
 
-<p>Form Beans are simple Java classes with fields and setter and getter methods for accessing those fields. Form Beans classes are contained within the controller file. In most cases, Form Beans are designed to accept data submitted from JSP forms. For example, if a JSP page has input elements for name, eye_color, and height, then the Form Bean will have corresponding fields for name, eye_color, and height. The following example Form Bean can be found in the controller file SimpleSubmitController.jpf. It contains one field, name, and setter and getter methods for that field.</p>
+<p>Form Beans are simple Java classes with fields and setter and getter methods for accessing those fields. Form Beans classes are contained within the controller file. In most cases, Form Beans are designed to accept data submitted from JSP forms. For example, if a JSP page has input elements for name, eye_color, and height, then the Form Bean will have corresponding fields for name, eye_color, and height. The following example Form Bean can be found in the controller file SimpleSubmitController.java. It contains one field, name, and setter and getter methods for that field.</p>
 
-<p>SimpleSubmitController.jpf
+<p>SimpleSubmitController.java
 
     public class SimpleSubmitController extends PageFlowController
     {
@@ -293,7 +293,7 @@
 
 <p>In the following example, an action method places data on the name attribute of the request object.</p>
 
-<p>SimpleSubmitController.jpf
+<p>SimpleSubmitController.java
 
 
 @JpfAction(forwards = {

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml Mon May 16 11:49:18 2005
@@ -29,7 +29,7 @@
     <ul>
       <li><code>$WEBAPP_DIR/</code>
         <ul>
-          <li><code>Controller.jpf</code></li>
+          <li><code>Controller.java</code></li>
           <li><code>index.jsp</code></li>
           <li><code>login.jsp</code></li>
           <li><code>signup.jsp</code></li>
@@ -51,8 +51,8 @@
 
       <p>
       The top-level of the web-app, at <code>$WEBAPP_DIR</code> should contain
-      your JSP pages and a <code>Controller.jpf</code>.  When built, the
-      <code>Controller.jpf</code> will be compiled to <code>WEB-INF/classes/Controller.class</code>.
+      your JSP pages and a <code>Controller.java</code>.  When built, the
+      <code>Controller.java</code> will be compiled to <code>WEB-INF/classes/Controller.class</code>.
       </p>
 
 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_controllers.xml Mon May 16 11:49:18 2005
@@ -26,7 +26,7 @@
     <title>Starting the Controller File</title>
     <p>
     The first step to writing a controller file is to create a new basic class
-    named <code>Controller.jpf</code>.  The <code>jpf</code> extension alerts the
+    named <code>Controller.java</code>.  The <code>jpf</code> extension alerts the
     build that this class is a special JPF controller class, instead of a typical
     Java class. 
     </p>
@@ -37,10 +37,6 @@
 }</strong>
 </source>
 
-    <p>
-    Just as the <code>.jpf</code> extension denotes a special Java class, controllers
-    also must subclass <code>org.apache.beehive.netui.pageflow.PageFlowController</code>
-    </p>
 
 <source>
 <strong>import org.apache.beehive.netui.pageflow.PageFlowController;</strong>
@@ -78,7 +74,7 @@
     <title>Fleshing Out the Controller</title>
 
     <p>
-    Now that the boilerplate <code>Controller.jpf</code> is in place, we can begin
+    Now that the boilerplate <code>Controller.java</code> is in place, we can begin
     to implement the actions that determine which JSP page should actually be displayed.  
 	In the above
     model, there are 5 actions, plus one more action required by all Controller classes, the 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_datagrid.xml Mon May 16 11:49:18 2005
@@ -408,9 +408,9 @@
 					data object (i.e., an ArrayList) suitable for rendering as a data grid.</p>
 			<p><strong>Edit the Controller class</strong></p>
 				<p>Edit the 
-				file <code>gridSample/Controller.jpf</code> as 
+				file <code>gridSample/Controller.java</code> as 
 				follows.  Code to edit is shown in bold.</p>
-				<p><strong><code>gridSample/Controller.jpf</code></strong></p>
+				<p><strong><code>gridSample/Controller.java</code></strong></p>
 <source>import javax.servlet.http.HttpSession;
 
 import org.apache.beehive.netui.pageflow.Forward;
@@ -498,7 +498,7 @@
 				<p><strong>Compile the Page Flow Web App Template</strong></p>
 					<p>Before proceeding, you should compile the web app.</p>
 					  <p>The compile step is necessary
-					because you have modified the Controller.jpf file.  In the steps below,
+					because you have modified the Controller.java file.  In the steps below,
 					where you only modify the JSP page <code>index.jsp</code>, 
 					you will *not* need to recompile the app to view your changes.</p>
                 <p>To compile, edit the properties (1) <code>beehive.home</code>
@@ -895,7 +895,7 @@
     @SQL(statement="SELECT * FROM CARINVENTORY WHERE SKU = {nSKU}")
     public ResultSet getItem(int nSKU) throws SQLException;
 }</source>
-			<p><strong>Controller.jpf</strong></p>
+			<p><strong>Controller.java</strong></p>
 			<source>import java.sql.ResultSet;
 import javax.servlet.http.HttpSession;
 import org.apache.beehive.netui.pageflow.Forward;

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_overview.xml Mon May 16 11:49:18 2005
@@ -208,7 +208,7 @@
 		and runs its <code>begin</code> action. (When no other action is specified, the <code>begin</code>
 		method is run by default.) </p>
 		
-    <source>http://some.domain.com/foo/MyControllerClass.jpf </source>
+    <source>http://some.domain.com/foo/MyControllerClass.java </source>
 
     <p>Hitting the following URL creates an instance of <code>foo.MyControllerClass</code> (if it doesn't already
 		exist) and invokes the <code>someAction</code> action. Note that the controller class isn't mentioned
@@ -224,12 +224,12 @@
 		<code>&lt;welcome-file-list></code>.
 		<br/><br/>
 	    &nbsp;&nbsp;&nbsp;&nbsp;&lt;welcome-file-list>
-          <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;welcome-file>Controller.jpf&lt;/welcome-file>
+          <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;welcome-file>Controller.java&lt;/welcome-file>
           <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;welcome-file>index.jsp&lt;/welcome-file>
         <br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;/welcome-file-list> 
 		<br/><br/>
-		and (2) the Controller.jpf file resides in the folder <code>foo</code>.  If the 
-		Controller.jpf resides in the <code>WEB-INF/src/</code> directory, then it will not be instantiated
+		and (2) the Controller.java file resides in the folder <code>foo</code>.  If the 
+		Controller.java resides in the <code>WEB-INF/src/</code> directory, then it will not be instantiated
 		when the folder-path URL is called. 
 		</note>
 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/popupWindows.xml Mon May 16 11:49:18 2005
@@ -28,7 +28,7 @@
       &lt;br/>
       &lt;netui:button type="submit" value="submit"/>
     &lt;/netui:form></source>
-				<p><strong>Controller.jpf</strong></p>
+				<p><strong>Controller.java</strong></p>
 			<source>...
 				
 @Jpf.Controller(
@@ -91,7 +91,7 @@
 			<title>Submit/Display Cycle with Nested Page Flow</title>
 			<p>In this section we introduce a nested page flow to help collect data from the user.</p>
 			<p>When the user clicks the "get color" button (see the <code>index.jsp</code>
-				page below), an instance of a nested page flow is created (GetColor.jpf).
+				page below), an instance of a nested page flow is created (GetColor.java).
 				When the user submits the form within the nested page flow, the data is 'returned'
 				to populate the form within the main/nesting page flow.</p>
 				<p>The diagram below shows how the user moves into the nested page flow, and 
@@ -107,7 +107,7 @@
       <strong>&lt;netui:button type="submit" value="get color" action="getColor"/></strong>
       &lt;netui:button type="submit" value="submit"/>
     &lt;/netui:form></source>
-<p><strong>Controller.jpf</strong></p>
+<p><strong>Controller.java</strong></p>
 <source>...
 
 public class Controller 
@@ -157,7 +157,7 @@
         &lt;br/>&nbsp;
         &lt;netui:button type="submit" value="submit"/>
       &lt;/netui:form></source>
-<p><strong>getColor/GetColor.jpf</strong></p>
+<p><strong>getColor/GetColor.java</strong></p>
 <source>package getColor;
 
 import javax.servlet.http.HttpSession;

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sharedFlow.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sharedFlow.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sharedFlow.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/sharedFlow.xml Mon May 16 11:49:18 2005
@@ -162,7 +162,7 @@
 		<section id="example">
 			<title>Example Code</title>
 			<p>See the shared flow controller file in the PetStore sample, 
-				located at <code>BEEHIVE_HOME/samples/petstoreWeb/webappRoot/SharedFlow.jpfs</code></p>
+				located at <code>&lt;BeehiveRoot>/samples/petstoreWeb/webappRoot/SharedFlow.java</code></p>
 		</section>
 	</body>
 </document>

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?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- 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 Mon May 16 11:49:18 2005
@@ -53,7 +53,7 @@
     pageflow_tutorial
       resources
       WEB-INF
-      Controller.jpf
+      Controller.java
       error.jsp
       index.jsp</source>
             </section>
@@ -108,7 +108,7 @@
 			file determine all of the major features of a web application: how users navigate from page 
 			to page, how user requests are handled, and how the web application accesses back-end 
 			resources. The JSP pages determine what a visitor to the web sees in the browser.  
-			(In terms of the Model-View-Controller paradigm for web applications: the Controller.jpf 
+			(In terms of the Model-View-Controller paradigm for web applications: the Controller.java 
 			file is the Controller (naturally), and the JSP pages are the View.  This web application's 
 			Model is very simple: it consists of two fields that represent the user's age and name. 
 				<!--[tbd: more, explain]-->)
@@ -127,10 +127,10 @@
 				</p>
             </section>
             <section id="examine">
-                <title>To Examine the <code>Controller.jpf</code> and <code>index.jsp</code> Files</title>
+                <title>To Examine the <code>Controller.java</code> and <code>index.jsp</code> Files</title>
                 <p>There are no edits to make in this step.  The point of this step is 
 					to learn about the code you are about to run.</p>
-				<p>Open the file <code>C:/beehive_projects/pageflow_tutorial/Controller.jpf</code>. 
+				<p>Open the file <code>C:/beehive_projects/pageflow_tutorial/Controller.java</code>. 
 					</p>
 				<p>The Controller file is an ordinary Java class with methods and annotations.</p>
 				<p>A Page Flow controller class must extend 
@@ -157,7 +157,7 @@
 <p>But we have used the action syntax for the sake of syntactical simplicty.</p>
 				<p>The Controller class is instantiated when a user calls it via the URL:</p>
 				<source>http://localhost:8080/tutorial_pageflow/Controller.jpf</source>
-				<p><strong><code>Controller.jpf</code></strong></p>
+				<p><strong><code>Controller.java</code></strong></p>
                 <source>import javax.servlet.http.HttpSession;
 
 import org.apache.beehive.netui.pageflow.Forward;
@@ -287,10 +287,10 @@
             </section>
             <section id="add_simple_action">
                 <title>To Add a Simple Action to Handle the Link</title>
-                <p>Open the file <code>C:/beehive_projects/pageflow_tutorial/Controller.jpf</code>.</p>
-                <p>Edit <code>Controller.jpf</code> so it appears as follows.  Don't forget
+                <p>Open the file <code>C:/beehive_projects/pageflow_tutorial/Controller.java</code>.</p>
+                <p>Edit <code>Controller.java</code> so it appears as follows.  Don't forget
 					the comma after the first <code>Jpf.SimpleAction(...)</code> element!</p>
-				<p><strong><code>Controller.jpf</code></strong></p>				
+				<p><strong><code>Controller.java</code></strong></p>				
                 <source>import javax.servlet.http.HttpSession;
 
 import org.apache.beehive.netui.pageflow.Forward;
@@ -311,7 +311,7 @@
 {
     ...
 }</source>
-            <p>Save <code>Controller.jpf</code>.</p>
+            <p>Save <code>Controller.java</code>.</p>
             </section>
             <section id="compile_3">
                 <title>To Recompile and Redeploy the Page Flow</title>
@@ -397,11 +397,11 @@
             </section>
             <section id="edit_4">
                 <title>To Edit the Controller File to Handle the Submitted Data</title>
-                <p>Open the file <code>C:/beehive_projects/pageflow_tutorial/Controller.jpf</code>
+                <p>Open the file <code>C:/beehive_projects/pageflow_tutorial/Controller.java</code>
                 </p>
-                <p>Edit <code>Controller.jpf</code> so it appears as follows.  Code to add appears in bold type.</p>
+                <p>Edit <code>Controller.java</code> so it appears as follows.  Code to add appears in bold type.</p>
                 
-				<p><strong><code>Controller.jpf</code></strong></p>
+				<p><strong><code>Controller.java</code></strong></p>
 					<source>import javax.servlet.http.HttpSession;
 
 import org.apache.beehive.netui.pageflow.Forward;
@@ -451,7 +451,7 @@
     }
 }</source>
 				<!--<p>[TODO: what is this code doing?]</p>-->
-			<p>Save <code>Controller.jpf</code>.</p>
+			<p>Save <code>Controller.java</code>.</p>
             </section>
             <section id="compile_redeploy">
    <title>To Recompile and Redeploy the Page Flow</title>
@@ -501,10 +501,10 @@
             </section>            
             <section id="process_data">
                 <title>To Process the Submitted Data</title>
-                <p>Edit the <code>processData</code> method in the <code>Controller.jpf</code> file so it appears as 
+                <p>Edit the <code>processData</code> method in the <code>Controller.java</code> file so it appears as 
 					follows. Code to add appears in bold.</p>
                 
-				<p><strong><code>Controller.jpf</code></strong></p>
+				<p><strong><code>Controller.java</code></strong></p>
 					<source>    ...
 						
     @Jpf.Action(
@@ -521,7 +521,7 @@
     }
     
     ...</source>
-			<p>Save <code>Controller.jpf</code>.</p>
+			<p>Save <code>Controller.java</code>.</p>
             </section>
             <section id="compile_5">
 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/ejb/ejbControlTutorial.xml Mon May 16 11:49:18 2005
@@ -25,8 +25,6 @@
                             (org.apache.beehive.controls.api.bean.ControlExtension), so the Control Annotation 
                             Processor will know that the Java interface is a control extension.</li>
 
-                    <li>Change the file extension of the Java interface from .java to .jcx.</li>
-
                     <li>Have the Java interface also extend the EJB's home and business interfaces. The 
                             business interface may either by the EJB's local interface or the remote interface.</li>
 

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlDevGuide.xml Mon May 16 11:49:18 2005
@@ -69,7 +69,7 @@
                                     <tr><td>maxRows</td><td>int</td><td>No</td><td>Limit the maximum number of rows returned by the database.</td></tr>
                                     <tr><td>resultSetHoldabilityOverride</td><td>HoldabilityType</td><td>No</td><td>Overrides value set by ConnectionOptions holdability element for the duration of the method call.</td></tr>
                                     <tr><td>resultSetMapper</td><td>Class</td><td>No</td><td>Defines a custom ResultSetMapper for use with this method</td></tr>
-                                    <tr><td>scrollableResultSet</td><td>ScrollType enumeration</td><td>No</td><td>Enables the return of scrollable ResultSet's, default is non-scrollable. See JdbcControl.jcs for ScrollType values.</td></tr>
+                                    <tr><td>scrollableResultSet</td><td>ScrollType enumeration</td><td>No</td><td>Enables the return of scrollable ResultSet's, default is non-scrollable. See JdbcControl.java for ScrollType values.</td></tr>
                                     <tr><td>typeMappersOverride</td><td>TypeMapper[]</td><td>No</td><td>Overrides typemapper's set in the ConnectionOptions annotation.</td></tr>
                             </table>
                     </section>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jdbc/jdbcControlTutorial.xml Mon May 16 11:49:18 2005
@@ -58,7 +58,7 @@
 
             <section>
                 <title>Connecting to a Database Instance</title>
-                <p> After a .jcx file has been created, the next step is to tell the JdbcControl how to connect to a database instance.  
+                <p> The next step is to tell the JdbcControl how to connect to a database instance.  
                         This is done using class level Java annotations, there are two annotations which can be used:</p>
                 <ul>
                         <li>JdbcControl.ConnectionDriver</li>
@@ -71,8 +71,8 @@
             <section>
                 <title>Making Jdbc Calls to a Database Instance</title>
 
-                <p>Now that the jcx knows how to connect to the database instance, the next step is to create 
-                        methods in the jcx which access the database.  Let's assume we want to access a table 
+                <p>Now that the control knows how to connect to the database instance, the next step is to create 
+                        methods in the control which access the database.  Let's assume we want to access a table 
                         in the database which looks like:</p>
 
                 <source>
@@ -141,7 +141,7 @@
 }
                 </source>
 
-                <p>Note the use of the @SQL method annotation in SimpleDBControl.jcx, see the Jdbc Control Annotation Reference for 
+                <p>Note the use of the @SQL method annotation in SimpleDBControl.java, see the Jdbc Control Annotation Reference for 
                 additional information about the SQL annotation.</p>
             </section>
             <section>

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsControlTutorial.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsControlTutorial.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsControlTutorial.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/system-controls/jms/jmsControlTutorial.xml Mon May 16 11:49:18 2005
@@ -50,7 +50,7 @@
 }
             </source>
 
-            <p>Likewise, for a topic (e.g. jms.SampleTopic) the following .jcx might be appropriate:</p>
+            <p>Likewise, for a topic (e.g. jms.SampleTopic) the following file might be appropriate:</p>
 
             <source>
 @ControlExtension

Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Employee.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Employee.xml?rev=170428&r1=170427&r2=170428&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Employee.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/wsm/sample_Employee.xml Mon May 16 11:49:18 2005
@@ -15,7 +15,7 @@
 				service and the database. The web service class is located at 
 				<code>EmployeeWS/WEB-INF/src/web/Service.jws</code>. The 
 				database control is located at 
-				<code>EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.jcx</code>. 
+				<code>EmployeeWS/WEB-INF/src/org/apache/beehive/sample/EmployeeDBControl.java</code>. 
 				Note that EmployeeDBControl is a subclass of DatabaseControl, 
 				another Beehive sample. For more information see <a 
 				href="../controls/sample_controls-db.html">Database