You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-commits@ws.apache.org by jr...@apache.org on 2005/07/29 01:41:52 UTC

svn commit: r226292 - in /webservices/pubscribe/trunk/src/site/content/xdocs: ./ dev_guide/ tutorial/

Author: jruzzi
Date: Thu Jul 28 16:41:45 2005
New Revision: 226292

URL: http://svn.apache.org/viewcvs?rev=226292&view=rev
Log:
sal and ian updates

Modified:
    webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/client.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/consumer.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/home.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/producer.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/subscription.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/wsdl_tool.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/getting_started.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/index.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/site.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/index.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_home.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_resource.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/setup.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/test.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/webapp.xml
    webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/client.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/client.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/client.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/client.xml Thu Jul 28 16:41:45 2005
@@ -16,9 +16,9 @@
 			<title>SOAP Files</title>
 			<p>The client reads a <code>.soap</code> file which contains the SOAP envelope to be sent. Examples of SOAP files are located in 
 			<code>INSTALL_DIR/examples/filesystem/requests/</code>. Each file is named appropriately based on the operation it contains. Use these files as models when 
-			creating your own .soap files. Make sure you modify the WS-Addressing header for the resource id to match the entry that is in the JNDI 
-			configuration file and the resource id number for the instance you would like to invoke. This has to do with the home's implementation of <code>getInstance()</code> 
-			and allows you to decide which instances are valid for sending requests. </p>
+			creating your own .soap files. Make sure you modify the resource identifier in the WS-Addressing header to match the entry that is in the JNDI 
+			configuration file and the resource indentifier number for the instance you would like to invoke. This has to do with the home's implementation of 
+			<code>init()</code> 	and allows you to decide which instances are valid for sending requests.</p>
 		</section>
 		<section>
 			<title>Running the Client</title>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/consumer.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/consumer.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/consumer.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/consumer.xml Thu Jul 28 16:41:45 2005
@@ -23,9 +23,9 @@
 		</section>
 		<section>
 			<title>Modify the Service Class</title>
-			<p>A method for the <code>Notify</code> operation is added to the service class. The implementation of the method is dependant on whatever features you want to include for 
-			your consumer. In the consumer example, a property is used to retrieve the last notification message. In this case, the <code>notify</code> method allows a 
-			.jsp to retrieve and display the current notification message. The method is implemented as follows:</p>
+			<p>An abstract method <code>Notify</code> is generated in the abstractService class an needs to be implemented in your service class. The implementation of the method is dependant 
+			on whatever features you want to include for your consumer. In the consumer example, a property is used to retrieve the last notification message. In 
+			this case, the <code>notify</code> method allows a JSP page to retrieve and display the current notification message. The method is implemented as follows:</p>
 			<source>
 public void notify(org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotifyDocument notifyDocument)
     {
@@ -49,9 +49,10 @@
     }</source>
 		</section>
 		<section>
-			<title>Modify the resource class</title>
+			<title>Modify the Resource Class</title>
 			<p>The resource class is used to setup and initialize any resource properties. For the consumer example, a single resource property is defined and called 
-			<code>LastMessage</code>. The resource class <code>init()</code> method is modified to add this property to the <code>ResourcePropertySet</code>:
+			<code>LastMessage</code>. The resource class <code>init()</code> method is modified to add this property to the <code>ResourcePropertySet</code> This is not required but 
+			demonstrates a possible implementation.
 			</p>
 			<source>
     public void init()
@@ -78,7 +79,7 @@
 		<section>
 			<title>Modify the Home Class</title>
 			<p>The home class is used to lookup the resource instance. It can act as a factory for creating instances upon request, or build all instances. It is meant to be the entry point for 
-			locating a resource instance. For the consumer example the <code>getInstance()</code> method is modified to get an instance of the consumer resource.</p>
+			locating a resource instance. For the consumer example the <code>init()</code> method is modified to get an instance of the consumer resource.</p>
 			<source>
  private static Resource m_resource = null; 
 

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/home.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/home.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/home.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/home.xml Thu Jul 28 16:41:45 2005
@@ -11,16 +11,16 @@
 			<p>The home class is used to lookup the resource instance. It can act as a factory for creating instances upon request, or build all instances. It is meant
          		 to be the entry point for locating a resource instance.
          		</p>
-         		<note>If your service is a singleton and only requires a single resource instance, see the <a href="ext:single">Creating a Singleton Service</a> in the Apache WSRF 
+			<note>If your service is a singleton and only requires a single resource instance, see the <a href="ext:single">Creating a Singleton Service</a> in the Apache WSRF 
          		documentation.</note>
-			<p>If you use the Wsdl2Java tool, the home class is automatically generated, but will need to modified to create instances of your resource. This section will 
+			<p>If you use the Wsdl2Java tool, the home class is automatically generated but will need to modified to create instances of your resource. This section will 
          		describe how to write a home class for your resource. Initially, you should model your resource off of the included <code>FilesystemHome</code> example 
          		to ensure that you write a valid home class for your resource.</p>
 		</section>
 		<section id="class-declaration">
 			<title>Class Declaration</title>
