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

svn commit: r226291 - in /webservices/wsrf/trunk/src/site/content/xdocs: getting_started.xml site.xml tutorial/index.xml tutorial/mod_home.xml tutorial/mod_resource.xml tutorial/setup.xml tutorial/test.xml tutorial/webapp.xml tutorial/wsdl2java.xml

Author: jruzzi
Date: Thu Jul 28 16:40:37 2005
New Revision: 226291

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

Modified:
    webservices/wsrf/trunk/src/site/content/xdocs/getting_started.xml
    webservices/wsrf/trunk/src/site/content/xdocs/site.xml
    webservices/wsrf/trunk/src/site/content/xdocs/tutorial/index.xml
    webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_home.xml
    webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_resource.xml
    webservices/wsrf/trunk/src/site/content/xdocs/tutorial/setup.xml
    webservices/wsrf/trunk/src/site/content/xdocs/tutorial/test.xml
    webservices/wsrf/trunk/src/site/content/xdocs/tutorial/webapp.xml
    webservices/wsrf/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml

Modified: webservices/wsrf/trunk/src/site/content/xdocs/getting_started.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/getting_started.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/getting_started.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/getting_started.xml Thu Jul 28 16:40:37 2005
@@ -8,7 +8,8 @@
 	<body>
 		<section>
 			<title>Introduction</title>
-			<p>The topics in this section detail how to install Apache WSRF and use the quick demonstration to verify the installation as well 			as exercise some of the features that are included in the release. It is suggested that you complete these sections before 
+			<p>The topics in this section detail how to install Apache WSRF and use the quick demonstration to verify the installation as well 
+			as exercise some of the features that are included in the release. It is suggested that you complete these sections before 
 			starting any development work. Once you get a good feel for the example in the demonstration, you can recreate it by 
 			completing the <a href="site:tut">tutorial</a>.</p>
 			<p>The tutorial takes a step-by-step approach to learning Apache WSRF. It highlights the most common procedures that are used 
@@ -27,7 +28,9 @@
 				<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 WSRF:</p>
 			<ol>
@@ -36,37 +39,48 @@
 				<code>INSTALL_DIR</code>.</li>
 				<li>From <code>INSTALL_DIR</code>, copy the <code>webapps/wsrf</code> directory to 
 				<code>TOMCAT_HOME/webapps</code>.</li>
-				<li>Start Tomcat.</li>
-				<li>Using a browser, go to  <a href="http://localhost:8080/wsrf">http://localhost:8080/wsrf</a>. The Apache-Axis welcome 
+				<li>Start Tomcat. If Tomcat is already started, you must restart it.</li>
+				<li>Using a browser, go to  <a href="http://localhost:8080/wsrf">http://localhost:8080/wsrf</a>. The Apache WSRF welcome 
 				page displays.</li>
-				<li>From the Apache-Axis page, click <a href="http://localhost:8080/wsrf/servlet/AxisServlet">View</a>. The list of 
-          			 deployed Web services displays. Three services are deployed: <code>filesystem</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.</li>
+				<li>Click <a href="http://localhost:8080/wsrf/services">View</a>. The list of 
+          			deployed Web services displays. Two services are deployed: <code>AdminService</code>, and
+          			<code>Version</code>. The <code>AdminService</code> and <code>Version</code> services are default Apache-Axis 
+          			services.</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 WSRF. The demo uses an 
-			example that is included in the distribution (<code>INSTALL_DIR/examples/filesystem</code>) and is also deployed in 
-			Apache-Axis. The example represents a UNIX file system resource whose management capabilities are exposed as a 
-			WSRF-compliant Web service.</p>
+			example that is included in the distribution (<code>INSTALL_DIR/examples/filesystem</code>). The example represents a UNIX file 
+			system resource whose management capabilities are exposed as a WSRF-compliant Web service.</p>
 			<note>The <a href="site:tut">tutorial</a> provides a step-by-step approach for exposing the management capabilities of the file 
 			system resource. In essence, the tutorial builds and deploys the example that is used in this demo.</note>
-			<p>Complete the following demonstration steps:</p>
+			<p>Complete the following steps:</p>
 			<ol>