-			<p>When declaring your home you <strong>should</strong> extend <code>AbstractResourceHome</code>.  Extending <code>AbstractResourceHome</code> 
-			will provide services for caching instances and looking them up. It will also ensure
+			<p>The generated home class extends <code>AbstractResourceHome</code>.  Extending <code>AbstractResourceHome</code> 
+			provides services for caching instances and looking them up. It also ensures
        		that the correct interfaces are implemented so that Apache WSRF can interact with your home.
      			</p>
 			<p>The <code>FileSystemHome</code> class extends <code>AbstractResourceHome</code> and implements <code>Serializable</code>:</p>
@@ -36,10 +36,8 @@
 			<source>public void init() throws Exception
     {
         super.init();
-        FilesystemResource lvol1Resource = (FilesystemResource) createInstance( LVOL1_ID );
-        add( lvol1Resource );
-        FilesystemResource lvol2Resource = (FilesystemResource) createInstance( LVOL1_ID );
-        add( lvol2Resource );
+        add( createInstance( LVOL1_ID ) );
+        add( createInstance( LVOL2_ID ) );
     }</source>
 			<note>Many of the operations in the <code>AbstractResourceHome</code> may be overridden in your Home
             		class, if you have a need to extend its functionality.</note>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/producer.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/producer.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/producer.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/producer.xml Thu Jul 28 16:41:45 2005
@@ -26,9 +26,9 @@
 			your WSDL file.
 			</p>
 			<note>The notification producer portType resource properties (Topic, FixedTopicSet, TopicExpressionDialects) are initialized by default and do not have to be initalized here.</note>
-			<p>This section discuss how to add topics to a resource class. Initially, you should model your resource off of the included FileSystemResource example to ensure 
-			that you write a valid resource class. When adding topics to the resource class, you can select to add topics for all resource properties or you can add topics for 
-			specific resource properties. Each style is discussed below.
+			<p>This section discusses how to add topics to a resource class for each resource property. Topics emit notifications if any resource property changes in any way. Initially, you 
+			should model your resource off of the included FileSystemResource example to ensure that you write a valid resource class. When adding topics to the resource class, you can 
+			select to add topics for all resource properties or you can add topics for specific resource properties. Each style is discussed below.
 			</p>
 			<note>This section does not include instructions for initializing resource properties and adding them to the <code>ResourcePropertySet</code>. See the 
 			<a href="ext:wsrfresource">Resource Class</a> documentation included with Apache WSRF.</note>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/subscription.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/subscription.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/subscription.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/subscription.xml Thu Jul 28 16:41:45 2005
@@ -21,8 +21,8 @@
 			<p>Messages to pause or resume a subscription are sent to the <code>SubscriptionManager</code> service. This service is deployed by default when you deploy the Pubscribe Web 
 			application. The <code>SubscriptionManager</code> service can also be used to send <code>Destroy</code>, <code>SetTerminationTime</code>, and 
 			<code>GetResourceProperty</code> messages. These operations are defined in the WSRF WS-ResourceLifetime and WS-ResourceProperties specifications respectively. 
-			When you send messages to the subscription manager, the SOAP header must include the EPR and the Resource Identifier for the subscription. These values 
-			are returned in the response message when you subscribe to a topic.
+			When you send messages to the subscription manager, the SOAP header must include the ResourceIdentifier obtained from the EPR of the subscription this value 
+			is returned in the response message when you subscribe to a topic.
 			</p>
 			<p>The below requests demonstrate the messages to pause, resume, and destroy a subscription and are taken from the filesystem example. In the header, notice the EPR that is entered in 
 			the <code>wsa:To</code> element and the subscription identifier that is entered in the <code>sub:ResourceIdentifier</code> element.
@@ -83,6 +83,45 @@
 
    <Body>
       <wsrlw:Destroy />
+   </Body>
+
+</Envelope>]]></source>
+			</section>
+			<section>
+				<title>Getting the Subscription Manager's WSDL</title>
+				<p>The subscription manager publishes its WSDL as metadata using Pubscribe's implementation of the WS-Metadata Exchange specification. The following examples 
+				demonstrate SOAP requests that can be used to retrieve the WSDL. For instructions on providing metadata about your service, see the 
+				<a href="ext:metadata">Adding Service Metadata</a> section of the Apache 
+				WSRF documentation. </p>
+				<source><![CDATA[
+<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/" 
+          xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"
+          xmlns:sub="http://ws.apache.org/notification/base/service/SubscriptionManager">
+
+   <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
+      <wsa:To mustUnderstand="1">http://localhost:8080/foobar</wsa:To>
+      <wsa:Action mustUnderstand="1">http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata/Request</wsa:Action> 
+      <sub:ResourceIdentifier mustUnderstand="1">52082a10-ff9f-11d9-b386-b35a385b29cd</sub:ResourceIdentifier>
+   </Header>
+
+   <Body>
+      <wsx:GetMetadata />
+   </Body>
+
+</Envelope>]]></source>
+				<source><![CDATA[
+<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/" 
+          xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex"
+          xmlns:sub="http://ws.apache.org/notification/base/service/SubscriptionManager">
+
+   <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
+      <wsa:To mustUnderstand="1">http://localhost:8080/foobar</wsa:To>
+      <wsa:Action mustUnderstand="1">http://schemas.xmlsoap.org/ws/2004/09/mex/Get/Request</wsa:Action>
+      <sub:ResourceIdentifier mustUnderstand="1">52082a10-ff9f-11d9-b386-b35a385b29cd</sub:ResourceIdentifier>      
+   </Header>
+
+   <Body>
+      <!-- no body needed.  Action defines request for wsx -->
    </Body>
 
 </Envelope>]]></source>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/wsdl_tool.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/wsdl_tool.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/wsdl_tool.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/dev_guide/wsdl_tool.xml Thu Jul 28 16:41:45 2005
@@ -15,7 +15,7 @@
 				<li>Interfaces for custom operations.</li>
 				<li>Java bindings for all Types that are defined in the WSDL. The interfaces and classes are 
 				created using the <a href="ext:xmlbeans.apache.org">XMLBeans</a> schema compiler</li>
-				<li>an Axis Web Service Deployment Descriptor (WSDD) for your service (<em>service</em>_deploy.wsdd). This file is used to deploy your service to 
+				<li>An Axis Web Service Deployment Descriptor (WSDD) for your service (<em>service</em>_deploy.wsdd). This file is used to deploy your service to 
 				Axis.</li>
 				<li>A JNDI Resource configuration file for your service (<em>service</em>_jndi-config.xml). The file is used to setup the in-memory JNDI context for
 				your generated service, resource, and home classes.</li>
@@ -32,7 +32,10 @@
 			<p>To use the target:</p>
 			<ol>
 				<li>Copy INSTALL_DIR/template/build.xml and build.properties to any directory. This directory will be referred to as <code>WORK_DIR</code>.</li>
-				<li>Modify build.properties and modify the <code>pubscribe.webapp.dir</code> property and any proxy settings if applicable.</li>
+				<li>Using a text editor, open <code>WORK_DIR/build.properties</code>.</li>
+				<li>Uncomment the <code>pubscribe.webapp.dir</code> property and set it to the location where the Pubscribe Web application is installed. If you are using 
+				Tomcat and have the <code>CATALINA_HOME</code> environment variable set, you do not need to modify this property.</li>
+				<li>Uncomment and modify the proxy settings if you require a proxy to connect to external Web sites.</li>
 				<li>Copy your WSRF/WSN WSDL to <code>WORK_DIR</code>. If your WSDL depends on a schema that is not accessible over the network, you must copy the 
 				schema to this directory as well.</li>
 				<li>From a command prompt, change directories to <code>WORK_DIR</code>.</li>
@@ -72,8 +75,8 @@
 					</tr>
 					<tr>
 						<td>classpath</td>
-						<td>The classpath to be passed to the XMLBeans schema compiler. The classpath should reference the <code>INSTALL_DIR/wsrf/webapp/lib</code> 
-						and <code>/classes</code> directories.</td>
+						<td>The classpath to be passed to the XMLBeans schema compiler. The classpath should reference all the jars in the 
+						<code>INSTALL_DIR/wsrf/webapp/lib</code> and <code>/classes</code> directories.</td>
 						<td>Yes</td>
 					</tr>
 					<tr>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/getting_started.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/getting_started.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/getting_started.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/getting_started.xml Thu Jul 28 16:41:45 2005
@@ -34,7 +34,8 @@
 				<li>install Apache Tomcat or a similar Web container. The documentation assumes Tomcat and refers to the Tomcat 
        			 home directory (e.g., <code>c:\jakarta-tomcat-4.1.30</code>)	as <code>TOMCAT_HOME</code>. In addition, it is assumed that Tomcat 
        			 is configured to listen at the default HTTP port (8080).</li>
-				<li>install Apache Ant 1.6.X and  include its <code>bin</code> directory in the <code>PATH</code> environment variable.</li>
+				<li>install Apache Ant 1.6.X and  include its <code>bin</code> directory in the <code>PATH</code> environment variable. Set an 
+				ANT_HOME environment variable to the Ant installation directory.</li>
 			</ul>
 			<p>To install Apache Pubscribe:</p>
 			<ol>
@@ -42,56 +43,72 @@
 				<li>Unzip the distribution to a location on your computer. This location is referred to as <code>INSTALL_DIR</code>.</li>
 				<li>From <code>INSTALL_DIR</code>, copy the <code>webapps/pubscribe</code> directory to <code>TOMCAT_HOME/webapps</code>.</li>
 				<li>Start Tomcat.</li>
-				<li>Using a browser, go to  <a href="http://localhost:8080/pubscribe">http://localhost:8080/pubscribe</a>. The Apache-Axis welcome page 
+				<li>Using a browser, go to  <a href="http://localhost:8080/pubscribe">http://localhost:8080/pubscribe</a>. The Apache Pubscribe welcome page 
 				displays.</li>
-				<li>From the Apache-Axis page, click <a href="http://localhost:8080/pubscribe/servlet/AxisServlet">View</a>. The list of 
-          			 deployed Web services displays. Four services are deployed: <code>filesystem</code>, <code>SubscriptionManager</code>, 
+				<li>Click <a href="http://localhost:8080/pubscribe/services">View</a>. The list of 
+          			 deployed Web services displays. Three services are deployed: <code>SubscriptionManager</code>, 
           			 <code>AdminService</code>, and <code>Version</code>. The <code>AdminService</code> and <code>Version</code> services are default 
-          			 Apache-Axis services. The <code>filesystem</code> service is a pre-deployed example and is discussed in the 
-          			 <a href="site:quick">Quick Demonstration</a> section below. The <code>SubscriptionManager</code> is used to pause, resume, destroy, or update
-          			  subscriptions.</li>
+          			 Apache-Axis services.  The <code>SubscriptionManager</code> is used to pause, resume, destroy, or update subscriptions.</li>
 				<li>Click on the respective WSDL links to view and ensure that the WSDL for the services are published.</li>
 			</ol>
 		</section>
 		<section id="qd">
 			<title>Quick Demonstration</title>
 			<p>The Quick Demonstration shows some of the features and implementation details of Apache Pubscribe. The demo uses an example that is 