-				<li>
-					<strong>Perform WSRF operations:</strong> In this step, an ANT-based SOAP client that is included in the distribution is 
-					used to send a SOAP request to the filesystem Web service. The request uses the 
-					<code>GetMultipleResourceProperties</code> operation to return a list of resource properties for the filesystem 
-					resouorce. Change directory to <code>INSTALL_DIR/examples/filesystem</code> directory and issue the 
-					following command:
+				<li>Using a text editor, open <code>INSTALL_DIR/examples/filesystem/build.properties</code>.</li>
+				<li>Change the <code>wsrf.webapp.dir</code> property and set it to the location where the Apache 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 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>Restart Tomcat if it is already started.</li>
+				<li>Using a browser, go to  <a href="http://localhost:8080/wsrf/servlet/AxisServlet">
+				http://localhost:8080/wsrf/servlet/AxisServlet</a> and verify that the filesystem service is deployed.
+				</li>
+				<li>In this step, an ANT-based SOAP client that is included in the distribution is used to send a SOAP request to the filesystem Web service. 
+				The request uses the <code>GetMultipleResourceProperties</code> operation to return a list of resource properties for the filesystem 
+				resource. From a command prompt change directories to <code>INSTALL_DIR/examples/filesystem</code> directory and run the 
+				following command:
 					<source><![CDATA[
 
 ant -f soapclient.xml -Durl=http://localhost:8080/wsrf/services/filesystem -Dxml=requests/GetMultipleResourceProperties.soap]]></source>
-					<br/>You should also try other request messages kept under the <code>requests</code> sub-directory.</li>
+					<br/>You may also try other request messages in the <code>requests</code> sub-directory.</li>
 			</ol>
 		</section>
 	</body>

Modified: webservices/wsrf/trunk/src/site/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/site.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/site.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/site.xml Thu Jul 28 16:40:37 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>
@@ -49,8 +49,8 @@
 		<resource label="Resource Class" href="resource.html"/>
 		<home label="Home Class" href="home.html"/>
 		<callback label="Callback Objects" href="callback.html"/>
-		<metadata label="Metadata Operations" href="metadata.html" />
-		<single label="Singleton Service" href="singleton.html" />
+		<metadata label="Metadata Operations" href="metadata.html"/>
+		<single label="Singleton Service" href="singleton.html"/>
 		<deploy label="Deploying" href="deploy.html"/>
 		<client label="Using the SOAP Client" href="client.html"/>
 		<validate label="Schema Validation" href="validate.html"/>

Modified: webservices/wsrf/trunk/src/site/content/xdocs/tutorial/index.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/tutorial/index.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/tutorial/index.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/tutorial/index.xml Thu Jul 28 16:40:37 2005
@@ -11,7 +11,7 @@
 			<p>This tutorial provides a step-by-step approach to using Apache WSRF to create and deploy a WSRF-compliant Web 
 			service	that represents a UNIX file system. If you want to see a completed version of the example in this tutorial, 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.</note>
+			<note>To complete the tutorial, you must first<a href="site:installation">install</a> the distribution.</note>
 			<p>The process consists of the following steps:</p>
 			<ol>
 				<li>

Modified: webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_home.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_home.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_home.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_home.xml Thu Jul 28 16:40:37 2005
@@ -9,12 +9,12 @@
 		<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[
@@ -29,10 +29,8 @@
     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"/>

Modified: webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_resource.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_resource.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_resource.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/tutorial/mod_resource.xml Thu Jul 28 16:40:37 2005
@@ -8,105 +8,117 @@
 	<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>
 		</section>
 		<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;
-
-
-	try{	
-        
+        super.init();
 
         /*
          * 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 );
 
         /*
-         * 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.
          */
-        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++ )
+        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 )
         {
-            options.addOption( (String) backendOptions.get( i ) );
+            throw new javax.xml.rpc.JAXRPCException( "There was a problem in initializing your resource properties.  Please check your init() method. Cause: " +
+                    e.getLocalizedMessage() );
         }
 
-        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/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.
+
+    }
+
+    public void mount() throws Exception
+    {
+        m_filesystem.mount();
+    }
 
-    }]]></source>
+    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/wsrf/trunk/src/site/content/xdocs/tutorial/setup.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/tutorial/setup.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/tutorial/setup.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/tutorial/setup.xml Thu Jul 28 16:40:37 2005
@@ -23,7 +23,7 @@
 				<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>
+				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/wsrf/trunk/src/site/content/xdocs/tutorial/test.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/tutorial/test.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/tutorial/test.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/tutorial/test.xml Thu Jul 28 16:40:37 2005
@@ -23,10 +23,11 @@
 				<li>Run:
       				<source><![CDATA[
  ant -f soapclient.xml -Durl=http://localhost:8080/wsrf/services/filesystem -Dxml=INSTALL_DIR/examples/filesystem/requests/QueryResourceProperties_allProps.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/wsrf/trunk/src/site/content/xdocs/tutorial/webapp.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/tutorial/webapp.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/tutorial/webapp.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/tutorial/webapp.xml Thu Jul 28 16:40:37 2005
@@ -27,11 +27,10 @@
 				<li>Save and close build.properties.</li>
 				<li>Run <code>ant compile deploy</code>. The service is compiled and deployed to the WSRF Web application.</li>
 				<li>Start Tomcat if it is not already started.</li>
-				<li>Using a browser, go to  <a href="http://localhost:8080/wsrf/servlet/AxisServlet">
-				http://localhost:8080/wsrf/servlet/AxisServlet</a> and verify that the filesystem service is deployed.
+				<li>Using a browser, go to  <a href="http://localhost:8080/wsrf/services">
+				http://localhost:8080/wsrf/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/wsrf/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml?rev=226291&r1=226290&r2=226291&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml (original)
+++ webservices/wsrf/trunk/src/site/content/xdocs/tutorial/wsdl2java.xml Thu Jul 28 16:40:37 2005
@@ -8,8 +8,8 @@
 	<body>
 		<section>
 			<title>Introduction</title>
-			<p>In this step of the tutorial, the Apache WSRF  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:
+			<p>In this step of the tutorial, the Apache WSRF 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 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>