-			included in the distribution and is automatically deployed in Apache-Axis. The example represents a UNIX file system resource whose 
-			management capabilities are exposed as a WSRF-compliant Web service and includes a notification producer used to subscribe to events.</p>
+			included in the distribution. The example represents a UNIX file system resource whose management capabilities are exposed as a WSRF-compliant Web service and includes a 
+			notification producer used to subscribe to events.</p>
 			<note>The <a href="site:tut">tutorial</a> provides a step-by-step approach for implementing notifications for WSRF-based resources. In essence, the 
 			tutorial builds and deploys the example that is used in this demo.</note>
-			<p>From a command prompt, change directory to <code>INSTALL_DIR/examples/filesystem</code> and issue the following commands:
+			<p>Complete the following steps:
 			</p>
 			<ol>
+				<li>Using a text editor, open <code>INSTALL_DIR/examples/filesystem/build.properties</code>.</li>
+				<li>Change the <code>pubscribe.webapp.dir</code> property and set it to the location where the Pubscribe Web application is installed. 
+				If you are using Tomcat and have <code>CATALINA_HOME</code> set, you do not need to modify this property.</li>
+				<li>Uncomment and modify the proxy settings if you require a proxy to connect to external Web sites.</li>
+				<li>Save and close build.properties.</li>
+				<li>Open a command prompt and change directories to <code>INSTALL_DIR/examples/filesystem</code>.</li>
+				<li>Run the following command:
+				<p>
+						<code>ant compile deploy</code>
+					</p>
+				</li>
+				<li>Start Tomcat. If Tomcat is already started, you must restart it.</li>
+				<li>Using a browser, go to  <a href="http://localhost:8080/pubscribe/servlet/AxisServlet">
+				http://localhost:8080/pubscribe/servlet/AxisServlet</a> and verify that the filesystem service is deployed.
+				</li>
+				<li>From a command prompt change directories to <code>INSTALL_DIR/examples/filesystem</code> directory. An ANT-based SOAP client that is included in the distribution is used
+				 to send a SOAP request to the filesystem Web service.</li>
 				<li>
 					<strong>Subscribe to a Notification Topic: </strong>
-					<br />
+					<br/>
 					<p>In this step, a request is sent to subscribe to the notification topic for the <code>MountPointDirectory</code> resource property of the UNIX file 
 					system resource. </p>
 					<source><![CDATA[
  ant -f soapclient.xml -Durl=http://localhost:8080/pubscribe/services/filesystem -Dxml=requests/Subscribe_updateMountPointProp.soap]]></source>
-				<note>To complete step 4 later in this demonstration, you must copy the <code>ResourceIdentifier</code> value that is returned in the SOAP body of  
-				the response for this request. This is the subscription's identifier. 
-				</note><br />
+					<note>To complete step 13 later in this demonstration, you must copy the <code>ResourceIdentifier</code> value that is returned in the SOAP body of  
+				the response for this request. This is the look up key for the subscription. 
+				</note>
+					<br/>
 				</li>
 				<li>
 					<strong>Cause an Event:</strong>
-					<br />
+					<br/>
 					<p>In this step, the <code>MountPointDirectory</code> resource property is changed. This will cause a notification to be published.</p>
 					<source><![CDATA[
  ant -f soapclient.xml -Durl=http://localhost:8080/pubscribe/services/filesystem -Dxml=requests/SetResourceProperties_updateMountPointProp.soap]]></source>
 				</li>
 				<li>
 					<strong>View Notification: </strong>
-					<br />
+					<br/>
 					<p>In this step, we will retrieve the notification that was published when the <code>MountPointDirectory</code> resource property was changed in 
 					the previous step.</p>
 					<source><![CDATA[
  ant -f soapclient.xml -Durl=http://localhost:8080/pubscribe/services/filesystem -Dxml=requests/GetCurrentMessage.soap]]></source>
- 				</li>
+				</li>
 				<li>
 					<strong>Destroy Subscription:</strong>
-					<br />
+					<br/>
 					<p>In this step, a request is sent to destroy the notification topic subscription. Before completing this step, open the
 					<code>requests/Destroy_Subscription.soap</code> file and update the <code>sub:ResourceIdentifier</code> element with the value that was copied 
 					in step 1. Save and close the file.</p>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/index.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/index.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/index.xml Thu Jul 28 16:41:45 2005
@@ -25,7 +25,7 @@
 				<li>A WSDL to Java generator that will generate the classes and configuration entries from a WSRF/WSN WSDL that are required to deploy it as a service to 
 				the Apache WSRF framework</li>
 				<li>Full implementations of all portTypes defined by the WS-BaseNotification specification</li>
-				<li>Performance-optimized implementations of all portTypes defined by the WS-Eventing specification</li>
+				<li>Full implementations of all portTypes defined by the WS-Eventing specification</li>
 				<li>Evaluators for all three topic expression dialects defined by the WS-Topics specification</li>
 				<li>Generic Publish/Subscribe APIs that hide the details of the underlying notification mechanism (WSN or WSE) being used</li>
 				<li>And more...</li>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/site.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/site.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/site.xml Thu Jul 28 16:41:45 2005
@@ -36,8 +36,8 @@
 		<setup label="Create Workspace" href="setup.html"/>
 		<wsdl label="Create WSDL" href="wsdl.html"/>
 		<wsdl2java label="Run wsdl2Java Tool" href="wsdl2java.html"/>
-		<modhome label="Modify the Home Class" href="mod_home.html"/>
-		<modresource label="Modify the Resource Class" href="mod_resource.html"/>
+		<modhome label="Modify Home Class" href="mod_home.html"/>
+		<modresource label="Modify Resource Class" href="mod_resource.html"/>
 		<webapp label="Deploy Service" href="webapp.html"/>
 		<test label="Test" href="test.html"/>
 	</tutorial>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/index.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/index.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/index.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/index.xml Thu Jul 28 16:41:45 2005
@@ -11,7 +11,7 @@
 			<p>This tutorial provides a step-by-step approach to using Apache Pubscribe to create and deploy a WSRF-compliant Web service that includes a notification 
 			producer for generating WSN-based 	notifications. The Web service represents a UNIX file system. If you want to see a completed version of the Web service, see 
 			the <a href="site:quick">Quick Demonstration</a>.</p>
-			<note>To complete the tutorial, you must <a href="site:installation">install</a> the distribution. In addition, If you want to create a service that acts as a notifcation 
+			<note>To complete the tutorial, you must first <a href="site:installation">install</a> the distribution. In addition, If you want to create a service that acts as a notifcation 
 			consumer, see the <a href="site:consumer">Notification Consumer</a> documentation in the Developer Guide.</note>
 			<p>The process consists of the following steps:</p>
 			<ol>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_home.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_home.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_home.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_home.xml Thu Jul 28 16:41:45 2005
@@ -9,16 +9,16 @@
 		<section>
 			<title>Introduction</title>
 			<p>In this step of the tutorial, the generated Home class (<code>FilesystemHome</code>) is modified to include an <code>init</code> method. 
-			The Home is used to lookup the resource instance. It can act as a factory for creating instances upon request, or build all instances. It is meant 
+			The Home is used to lookup a resource instance. It can act as a factory for creating instances upon request, or build all instances. It is meant 
 			to be the entry point for locating a resource instance.
 			</p>
 		</section>
 		<section>
-			<title>Modify the FileSytem Home Class</title>
+			<title>Modify the FilesytemHome Class</title>
 			<p>Open <code>WORK_DIR/generated/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemHome.java</code> and
 			replace the <code>public void init()</code> method with the following method. You will also need to copy the instance variables below.</p>
 			<source><![CDATA[
-    private static final String LVOL1_ID = "/dev/vg00/lvol1";
+   private static final String LVOL1_ID = "/dev/vg00/lvol1";
     private static final String LVOL2_ID = "/dev/vg00/lvol2";
 
     /**
@@ -29,17 +29,15 @@
     public void init() throws Exception
     {
         super.init();
-        FilesystemResource lvol1Resource = (FilesystemResource) createInstance( LVOL1_ID );
-        add( lvol1Resource );
-        FilesystemResource lvol2Resource = (FilesystemResource) createInstance( LVOL2_ID );
-        add( lvol2Resource );
+        add( createInstance( LVOL1_ID ) );
+        add( createInstance( LVOL2_ID ) );
     }]]></source>
-		<p>
-			<img src="images/back.gif" alt="go to the previous step"/>
-			<a href="site:wsdl2java">Back</a>
-			<img src="images/next.gif" alt="go to the next step"/>
-			<a href="site:modresource">Next</a>
-		</p>
+			<p>
+				<img src="images/back.gif" alt="go to the previous step"/>
+				<a href="site:wsdl2java">Back</a>
+				<img src="images/next.gif" alt="go to the next step"/>
+				<a href="site:modresource">Next</a>
+			</p>
 		</section>
 	</body>
 </document>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_resource.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_resource.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_resource.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/mod_resource.xml Thu Jul 28 16:41:45 2005
@@ -8,12 +8,12 @@
 	<body>
 		<section>
 			<title>Introduction</title>
-			<p>In this step of the tutorial, the generated Resource class (<code>FilesystemResource</code>) is modified to include an <code>init</code> 
-			method. The Resource class is the stateful instance-representation of your of your Web service.	The resource maintains the resource 
-			<code>id</code> and the <code>ResourcePropertySet</code>. The resource <code>id</code> is the unique identifier for an instance of your Web 
-			service. It allows you to have multiple resource instances, each with their own state, fronted by the same Web service. The stateful properties are 
+			<p>In this step of the tutorial, the generated Resource class (<code>FilesystemResource</code>) is modified to implement the <code>init</code> 
+			method as well as several methods for the filesystem's custom operations. The Resource class is the stateful instance-representation of your Web service. The resource 
+			maintains the resource <code>id</code> and the <code>ResourcePropertySet</code>. The resource <code>id</code> is the unique identifier for an instance of your Web 
+			service. It allows you to have multiple resource instances, each with their own states, fronted by the same Web service. The stateful properties are 
 			represented by the <code>ResourcePropertySet</code>. The <code>ResourcePropertySet</code> is the Java representation of the Resource 
-			Properties document defined in the schema section of your WSDL file.
+			Properties document defined in the types section of your WSDL file.
 			</p>
 			<p>In addition, this class is used to expose resource properties as notification topics and register the exposed topics.
 			</p>
@@ -21,119 +21,142 @@
 		<section>
 			<title>Modify the Resource Class</title>
 			<p>Open <code>WORK_DIR/generated/filesystem/src/java/org/apache/ws/resource/example/filesystem/FilesystemResource.java</code> and
-			replace the <code>public void init()</code> method with the following method:</p>
-			<source><![CDATA[    public void init()
+			replace the <code>public void init()</code> method with the following method. You will also need to copy the custom operation methods below.</p>
+			<source><![CDATA[
+public void init()
     {
 
         super.init();
 
-      /**
-       * The ResourcePropertySet which contains all the defined ResourceProperties
-       */
-      org.apache.ws.resource.properties.ResourcePropertySet resourcePropertySet = getResourcePropertySet();
-      org.apache.ws.resource.properties.ResourceProperty resourceProperty = null;
-
-
-
         /*
          * This is where you should associate the backend instance with
          * the resource instance for a given id.
          */
-        example.filesystem.backend.FileSystem m_fileSystem = new example.filesystem.backend.UnixFileSystem( m_id );
+        m_filesystem = new example.filesystem.backend.UnixFileSystem( m_id );
 
-      try{
         /*
-         * Initialize each of our properties by calling resourceProperty.add(propElem) and/or resourceProperty.setCallback(callback)...
+         * The resource property set which contains all of resource properties that were defined in the WSDL.
+         */
+        org.apache.ws.resource.properties.ResourcePropertySet resourcePropertySet = getResourcePropertySet();
+        org.apache.ws.resource.properties.ResourceProperty resourceProperty = null;
+
+        try
+        {
+            /*
+             * Initialize each of our properties by calling resourceProperty.add(propElem) and/or resourceProperty.setCallback(callback)...
+             */
+            resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.DEVICESPECIALFILE );
+            DeviceSpecialFileDocument deviceDocXBean = DeviceSpecialFileDocument.Factory.newInstance();
+            deviceDocXBean.setDeviceSpecialFile( m_filesystem.getDeviceSpecialFile() );
+            resourceProperty.add( deviceDocXBean );
+
+            resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.TYPE );
+            TypeDocument typeDocXBean = TypeDocument.Factory.newInstance();
+            typeDocXBean.setType( m_filesystem.getType() );
+            resourceProperty.add( typeDocXBean );
+
+            BackupFrequencyDocument backupDocXBean = BackupFrequencyDocument.Factory.newInstance();
+            backupDocXBean.setBackupFrequency( m_filesystem.getBackupFrequency() );
+            resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.BACKUPFREQUENCY );
+            resourceProperty.add( backupDocXBean );
+            resourceProperty.setCallback( new example.filesystem.callback.BackupFrequencyCallback( m_filesystem ) );
+
+            CommentDocument commentDocXBean = CommentDocument.Factory.newInstance();
+            commentDocXBean.setComment( m_filesystem.getComment() );
+            resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.COMMENT );
+            resourceProperty.add( commentDocXBean );
+            resourceProperty.setCallback( new example.filesystem.callback.CommentCallback( m_filesystem ) );
+
+            FsckPassNumberDocument fsckDocXBean = FsckPassNumberDocument.Factory.newInstance();
+            fsckDocXBean.setFsckPassNumber( m_filesystem.getFsckPassNumber() );
+            resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.FSCKPASSNUMBER );
+            resourceProperty.add( fsckDocXBean );
+            resourceProperty.setCallback( new example.filesystem.callback.FsckPassNumberCallback( m_filesystem ) );
+
+            MountPointDirectoryDocument mountPointDocXBean = MountPointDirectoryDocument.Factory.newInstance();
+            mountPointDocXBean.setMountPointDirectory( m_filesystem.getMountPoint() );
+            resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.MOUNTPOINTDIRECTORY );
+            resourceProperty.add( mountPointDocXBean );
+            resourceProperty.setCallback( new example.filesystem.callback.MountPointCallback( m_filesystem ) );
+
+            OptionsDocument optionsDocXBean =
+                    OptionsDocument.Factory.newInstance();
+            org.apache.ws.resource.example.filesystem.OptionsDocument.Options options =
+                    optionsDocXBean.addNewOptions();
+            java.util.List backendOptions =
+                    m_filesystem.getOptions();
+            for ( int i = 0; i < backendOptions.size(); i++ )
+            {
+                options.addOption( (String) backendOptions.get( i ) );
+            }
+
+            resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.OPTIONS );
+            resourceProperty.add( optionsDocXBean );
+            resourceProperty.setCallback( new example.filesystem.callback.OptionsCallback( m_filesystem ) );
+        }
+        catch ( Exception e )
+        {
+            throw new javax.xml.rpc.JAXRPCException(
+                    "There was a problem in initializing your resource properties.  Please check your init() method. Cause: " +
+                    e.getLocalizedMessage() );
+        }
+
+        // Resource Property {http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd}TerminationTime is implemented by the framework.
+        // Resource Property {http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd}CurrentTime is implemented by the framework.
+        // Resource Property {http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd}FixedTopicSet is implemented by the framework.
+        // Resource Property {http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd}Topic is implemented by the framework.
+        // Resource Property {http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd}TopicExpressionDialects is implemented by the framework.
+
+        /**
+         * This method enables the ResourceTermination Topic for notifications
+         * about this resource's termination.  If you would not like this
+         * behaviour either comment or remove the line of code.
          */
-        resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.DEVICESPECIALFILE );
-        DeviceSpecialFileDocument deviceDocXBean = DeviceSpecialFileDocument.Factory.newInstance();
-        deviceDocXBean.setDeviceSpecialFile( m_fileSystem.getDeviceSpecialFile() );
-        resourceProperty.add( deviceDocXBean );
-
-        resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.TYPE );
-        TypeDocument typeDocXBean = TypeDocument.Factory.newInstance();
-        typeDocXBean.setType( m_fileSystem.getType() );
-        resourceProperty.add( typeDocXBean );
-
-        BackupFrequencyDocument backupDocXBean = BackupFrequencyDocument.Factory.newInstance();
-        backupDocXBean.setBackupFrequency( m_fileSystem.getBackupFrequency() );
-        resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.BACKUPFREQUENCY );
-        resourceProperty.add( backupDocXBean );
-        resourceProperty.setCallback( new example.filesystem.callback.BackupFrequencyCallback( m_fileSystem ) );
-
-        CommentDocument commentDocXBean = CommentDocument.Factory.newInstance();
-        commentDocXBean.setComment( m_fileSystem.getComment() );
-        resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.COMMENT );
-        resourceProperty.add( commentDocXBean );
-        resourceProperty.setCallback( new example.filesystem.callback.CommentCallback( m_fileSystem ) );
-
-        FsckPassNumberDocument fsckDocXBean = FsckPassNumberDocument.Factory.newInstance();
-        fsckDocXBean.setFsckPassNumber( m_fileSystem.getFsckPassNumber() );
-        resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.FSCKPASSNUMBER );
-        resourceProperty.add( fsckDocXBean );
-        resourceProperty.setCallback( new example.filesystem.callback.FsckPassNumberCallback( m_fileSystem ) );
-
-        MountPointDirectoryDocument mountPointDocXBean = MountPointDirectoryDocument.Factory.newInstance();
-        mountPointDocXBean.setMountPointDirectory( m_fileSystem.getMountPoint() );
-        resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.MOUNTPOINTDIRECTORY );
-        resourceProperty.add( mountPointDocXBean );
-        resourceProperty.setCallback( new example.filesystem.callback.MountPointCallback( m_fileSystem ) );
-
-        OptionsDocument optionsDocXBean =
-                OptionsDocument.Factory.newInstance();
-        org.apache.ws.resource.example.filesystem.OptionsDocument.Options options =
-                optionsDocXBean.addNewOptions();
-        java.util.List backendOptions =
-                m_fileSystem.getOptions();
-        for ( int i = 0; i < backendOptions.size(); i++ )
-        {
-            options.addOption( (String) backendOptions.get( i ) );
-        }
-
-        resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.OPTIONS );
-        resourceProperty.add( optionsDocXBean );
-        resourceProperty.setCallback( new example.filesystem.callback.OptionsCallback( m_fileSystem ) );
-      }
-   catch (Exception e)
-   {
-      throw new javax.xml.rpc.JAXRPCException("There was a problem in initializing your resource properties.  Please check your init() method. Cause: " + e.getLocalizedMessage());
-   }
-      // Resource Property {http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd}TerminationTime is implemented by the framework.
-      // Resource Property {http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd}CurrentTime is implemented by the framework.
-      // Resource Property {http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd}FixedTopicSet is implemented by the framework.
-      // Resource Property {http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd}Topic is implemented by the framework.
-      // Resource Property {http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd}TopicExpressionDialects is implemented by the framework.
-         
-         
-
-   /**
-    * This method enables the ResourceTermination Topic for notifications 
-    * about this resource's termination.  If you would not like this 
-    * behaviour either comment or remove the line of code.
-    */
-   try
-   {
-   org.apache.ws.notification.topics.util.TopicUtils.addResourceTerminationTopic( getTopicSpaceSet(), this, SPEC_NAMESPACE_SET );   
-   }
-   catch (Exception e)
-   {
-   throw new javax.xml.rpc.JAXRPCException("Unable to init the ResourceTermination topic. Cause: " + e.getLocalizedMessage(), e);
-   }
-   /**
-    * This method call will make all resource properties be exposed
-    * as Topics.  If you would like to change that behaviour you can 
-    * call TopicUtils.addResourcePropertyValueChangeTopic for each
-    * Topic you'd like to expose property change notifications for.
-    */
-   try
-   {
-   org.apache.ws.notification.topics.util.TopicUtils.addResourcePropertyValueChangeTopics( getResourcePropertySet(), getTopicSpaceSet() ); 
-   }
-   catch (Exception e)
-   {
-   throw new javax.xml.rpc.JAXRPCException("Unable to init the ResourceProperty Changed topics. Cause: " + e.getLocalizedMessage(), e);
-   }
-}]]></source>
+        try
+        {
+            org.apache.ws.notification.topics.util.TopicUtils.addResourceTerminationTopic( getTopicSpaceSet(), this,
+                    SPEC_NAMESPACE_SET );
+        }
+        catch ( Exception e )
+        {
+            throw new javax.xml.rpc.JAXRPCException(
+                    "Unable to init the ResourceTermination topic. Cause: " + e.getLocalizedMessage(), e );
+        }
+
+        /**
+         * This method call will make all resource properties be exposed
+         * as Topics.  If you would like to change that behaviour you can
+         * call TopicUtils.addResourcePropertyValueChangeTopic for each
+         * Topic you'd like to expose property change notifications for.
+         */
+        try
+        {
+            org.apache.ws.notification.topics.util.TopicUtils.addResourcePropertyValueChangeTopics(
+                    getResourcePropertySet(), getTopicSpaceSet() );
+        }
+        catch ( Exception e )
+        {
+            throw new javax.xml.rpc.JAXRPCException(
+                    "Unable to init the ResourceProperty Changed topics. Cause: " + e.getLocalizedMessage(), e );
+        }
+
+    }
+
+    public void mount() throws Exception
+    {
+        m_filesystem.mount();
+    }
+
+    public void unmount() throws Exception
+    {
+        m_filesystem.unmount();
+    }
+
+    public boolean isMounted()
+    {
+        return m_filesystem.isMounted();
+    }
+]]></source>
 			<p>
 				<img src="images/back.gif" alt="go to the previous step"/>
 				<a href="site:modhome">Back</a>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/setup.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/setup.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/setup.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/setup.xml Thu Jul 28 16:41:45 2005
@@ -22,8 +22,8 @@
 				<li>Create a directory on your computer (e.g.,<code> /filesystem</code>). This directory will be referred to as <code>WORK_DIR</code>.</li>
 				<li>Copy all the files in <code>INSTALL_DIR/template</code> to <code>WORK_DIR</code>.</li>
 				<li>Using a text editor, open <code>WORK_DIR/build.properties</code>.</li>
-				<li>Uncomment the <code>wsrf.webapp.dir</code> property and set it to the location where the WSRF Web application is installed. If you are using 
-				Tomcat and have <code>CATALINA_HOME</code> set, you do not need to modify this property.</li>
+				<li>Uncomment the <code>pubscribe.webapp.dir</code> property and set it to the location where the Puscribe Web application is installed. If you are using 
+				Tomcat and have the <code>CATALINA_HOME</code> environment variable set, you do not need to modify this property.</li>
 				<li>Uncomment and modify the proxy settings if you require a proxy to connect to external Web sites.</li>
 				<li>Save and close build.properties.</li>
 			</ol>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/test.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/test.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/test.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/test.xml Thu Jul 28 16:41:45 2005
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
-
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
           "http://forrest.apache.org/dtd/document-v20.dtd">
-
 <document>
 	<header>
 		<title>Test the Service</title>
@@ -25,10 +23,11 @@
 				<li>Run:
       				<source><![CDATA[
  ant -f soapclient.xml -Durl=http://localhost:8080/pubscribe/services/filesystem -Dxml=INSTALL_DIR/examples/filesystem/requests/Subscribe_updateMountPointProp.soap]]></source>
-      				Replace <code>INSTALL_DIR</code> in the <code>xml</code> property. You should also try other request messages in the 
-      				<code>requests</code> directory.</li>
+      				Replace <code>INSTALL_DIR</code> in the <code>xml</code> property.</li>
 			</ol>
-			<p>
+			<p>You may also try other request messages in the 
+      				<code>requests</code> directory.</p>
+      			<p>
 				<img src="images/back.gif" alt="go to the previous step"/>
 				<a href="site:webapp">Back</a>
 			</p>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/webapp.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/webapp.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/webapp.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/webapp.xml Thu Jul 28 16:41:45 2005
@@ -27,11 +27,10 @@
 				<li>From a command prompt, change directories to <code>WORK_DIR/generated/filesystem</code>.</li>
 				<li>Run <code>ant compile deploy</code>. The service is compiled and deployed to the Pubscribe Web application.</li>
 				<li>Start Tomcat if it is not already started.</li>
-				<li>Using a browser, go to  <a href="http://localhost:8080/pubscribe/servlet/AxisServlet">
-				http://localhost:8080/pubscribe/servlet/AxisServlet</a> and verify that the filesystem service is deployed.
+				<li>Using a browser, go to  <a href="http://localhost:8080/pubscribe/services">
+				http://localhost:8080/pubscribe/services</a> and verify that the filesystem service is deployed.
 				</li>
 			</ol>
-			<note>Please refer to the Tomcat and Axis documentation if you do not know how to start Tomcat.</note>
 			<p>
 				<img src="images/back.gif" alt="go to the previous step"/>
 				<a href="site:modresource">Back</a>

Modified: webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml?rev=226292&r1=226291&r2=226292&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml (original)
+++ webservices/pubscribe/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml Thu Jul 28 16:41:45 2005
@@ -9,7 +9,7 @@
 		<section>
 			<title>Introduction</title>
 			<p>In this step of the tutorial, the Pubscribe Wsdl2Java tool is used to generate a set of artifacts for the filesystem example. The tool takes a WSDL 
-			as its input and outputs the following artificats:
+			as its input and outputs the following artifacts:
       			</p>
 			<ul>
 				<li>
@@ -37,7 +37,7 @@
 				</li>
 			</ol>
 			<p>The artifacts are generated and placed in <code>WORK_DIR/generated</code>. For more information about the
-			  WSDL2Java tool and the generated artificats, see <a href="site:tool">Using the WSDL2Java Tool</a> in the Developer's Guide.</p>
+			  WSDL2Java tool and the generated artifacts, see <a href="site:tool">Using the WSDL2Java Tool</a> in the Developer's Guide.</p>
 			<p>
 				<img src="images/back.gif" alt="go to the previous step"/>
 				<a href="site:wsdl">Back</a>