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 sc...@apache.org on 2005/10/24 18:13:29 UTC

svn commit: r328089 [21/21] - in /webservices/wsrf/site: ./ apidocs/ apidocs/org/apache/ws/ apidocs/org/apache/ws/addressing/ apidocs/org/apache/ws/addressing/class-use/ apidocs/org/apache/ws/addressing/handler/ apidocs/org/apache/ws/addressing/handler...

Modified: webservices/wsrf/site/dev_guide/client.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/client.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/client.html (original)
+++ webservices/wsrf/site/dev_guide/client.html Mon Oct 24 09:10:05 2005
@@ -214,24 +214,25 @@
 <div class="section">
 <p>The client reads a <span class="codefrag">.soap</span> file which contains the SOAP envelope to be sent. Examples of SOAP files are located in 
 			<span class="codefrag">INSTALL_DIR/examples/filesystem/requests/</span>. 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 for the instance you would like to invoke. The id is used by the invocation framework to lookup a particular resource instance.</p>
+			creating your own .soap files. Make sure you modify the SOAP header element that represents the resource id WS-Addressing reference parameter. The name of the header element should match the entry that is in the JNDI 
+			configuration file, and the text value of the element should contain the resource id of the instance you would like to invoke. The id is used by the WSRF resource invocation framework to lookup a particular resource instance.</p>
 </div>
 		
+		
 <a name="N10029"></a><a name="Running+the+Client"></a>
 <h2 class="boxed">Running the Client</h2>
 <div class="section">
 <p>To invoke the script:</p>
 <ol>
 				
-<li>Make sure your WS Resource is deployed.</li>
+<li>Make sure your WSRF service is deployed.</li>
 				
-<li>open a command prompt and change directories to <span class="codefrag">INSTALL_DIR/template/soapclient.xml</span>.</li>
+<li>Open a command prompt and change directories to <span class="codefrag">INSTALL_DIR/template</span>.</li>
 				
 <li>Run:
       				<pre class="code">ant -f soapclient.xml sendRequest -Durl=http://localhost:8080/wsrf/services/<em>your_service</em> -Dxml=./requests/QueryResourceProperties_allProps.soap</pre>
 					
-<p>Where <em>your_service</em> represents your WS Resource endpoint name, and the script name should be the name (including the path) of your .soap file. 
+<p>Where <em>your_service</em> represents your WSRF service endpoint name. 
       				</p>
 				
 </li>

Modified: webservices/wsrf/site/dev_guide/deploy.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/deploy.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/deploy.html (original)
+++ webservices/wsrf/site/dev_guide/deploy.html Mon Oct 24 09:10:05 2005
@@ -204,29 +204,23 @@
 <a name="N1000C"></a><a name="intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
-<p>The quickest way to deploy your WS-Resource is to use the generated build script. The script compiles and delploys your WS-Resource 
-			 to the Apache WSRF Web application, which is an Apache-Axis Web application. This section describes how to use the 
-			generated build script and also how the script works so you can build your own script.</p>
+<p>The quickest way to deploy your WSRF service is to use the generated build script. The script compiles and deploys your WSRF service 
+			 to the Apache WSRF Web application, which is an extension of the Apache-Axis Web application. This section describes how to use the 
+			generated build script and also how the script works, so you can build your own script.</p>
 </div>
 		
 <a name="N10016"></a><a name="Using+the+generated+build+scripts"></a>
 <h2 class="boxed">Using the generated build scripts</h2>
 <div class="section">
 <p>The Wsdl2Java tool generates an Ant build script that is used to compile and deploy your WS-Resource. The script is located in the 
-			output directory under the subdirectory for your WS-Resource (e.g., <span class="codefrag">generated/</span>
-				<em>
-					<span class="codefrag">service_name</span>
-				</em>).</p>
+			output directory under the subdirectory for your WS-Resource (e.g., <span class="codefrag">generated/</span><em><span class="codefrag">service_name</span></em>).</p>
 <p>To compile and deploy using the Ant script</p>
 <ol>
 				
 <li>In your output directory, edit build.properties and modify the <span class="codefrag">wsrf.webapp.dir</span>. If you are using 
 				Tomcat and have <span class="codefrag">CATALINA_HOME</span> set, you do not need to modify this property.</li>
 				
-<li>From a command prompt, change directories to <span class="codefrag">generated/</span>
-					<em>
-						<span class="codefrag">service_name</span>
-					</em>
+<li>From a command prompt, change directories to <span class="codefrag">generated/</span><em><span class="codefrag">service_name</span></em>
 				
 </li>
 				
@@ -241,98 +235,67 @@
 </p>
 </div>
 		
-<a name="N10052"></a><a name="steps"></a>
+		
+<a name="N1004C"></a><a name="steps"></a>
 <h2 class="boxed">Manually Deploying your Service</h2>
 <div class="section">
-<p>In this section we will describe how to manually deploy your service.  We will describe each step in the process.</p>
+<p>In this section we will describe how to manually deploy your service. We will describe each step in the process.</p>
 <ol>
 				
 <li>
 					
 <strong>Copy your WSDL file.</strong>
 					
-<p>Your WSDL file needs to be copied to an appropriate location in the webapp.  We recommend you put it in the 
+<p>Your WSDL file needs to be copied to an appropriate location in the webapp. We recommend you put it in the 
 					<span class="codefrag">wsrf/WEB-INF/classes/wsdl</span> directory. This allows Axis to reference it from the classpath and avoids the need to 
 					hard-code a location on your file system. This location is used when registering the service in the 
 					<span class="codefrag">server-config.wsdd</span> file.
 					</p>
 				
 </li>
+
 				
 <li>
 					
 <strong>Copy your classes.</strong>
 					
-<p>You will need to copy any .class files, generated by Wsdl2Java or hand written, to the <span class="codefrag">wsrf/WEB-INF/classes/</span> 					directory so that your service can be created by Axis and Apache WSRF.</p>
+<p>You will need to copy any .class files, generated by Wsdl2Java or hand written, to the <span class="codefrag">wsrf/WEB-INF/classes/</span> 					directory so that your service classes can be found by Apache WSRF.</p>
 				
 </li>
 				
+				
 <li>
 					
-<strong>Update the jndi-config.xml file.</strong>
+<strong>Update the wsrf-config.xml file.</strong>
 					
-<p>The jndi-config.xml contains information about your service, resource, and home class.  This information is necessary for 
-					Apache WSRF to create your home and handle requests for your service.  It will setup the in-memory JNDI context for your classes. 
-					Here is the entry for the FileSystem example:</p>
-					
-<pre class="code">   &lt;service name="filesystem"&gt;
-      &lt;resource name="home" type="example.filesystem.FileSystemHome"&gt;
-         &lt;resourceParams&gt;
-            &lt;parameter&gt;
-               &lt;name&gt;baseWebappUrl&lt;/name&gt;
-               &lt;value&gt;http://$IP_ADDRESS$:8080/wsrf&lt;/value&gt;
-            &lt;/parameter&gt; 
-            &lt;parameter&gt;
-               &lt;name&gt;serviceClassName&lt;/name&gt;
-               &lt;value&gt;example.filesystem.FileSystemService&lt;/value&gt;
-            &lt;/parameter&gt;
-            &lt;parameter&gt;
-               &lt;name&gt;resourceClassName&lt;/name&gt;
-               &lt;value&gt;example.filesystem.FileSystemResource&lt;/value&gt;
-            &lt;/parameter&gt;
-            &lt;parameter&gt;
-               &lt;name&gt;wsdlTargetNamespace&lt;/name&gt;
-               &lt;value&gt;http://ws.apache.org/resource/example/filesystem&lt;/value&gt;
-            &lt;/parameter&gt;
-            &lt;parameter&gt;
-               &lt;name&gt;resourceIdentifierReferenceParameterName&lt;/name&gt;
-               &lt;value&gt;{http://ws.apache.org/resource/example/filesystem}ResourceIdentifier&lt;/value&gt;
-            &lt;/parameter&gt;
-         &lt;/resourceParams&gt;
-      &lt;/resource&gt;
-   &lt;/service&gt;</pre>
-					
-<p>The<span class="codefrag"> name</span> attribute is a unique name in the config file to denote your service in JNDI.  The resource "name" attribute is 
-					used for locating your home instance, and is named <span class="codefrag">home</span>.  Notice <span class="codefrag">serviceClassName</span> points to the 
-					clasname for the service class. The same is said for the <span class="codefrag">resourceClassName</span>.  The <span class="codefrag">wsdlTargetNamespace  
-					</span> is the target namespace from your WSDL.
+<p>The wsrf-config.xml contains configuration information for each deployed WSRF service as well as global configuration for the WSRF runtime. This information is necessary for 
+					Apache WSRF to create your home and handle requests for your service. The resource homes for each WSRF service will be bound in JNDI at <span class="codefrag">wsrf/resource/service_name</span>. 
+					Here is the configuration entry for the FileSystem example WSRF service:</p>
+					
+<pre class="code">  &lt;bean name="resource/filesystem" class="org.apache.ws.resource.example.filesystem.FilesystemHome" init-method="init"&gt;
+    &lt;property name="portComponentName"&gt;&lt;value&gt;filesystem&lt;/value&gt;&lt;/property&gt;
+    &lt;property name="serviceClass"&gt;&lt;value&gt;org.apache.ws.resource.example.filesystem.FilesystemService&lt;/value&gt;&lt;/property&gt;
+    &lt;property name="resourceClass"&gt;&lt;value&gt;org.apache.ws.resource.example.filesystem.FilesystemResource&lt;/value&gt;&lt;/property&gt;
+    &lt;property name="resourceIdentifierReferenceParameterName"&gt;&lt;value&gt;{http://ws.apache.org/resource/example/filesystem}ResourceIdentifier&lt;/value&gt;&lt;/property&gt;
+  &lt;/bean&gt;
+</pre>
+					
+<p>The <span class="codefrag">id</span> attribute of the bean element is an identifier that uniquely identifies the bean definition in the config file. 
+					It must be a valid XML ID and unique among the other bean defintions in the configuration file, but otherwise, its value is arbitrary. The <span class="codefrag">class</span> attribute specifies the full classname of the resource home class for this WSRF service. The "portComponentName" property indicates the unique deployment name for the WSRF service (i.e. the service name from Axis' server-config.wsdd or the last portion of the service's endpoint URL). The <span class="codefrag">serviceClass</span> property points to the 
+					full classname for the service class. The <span class="codefrag">resourceClassName</span> property points to the 
+					full classname for the resource class.
 					</p>
 					
-<p>The <span class="codefrag">baseWebappUrl</span> parameter is used to define the URL of your Web application. You can include a static host, or as an 
-					alternative, you can use the following markers which are replaced at runtime:
-					</p>
 					
-<ul>
-						
-<li>
-							
-<span class="codefrag">$IP_ADDRESS$</span> - An attempt is made to determine the IP address at runtime. (Do not use on multi-homed systems).</li>
-						
-<li>
-							
-<span class="codefrag">$HOST_NAME$</span> - An attempt is made to determine the host name at runtime.</li>
-					
-</ul>
-					
-<p>The <span class="codefrag">resourceIdentifierReferenceParameterName</span> parameter represents the name of the WS-Addressing-header that is used to 
+<p>The <span class="codefrag">resourceIdentifierReferenceParameterName</span> property represents the name of the WS-Addressing reference parameter SOAP header that is used to 
 					extract a unique resource identifier to lookup a specific WS-Resource instance. This value should be a QName that includes the local 
-					reference parameter name in the format <em><span class="codefrag">{namespaceURI}localPart</span></em>, where namesapaceURI and localPart are the namespace and URI and local 
-					part of the qualified name of the reference paramater that should contain the resource identifier. If you omit this entry, it is assumed that the service is a 
-					<strong><span class="codefrag">SINGLETON</span></strong> service and no resource id is expected in the 
-					WS-Addressing headers.
+					reference parameter name in the format <em><span class="codefrag">{namespaceURI}localPart</span></em>, where namespaceURI and localPart are the namespace and URI and local 
+					part of the qualified name of the reference paramater that should contain the resource identifier. If you omit this entry, it is assumed that the service exposes a 
+					<strong><span class="codefrag">SINGLETON</span></strong> WS-Resource and hence no resource id WS-Addressing reference parameter is expected in the SOAP header.
           				</p>
 				
 </li>
+
 				
 <li>
 					
@@ -344,18 +307,12 @@
 					
 </p>
 					
-<p>The file contains a deployment entry for each Web service. For example, the FileSystem service example is:
+<p>The file contains a deployment entry for each Web service. For example, the entry for the FileSystem example service is:
              				</p>
 					
-<pre class="code">    &lt;service name="filesystem" provider="java:WSRF" style="document" use="literal"&gt;
-      &lt;wsdlFile&gt;/wsdl/FileSystem.wsdl&lt;/wsdlFile&gt;      
-      &lt;requestFlow&gt;
-         &lt;handler type="java:org.apache.axis.handlers.JAXRPCHandler"&gt;
-            &lt;parameter name="className" value="org.apache.axis.message.addressing.handler.AxisServerSideAddressingHandler"/&gt;
-            &lt;parameter name="referencePropertyNames" value="*"/&gt;
-         &lt;/handler&gt;
-      &lt;/requestFlow&gt;      
-   &lt;/service&gt;</pre>
+<pre class="code">  &lt;service name="filesystem" provider="java:WSRF" style="document" use="literal"&gt;
+    &lt;wsdlFile&gt;/wsdl/FileSystem.wsdl&lt;/wsdlFile&gt;      
+  &lt;/service&gt;</pre>
 					
 <p>The service <span class="codefrag">name</span> attribute is the endpoint name and should be the same as the port's <span class="codefrag">name</span> attribute 
 					from your WSDL file. This will ensure people consuming your WSDL will be able to invoke your service.
@@ -363,12 +320,6 @@
 					
 <p>Notice the entry for <span class="codefrag">wsdlFile</span> which points to the <span class="codefrag">/wsdl/FileSystem.wsdl</span>.
              				This translates to the wsdl directory under the <span class="codefrag">WEB-INF/classes</span> directory.
-             				</p>
-					
-<p>The last part is the <span class="codefrag">requestFlow</span>. This xml fragment is necessary to ensure the
-             				requests are routed through the WS-Addressing handler. This is static and should
-             				always be present.  We did not define it globally in case there were other services
-             				defined which will not use WS-Addressing.
              				</p>
 				
 </li>

Modified: webservices/wsrf/site/dev_guide/home.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/home.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/home.html (original)
+++ webservices/wsrf/site/dev_guide/home.html Mon Oct 24 09:10:05 2005
@@ -204,14 +204,14 @@
 <a name="N1000C"></a><a name="intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
-<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
+<p>The home class is used to lookup resource instances. 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>
 <div class="frame note">
 <div class="label">Note</div>
 <div class="content">If your service is a singleton and only requires a single resource instance, see the <a href="../dev_guide/singleton.html">Creating a Singleton Service</a> section.</div>
 </div>
-<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 may be 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 <span class="codefrag">FilesystemHome</span> example 
          		to ensure that you write a valid home class for your resource.
          		</p>
@@ -231,14 +231,14 @@
 <div class="frame note">
 <div class="label">Note</div>
 <div class="content">Many of the operations in the <span class="codefrag">AbstractResourceHome</span> may be overridden in your Home
-            		class, if you have a need to modfify or extend the base class' functionality.</div>
+            		class, if you have a need to modify or extend the base  functionality.</div>
 </div>
 </div>
 		
 <a name="N10049"></a><a name="ops"></a>
 <h2 class="boxed">Operations</h2>
 <div class="section">
-<p>If you extend <span class="codefrag">AbstractResourceHome</span>, the only required operation you will need to implement is:</p>
+<p>If you extend <span class="codefrag">AbstractResourceHome</span>, the only required operation you may wish to override is:</p>
 <pre class="code">public void init()</pre>
 <p>The <span class="codefrag">init()</span> operation can be used to initialize any instances at startup. 
 			   In the FileSystem example, the <span class="codefrag">init()</span> method is used to create and add two resource instances:</p>
@@ -253,17 +253,11 @@
 				
 <li>Creates an instance of the resource.</li>
 				
-<li>Sets an endpoint reference on the resource.</li>
+<li>Sets the resource's EndpointReference.</li>
 				
 <li>Calls <span class="codefrag">init()</span> on the resource.</li>
 			
 </ul>
-<div class="frame note">
-<div class="label">Note</div>
-<div class="content">If you choose to not use the <span class="codefrag">createInstance()</span> method (e.g. if you have a non-empty constructor), then you must manually set the EPR then call 
-			the <span class="codefrag">init()</span> method on the resource. The generated home class contains a utility method from the <span class="codefrag">AbstractResourceHome</span> that can be used 
-			to build an EPR.</div>
-</div>
 </div>
 	
 </div>

Modified: webservices/wsrf/site/dev_guide/index.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/index.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/index.html (original)
+++ webservices/wsrf/site/dev_guide/index.html Mon Oct 24 09:10:05 2005
@@ -220,7 +220,7 @@
 <p>The Developer Guide provides instructions for using many of the features that are included in Apache WSRF. If you are new to this project, you should start 
 			with the <a href="../index.html">Getting Started</a> and the <a href="../tutorial/index.html">Tutorial</a> before reading this guide. They provide a good starting point for 
 			learning how to use Apache WSRF.</p>
-<p>The Developer guide often refers to different parts of the <a href="../wsrf.html">Web Services Resource Framework (WSRF) specifications</a> that are defined by 
+<p>The Developer Guide often refers to different parts of the <a href="../wsrf.html">Web Services Resource Framework (WSRF) specifications</a> that are defined by 
 			the OASIS standards body. You should become familiar with these specifications and refer to them as needed.</p>
 <p>The Developer Guide guide often refers to Apache Axis, Apache Tomcat, Apache Ant, and Apache XMLBeans. Instructions for these packages are included 
 			as required and are not meant to replace the formal documentation for these projects. Consult them as necessary.</p>
@@ -232,9 +232,10 @@
 <a name="N10033"></a><a name="WSRF+Overview"></a>
 <h2 class="boxed">WSRF Overview</h2>
 <div class="section">
-<p>Apache WSRF is an implementation of the <a href="../wsrf.html">WSRF</a> family of specifications that are defined by the OASIS standards body. Ultimately, the family 
-			of specifications define a method of exposing resources using Web services. This is typically done for management purposes. The resource can 
-			be anything from a device to application components or even current management components such as JMX MBeans.The specifications 
+<p>Apache WSRF is an implementation of the <a href="../wsrf.html">WSRF</a> family of specifications that are defined by the OASIS standards body. 
+			Ultimately, this family 
+			of specifications defines a method of exposing resources using Web services. This is typically done for management purposes. The resource can 
+			be anything from a device to an application component or even a current management component such as a JMX MBean. The specifications 
 			include:</p>
 <ul>
 				
@@ -261,7 +262,8 @@
 <a name="N10056"></a><a name="Resource+Invocation+Framework"></a>
 <h2 class="boxed">Resource Invocation Framework</h2>
 <div class="section">
-<p> The resource invocation framework is the foundation upon which Apache WSRF is implemented. The framework includes a set of core interfaces, as well as 
+<p> The resource invocation framework is the foundation upon which Apache WSRF is implemented. 
+			The framework includes a set of core interfaces, as well as 
 			runtime pieces. The framework is discussed in detail below. 
 			</p>
 <a name="N1005F"></a><a name="Core+Interfaces"></a>
@@ -330,7 +332,7 @@
 				
 <li>An integration with Apache XMLBeans for generating custom types defined in the WSDL</li>
 				
-<li>an integration with Apache Axis for automatically deploying WS Resources</li>
+<li>An integration with Apache Axis for automatically deploying WS Resources</li>
 			
 </ul>
 </div>

Modified: webservices/wsrf/site/dev_guide/metadata.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/metadata.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/metadata.html (original)
+++ webservices/wsrf/site/dev_guide/metadata.html Mon Oct 24 09:10:05 2005
@@ -196,7 +196,7 @@
 <a href="#Define+the+Operations">Define the Operations</a>
 </li>
 <li>
-<a href="#Modify+the+JNDI+Configuration+File">Modify the JNDI Configuration File</a>
+<a href="#Modify+the+Configuration+File">Modify the Configuration File</a>
 </li>
 </ul>
 </div>
@@ -205,15 +205,19 @@
 <h2 class="boxed">Introduction</h2>
 <div class="section">
 <p>Web services may have various metadata associated with them (e.g. the WSDL for the service or a set of Topic Space documents). The 
-			<a class="external" href="http://msdn.microsoft.com/library/en-us/dnglobspec/html/ws-metadataexchange.pdf">WS-MEXWS-Metadata Exchange</a> specification (defined by Microsoft 
+			<a class="external" href="http://msdn.microsoft.com/library/en-us/dnglobspec/html/ws-metadataexchange.pdf">WS-Metadata Exchange</a> (WS-MEx) specification (defined by Microsoft 
 			and other industry contributors) defines operations that can be provided by services to allow clients to retrieve these metadata documents.
 			</p>
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">Pubscribe will handle the GetMetadata operation for you if your WSDL supports the portType.  The Get operation, however will be generated as an abstract method which you will need to implement in your Service class.  If you do not wish to support/implement the Get operation, you may delegate the operation to the <span class="codefrag">org.apache.ws.resource.metadataexchange.v2004_09.porttype.impl.MetadataExchangePortTypeImpl.get()</span> operation which will in turn throw a fault.</div>
+</div>
 </div>
 		
-<a name="N1001A"></a><a name="Define+the+Operations"></a>
+<a name="N10020"></a><a name="Define+the+Operations"></a>
 <h2 class="boxed">Define the Operations</h2>
 <div class="section">
-<p>The metadata data operations are defined in your service's WSDL. If you used the INSTALL_DIR/template/_TEMPLATE_.wsdl file to create your WSDL, you simply 
+<p>The metadata operations are defined in your service's WSDL. If you used the INSTALL_DIR/template/_TEMPLATE_.wsdl file to create your WSDL, you simply 
 			need to uncomment these operations in the <span class="codefrag">portType</span> and <span class="codefrag">binding</span> sections.
 			</p>
 <pre class="code">
@@ -254,67 +258,84 @@
 &lt;/binding&gt;</pre>
 </div>
 		
-<a name="N1002E"></a><a name="Modify+the+JNDI+Configuration+File"></a>
-<h2 class="boxed">Modify the JNDI Configuration File</h2>
+		
+<a name="N10034"></a><a name="Modify+the+Configuration+File"></a>
+<h2 class="boxed">Modify the Configuration File</h2>
 <div class="section">
-<p>The JNDI configuration file must be modified to include a metadata resource for your service as well as configurations that define where your metadata files are located.</p>
-<p>To update the JNDI configuration file to include metadata information:</p>
+<p>The WSRF configuration file must be modified to include a metadata bean for your service that defines your metadata documents and where they are located.</p>
+<p>To update the WSRF configuration file to include metadata information:</p>
 <ol>
 				
-<li>Using a text editor, open <span class="codefrag">jndi-config.xml</span> in the <span class="codefrag">WEB-INF/classes</span> directory.</li>
+<li>Using a text editor, open <span class="codefrag">wsrf-config.xml</span> in the <span class="codefrag">WEB-INF/classes</span> directory.</li>
 				
-<li>Add the following JNDI resource block to the service, for which you would like to associate metadata:
+<li>Add the following property to the ResourceHome bean, with which you would like to associate metadata:
 				<pre class="code">
-&lt;service name="myService"&gt;
-   &lt;resource name="metadata" type="org.apache.ws.util.jndi.tools.MetadataConfigImpl"&gt;</pre>
+    &lt;property name="metadataConfig"&gt;
+    &lt;bean class="org.apache.ws.metadata.MetadataConfiguration"&gt;
+	  &lt;constructor-arg&gt;
+	    &lt;list&gt;		  
+		&lt;bean class="org.apache.ws.metadata.MetadataEntry"&gt;     
+		  &lt;property name="dialect"&gt;    
+		    &lt;value&gt;http://schemas.xmlsoap.org/wsdl/&lt;/value&gt;    
+		  &lt;/property&gt;  
+		  &lt;property name="identifier"&gt;  
+		    &lt;value&gt;http://ws.apache.org/notification/base/service/SubscriptionManager.wsdl&lt;/value&gt;
+		  &lt;/property&gt;   
+		  &lt;property name="location"&gt; 
+		    &lt;value&gt;wsdl/SubscriptionManager.wsdl&lt;/value&gt;
+		  &lt;/property&gt;	    
+		&lt;/bean&gt;	 
+	    &lt;/list&gt;
+	  &lt;/constructor-arg&gt;	    
+	&lt;/bean&gt; 
+    &lt;/property&gt;	 </pre>
 					
-<p>The <span class="codefrag">org.apache.ws.util.jndi.tools.MetadataConfigImpl</span> object containing the metadata is available via JNDI using a Context lookup of 
-				<span class="codefrag">wsrf/services/{service_name}/metadata</span> - i.e. <span class="codefrag">ctx.lookup("wsrf/services/sushi/metadata");</span>
+<p>The <span class="codefrag">org.apache.ws.metadata.MetadataConfiguration</span> object containing the metadata is available via the ResourceHome interface, which is available via the ResourceContext - i.e. <span class="codefrag">getResourceContext().getResourceHome().getMetadataConfig()</span>
 					
 </p>
 				
 </li>
 				
-<li>In the metadata resource block, add a<span class="codefrag"> metadataConfig</span> element that contains metadata configurations. The configuration includes a <span class="codefrag">dialect</span> 
-				attribute that defines the type of the data (xsd, wsdl, etc...) and an identifier attribute that uniquely identifies a particular document and is typically a targetNamespace. The 
-				following examples demonstrate five different methods of configuring where your metadata files are located. The files should be "reachable" at the configured locations.<pre class="code">
-&lt;resource name="metadata" type="org.apache.ws.util.jndi.tools.MetadataConfigImpl"&gt;
-   &lt;metadataConfig&gt;
-      &lt;!-- classpath --&gt;
-      &lt;metadata dialect="http://www.w3.org/2001/XMLSchema" identifier="http://ws.apache.org/resource/properties/test/sushi_classpath"&gt;
-         &lt;location&gt;org/apache/ws/resource/properties/SushiProperties.xsd&lt;/location&gt;
-      &lt;/metadata&gt;
-            
-      &lt;!-- file --&gt;
-      &lt;metadata dialect="http://schemas.xmlsoap.org/wsdl/" identifier="http://ws.apache.org/resource/properties/test/sushi_wsdl"&gt;
-         &lt;location&gt;C:/Projects/apache/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.wsdl&lt;/location&gt;
-      &lt;/metadata&gt;
-            
-      &lt;!-- http url --&gt;
-      &lt;metadata dialect="http://www.w3.org/2001/XMLSchema" identifier="http://ws.apache.org/resource/properties/test/sushi_url"&gt;
-         &lt;location&gt;http://localhost:8080/wsrf/SushiProperties.xsd&lt;/location&gt;
-      &lt;/metadata&gt;
-            
-      &lt;!-- file url --&gt;
-      &lt;metadata dialect="http://www.w3.org/2001/XMLSchema" identifier="http://ws.apache.org/resource/properties/test/sushi_fileurl"&gt;
-         &lt;location&gt;file://C:/Projects/apache/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiProperties.xsd&lt;/location&gt;
-      &lt;/metadata&gt;
-            
-      &lt;!-- EndpointReference --&gt;
-      &lt;metadata dialect="http://schemas.xmlsoap.org/ws/2004/08/addressing" identifier="http://ws.apache.org/resource/properties/test/sushi_epr"&gt;           
-         &lt;reference xmlns:wsa04="http://schemas.xmlsoap.org/ws/2004/08/addressing"&gt;
-            &lt;wsa04:Address&gt;http://localhost:8080/wsrf/services/sushi&lt;/wsa04:Address&gt;
-            &lt;wsa04:ReferenceProperties&gt;
-               &lt;sushi:ResourceIdentifier xmlns:sushi="http://ws.apache.org/resource/properties/test/sushi"&gt;1&lt;/sushi:ResourceIdentifier&gt;
-            &lt;/wsa04:ReferenceProperties&gt;
-         &lt;/reference&gt;                           
-      &lt;/metadata&gt;
-   &lt;/metadataConfig&gt;
-&lt;/resource&gt;</pre>
+<li>The <span class="codefrag">MetadataConfiguration</span> contains a set of <span class="codefrag">MetadataEntry</span> objects. Each MetadataEntry includes a <span class="codefrag">dialect</span> 
+				property that defines the type of the data (xsd, wsdl, etc...) , an identifier property that uniquely identifies a particular document (e.g. a WSDL targetNamespace), and a location which is either a file URL, http URL or a resource path (which would be loaded via the current class loader). The 
+				following example shows the SubscriptionManager service's  metadata configuration. Notice it has a single metadata entry which describes its WSDL.<pre class="code">
+  &lt;bean id="SubscriptionHome" class="org.apache.ws.notification.base.v2004_06.impl.SubscriptionHome" init-method="init"&gt;
+    &lt;property name="portComponentName"&gt;
+      &lt;value&gt;SubscriptionManager&lt;/value&gt;
+    &lt;/property&gt;
+    &lt;property name="serviceClass"&gt;
+      &lt;value&gt;org.apache.ws.notification.base.v2004_06.impl.SubscriptionService&lt;/value&gt;
+    &lt;/property&gt;
+    &lt;property name="resourceClass"&gt;
+      &lt;value&gt;org.apache.ws.notification.base.v2004_06.impl.SubscriptionResource&lt;/value&gt;
+    &lt;/property&gt;
+    &lt;property name="resourceIdentifierReferenceParameterName"&gt;
+      &lt;value&gt;{http://ws.apache.org/notification/base/service/SubscriptionManager}ResourceIdentifier&lt;/value&gt;
+    &lt;/property&gt;
+    &lt;property name="metadataConfig"&gt;
+	&lt;bean class="org.apache.ws.metadata.MetadataConfiguration" singleton="true"&gt;
+	  &lt;constructor-arg&gt;
+	    &lt;list&gt;		  
+		&lt;bean class="org.apache.ws.metadata.MetadataEntry"&gt;     
+		  &lt;property name="dialect"&gt;    
+		    &lt;value&gt;http://schemas.xmlsoap.org/wsdl/&lt;/value&gt;    
+		  &lt;/property&gt;  
+		  &lt;property name="identifier"&gt;  
+		    &lt;value&gt;http://ws.apache.org/notification/base/service/SubscriptionManager.wsdl&lt;/value&gt;
+		  &lt;/property&gt;   
+		  &lt;property name="location"&gt; 
+		    &lt;value&gt;wsdl/SubscriptionManager.wsdl&lt;/value&gt;
+		  &lt;/property&gt;	    
+		&lt;/bean&gt;	 
+	    &lt;/list&gt;
+	  &lt;/constructor-arg&gt;	    
+	&lt;/bean&gt; 
+    &lt;/property&gt;	 
+  &lt;/bean&gt;</pre>
 				
 </li>
 				
-<li>Save and close jndi-config.xml.</li>
+<li>Save and close wsrf-config.xml.</li>
 				
 <li>Restart Tomcat if it is already started.</li>
 			

Modified: webservices/wsrf/site/dev_guide/resource.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/resource.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/resource.html (original)
+++ webservices/wsrf/site/dev_guide/resource.html Mon Oct 24 09:10:05 2005
@@ -201,6 +201,9 @@
 <li>
 <a href="#methods">Methods</a>
 </li>
+<li>
+<a href="#read-only">Read-Only ResourceProperties</a>
+</li>
 </ul>
 </div>
 		
@@ -275,6 +278,23 @@
          		which allow you to initialize or clean up your resource.
          		</p>
 </div>
+		
+<a name="N100AA"></a><a name="read-only"></a>
+<h2 class="boxed">Read-Only ResourceProperties</h2>
+<div class="section">
+<p>Individual ResourceProperties can be defined read-only by modifying the ResourceMetadata object:</p>
+<pre class="code">resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.DEVICESPECIALFILE );
+...
+resourceProperty.getMetaData().setReadOnly( true );
+			</pre>
+<p>The default <span class="codefrag">readOnly</span> value for custom ResourceProperties is <span class="codefrag">false</span>.  Setting <span class="codefrag">readOnly</span> to true
+			will ensure a ResourceProperty will not be changed via a <span class="codefrag">SetResourceProperty</span> request.			
+         		</p>
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">Attempting to modify a read-only property will generated a fault.</div>
+</div>
+</div>		
 	
 </div>
 <!--+

Modified: webservices/wsrf/site/dev_guide/service.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/service.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/service.html (original)
+++ webservices/wsrf/site/dev_guide/service.html Mon Oct 24 09:10:05 2005
@@ -371,33 +371,33 @@
 <a name="N100EC"></a><a name="ops"></a>
 <h4>Operations</h4>
 <p>The operations which are defined in the abstract class should be operations which typically should not need to be touched.  The 
-					specification operations are a prime example.  Upon looking at the <span class="codefrag">AbstractFileSystem</span> class, we see the operations 
-					defined for methods like: <span class="codefrag">getMultipleResourceProperties(..)</span>.  The body of these methods are similar in that they hand the 
-					invocation off to a Provider class:
+					specification-defined operations are a prime example.  Upon looking at the <span class="codefrag">AbstractFileSystem</span> class, we see the operations 
+					defined for methods like: <span class="codefrag">getMultipleResourceProperties(...)</span>.  The body of these methods are similar in that they hand the 
+					invocation off to a portType implementation class:
 					</p>
-<pre class="code">public GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties( GetMultipleResourcePropertiesDocument requestDoc )
-{
-      return new GetMultipleResourcePropertiesProvider( getResourceContext(  ) ).getMultipleResourceProperties( requestDoc );
-}</pre>
-<p>Notice the <span class="codefrag">GetMultipleResourcePropertiesProvider</span> class being used.  Providers are used to handle the specification 
-					method calls.  It provides a way to encapsulate the functionalty needed to handle a method call for a specific specification.  Each 
-					specification operation will have an equivalent *Provider class to handle a particular class.</p>
+<pre class="code">public GetResourcePropertyResponseDocument getResourceProperty( GetResourcePropertyDocument requestDoc )
+   {
+      return new GetResourcePropertyPortTypeImpl( getResourceContext(  ) ).getResourceProperty( requestDoc );
+   }</pre>
+<p>Notice the <span class="codefrag">GetMultipleResourcePropertiesPortTypeImpl</span> class being used.  A portType implementation class
+					is used to handle the operations defined in a particular specification-defined portType. </p>
 <p>The packages:
             				<strong>
 							<span class="codefrag">org.apache.ws.resource.properties.porttype.impl</span>
 						</strong> and
             				<strong>
 							<span class="codefrag">org.apache.ws.resource.lifetime.porttype.impl</span>
-						</strong> contain the Providers for the methods of the specifications. 
-            				You should refer to these packages when implementing the specification operations.
+						</strong> contain the portType implementation classes for the portTypes defined by
+						the WS-ResourceProperties and WS-ResourceLifetime specifications. 
+            				You should refer to these packages when implementing the operations from these specifications.
          				 </p>
 <a name="N10116"></a><a name="service"></a>
 <h3 class="boxed">The Service class</h3>
-<p>The service class is the extension of the abstract class we previously outlined.  Because of the extension you will need to implement the 
-				required method <span class="codefrag">getResourceContext()</span>.  The ResourceContext should be passed in the constructor to the class and be 
-				maintained as a class variable.
+<p>The service class is the extension of the abstract service class we previously outlined. 
+				You will need to implement a constructor that takes a ResourceContext as a parameter. This
+				constructor should call the equivalent constructor in the superclass.
 				</p>
-<p>The Service class should contain any custom operations as were defined in the WSDL for the service.  The safest way to handle the 
+<p>The Service class should contain any custom operations that were defined in the most-derived portType for the service. The safest way to handle the 
 				parameters and return type of the methods is to simply use <span class="codefrag">XmlObject</span>:
 				</p>
 <pre class="code">   public XmlObject mount( XmlObject requestDoc )

Modified: webservices/wsrf/site/dev_guide/singleton.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/singleton.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/singleton.html (original)
+++ webservices/wsrf/site/dev_guide/singleton.html Mon Oct 24 09:10:05 2005
@@ -5,7 +5,7 @@
 <meta content="Apache Forrest" name="Generator">
 <meta name="Forrest-version" content="0.6">
 <meta name="Forrest-skin-name" content="pelt">
-<title>Creating a Singleton Service</title>
+<title>Creating a Singleton Resource</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
 <link media="screen" type="text/css" href="../skin/screen.css" rel="stylesheet">
 <link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
@@ -186,7 +186,7 @@
     +-->
 <div id="content">
 <div id="skinconf-txtlink"></div>
-<h1>Creating a Singleton Service</h1>
+<h1>Creating a Singleton Resource</h1>
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -196,7 +196,7 @@
 <a href="#Create+a+Single+Instance">Create a Single Instance</a>
 </li>
 <li>
-<a href="#Modify+the+JNDI+Configuration+File">Modify the JNDI Configuration File</a>
+<a href="#Modify+the+WSRF+Configuration+File">Modify the WSRF Configuration File</a>
 </li>
 </ul>
 </div>
@@ -206,7 +206,7 @@
 <div class="section">
 <p>You can create a singleton service if only a single instance of a resource is required. If a service is a singleton, no resource ID parameter is expected in the 
 			header of requests sent to the service. To create a singleton service, you must create a single instance of the resource in the generated home class and modify the deployed 
-			jndi-config.xml file.
+			wsrf-config.xml file.
 			</p>
 </div>
 		
@@ -217,31 +217,29 @@
 			ensures that only a single instance of the resource is created. For example:</p>
 <pre class="code">public void init() throws Exception
     {
-        super.init();
-        
+        super.init();        
         HostResource host = (HostResource) createInstance( null );
         add( host );
     }			</pre>
 </div>
 		
-<a name="N1002A"></a><a name="Modify+the+JNDI+Configuration+File"></a>
-<h2 class="boxed">Modify the JNDI Configuration File</h2>
+<a name="N1002A"></a><a name="Modify+the+WSRF+Configuration+File"></a>
+<h2 class="boxed">Modify the WSRF Configuration File</h2>
 <div class="section">
-<p>To update the JNDII configuration file for a singleton service:</p>
+<p>To update the WSRF configuration file for a singleton service:</p>
 <ol>
 				
-<li>Using a text editor, open <span class="codefrag">jndi-config.xml</span> in the <span class="codefrag">WEB-INF/classes</span> directory.</li>
+<li>Using a text editor, open <span class="codefrag">wsrf-config.xml</span> in the <span class="codefrag">WEB-INF/classes</span> directory.</li>
 				
-<li>From the <span class="codefrag">&lt;service name="your_service"&gt;</span> block, remove the <span class="codefrag">resourceIdentifierReferenceParameterName</span> parameter. 
-				This parameter is not required for a singleton. Removing this entry ensures that Apache WSRF does not look for a resource id in the 
-				WS Addressing header.</li>
+<li>From the <span class="codefrag">&lt;bean name="YourSingletonHome" class="org.example.YourSingletonHome" init-method="init"&gt;</span> block, remove the <span class="codefrag">resourceIdentifierReferenceParameterName</span> property element. 
+				This parameter is not required for a singleton. Removing this entry ensures that Apache WSRF does not look for a resource id WS-Addressing reference parameter in the SOAP header.</li>
 				
-<li>Save and close jndi-config.xml.</li>
+<li>Save and close wsrf-config.xml.</li>
 				
 <li>Restart Tomcat if it is already started.
 				<div class="frame note">
 <div class="label">Note</div>
-<div class="content">The service entry in jndi-config is only present if the service has been deployed.</div>
+<div class="content">A resource home entry in wsrf-config.xml will only be present if your service has been deployed.</div>
 </div>
 				
 </li>

Modified: webservices/wsrf/site/dev_guide/validate.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/validate.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/validate.html (original)
+++ webservices/wsrf/site/dev_guide/validate.html Mon Oct 24 09:10:05 2005
@@ -197,21 +197,23 @@
 </li>
 </ul>
 </div>
+
 		
 <a name="N1000C"></a><a name="intro"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
-<p>All requests sent to the resource invocation framework are validated against any defined schemas types which have corresponding XMLBean classes located on the 
-			classpath. When validation fails, a fault that contains a detailed description of exactly what is wrong with the XM is returned to the client. Request validation is performed using 
-			XMLBeans, which uses an in-memory binary schema store. If the utmost performance is required, request validation can be disabled.
+<p>By default, all requests sent to the resource invocation framework are validated against any defined schemas types which have corresponding XMLBean classes located on the 
+			classpath. When validation fails, a fault that contains a detailed description of exactly what is wrong with the XML is returned to the client. Request validation is performed using 
+			XMLBeans, which utilizes an in-memory binary schema store. If the utmost performance is required, request validation can be disabled.
 			</p>
 </div>
 		
+		
 <a name="N10016"></a><a name="Disabling+Schema+Validation"></a>
 <h2 class="boxed">Disabling Schema Validation</h2>
 <div class="section">
 <p>Schema validation is enabled by default. This means that all requests are validated. If you would like to disable this feature, you must set the 
-			<span class="codefrag">validateRequestXml</span> system property to <span class="codefrag">false</span>. The property must be set as a Java property before starting the container that is hosting 
+			<span class="codefrag">validateRequestXml</span> Java system property to <span class="codefrag">false</span>. The system property can be set by specifying a command-line option upon launching the JVM that is hosting 
 			Apache WSRF. For example:</p>
 <pre class="code">
 	-DvalidateRequestXml=false</pre>
@@ -220,6 +222,7 @@
 	set JAVA_OPTS=-DvalidateRequestXml=false
 	catalina.bat run</pre>
 </div>
+
 	
 </div>
 <!--+

Modified: webservices/wsrf/site/dev_guide/wsdl_tool.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/dev_guide/wsdl_tool.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/dev_guide/wsdl_tool.html (original)
+++ webservices/wsrf/site/dev_guide/wsdl_tool.html Mon Oct 24 09:10:05 2005
@@ -201,7 +201,7 @@
 <a name="N1000C"></a><a name="Introduction"></a>
 <h2 class="boxed">Introduction</h2>
 <div class="section">
-<p>The Wsdl2Java tool is used to generate a set of artificats for a WS Resource. The artifacts include:</p>
+<p>The Wsdl2Java tool is used to generate a set of artificats for a WS-Resource. The artifacts include:</p>
 <ul>
 				
 <li>A set of Java classes based on the WSDL definition. This includes a service, resource, and 
@@ -212,11 +212,9 @@
 <li>Java bindings for all XML schema types that are defined in the WSDL. The interfaces and classes are 
 				created using the <a class="external" href="http://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 
-				Axis.</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 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>
+<li>A WSRF configuration file for the resource home associated with your service (<em>service</em>_wsrf-config.xml). This file defines the information necessary for Apache WSRF to initialize and dispatch requests to your service.</li>
 			
 </ul>
 <p>The tool saves you a great deal of time, since these files do not have to be created from scratch. You simply pass the tool a WSRF WSDL and the files 
@@ -232,7 +230,7 @@
 <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 <span class="codefrag">WORK_DIR</span>.</li>
+<li>Copy INSTALL_DIR/template/build.xml and build.properties to any directory. This directory will be referred to as <span class="codefrag">WORK_DIR</span>.</li>
 				
 <li>Using a text editor, open <span class="codefrag">WORK_DIR/build.properties</span>.</li>
 				
@@ -257,7 +255,7 @@
 </ol>
 <a name="N1007E"></a><a name="Task+Definition"></a>
 <h3 class="boxed">Task Definition</h3>
-<p>The task is defined as follows :</p>
+<p>The task is defined as follows:</p>
 <pre class="code">
 &lt;taskdef name="wsdl2Java" 
  	 classname="org.apache.ws.resource.tool.Wsdl2JavaTask" 
@@ -298,8 +296,8 @@
 <tr>
 						
 <td colspan="1" rowspan="1">classpath</td>
-						<td colspan="1" rowspan="1">The classpath to be passed to the XMLBeans schema compiler. The classpath should reference the all the jars in the 
-						<span class="codefrag">INSTALL_DIR/wsrf/webapp/lib</span> and <span class="codefrag">/classes</span> directories.</td>
+						<td colspan="1" rowspan="1">The classpath to be passed to the XMLBeans schema compiler. The classpath should reference all the jars in the 
+						<span class="codefrag">INSTALL_DIR/wsrf/webapp/lib</span>, as well as the <span class="codefrag">/classes</span> directory.</td>
 						<td colspan="1" rowspan="1">Yes</td>
 					
 </tr>
@@ -360,8 +358,8 @@
 				
 </p>
 <p>The following example generates files for a single WSDL and places the generated files in a subdirectory 
-			 of the current directory named <span class="codefrag">/generated</span>. To simplify the example, the classpath is referenced. You must set the <span class="codefrag">${wsrf.home}</span> Ant property to <span class="codefrag"> 
-			 INSTALL_DIR</span> (e.g. /opt/wsrf-1.0).</p>
+			 of the current directory named <span class="codefrag">generated</span>. To simplify the example, the classpath is referenced. You must set the <span class="codefrag">${wsrf.home}</span> Ant property to <span class="codefrag"> 
+			 INSTALL_DIR</span> (e.g. /opt/wsrf-1.1).</p>
 <pre class="code">
 			 
 	&lt;property name="wsrf.webapp.dir" location="${wsrf.home}/webapps/wsrf" /&gt;

Modified: webservices/wsrf/site/index.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/index.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/index.html (original)
+++ webservices/wsrf/site/index.html Mon Oct 24 09:10:05 2005
@@ -203,6 +203,8 @@
 <h2 class="boxed">News</h2>
 <div class="section">
 <ul>
+     			
+<li>(October 21, 2005) <a href="http://ws.apache.org/wsrf/release.html">WSRF 1.1</a> is now available!</li>
 				
 <li>(August 5, 2005) <a href="http://ws.apache.org/wsrf/release.html">WSRF 1.0</a> is now available!</li>
 				

Modified: webservices/wsrf/site/release.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/release.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/release.html (original)
+++ webservices/wsrf/site/release.html Mon Oct 24 09:10:05 2005
@@ -154,6 +154,9 @@
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
+<a href="#v1.1">v1.1</a>
+</li>
+<li>
 <a href="#v1.0">v1.0</a>
 </li>
 <li>
@@ -161,8 +164,20 @@
 </li>
 </ul>
 </div>
+      
+<a name="N1000C"></a><a name="v1.1"></a>
+<h2 class="boxed">v1.1</h2>
+<div class="section">
+<ul>
+          
+<li>Download: <a class="external" href="http://www.apache.org/dyn/closer.cgi/ws/wsrf/1.1/bin/">binary distribution</a>,         
+                        <a class="external" href="http://www.apache.org/dyn/closer.cgi/ws/wsrf/1.1/src/">source distribution</a>
+</li>
+       
+</ul>
+</div>    
     
-<a name="N1000C"></a><a name="v1.0"></a>
+<a name="N10020"></a><a name="v1.0"></a>
 <h2 class="boxed">v1.0</h2>
 <div class="section">
 <ul>
@@ -174,7 +189,7 @@
 </ul>
 </div>    
     
-<a name="N10020"></a><a name="v1.0+Beta"></a>
+<a name="N10034"></a><a name="v1.0+Beta"></a>
 <h2 class="boxed">v1.0 Beta</h2>
 <div class="section">
 <ul>

Modified: webservices/wsrf/site/release_notes.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/release_notes.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/release_notes.html (original)
+++ webservices/wsrf/site/release_notes.html Mon Oct 24 09:10:05 2005
@@ -164,13 +164,27 @@
 		
 <div class="frame note">
 <div class="label">Note</div>
-<div class="content">If you have any services created prior to this release, it is strongly suggested that you regenerate the services (including XmlBeans-generated types) to a 
+<div class="content">If you have any services created prior to this release, it is strongly suggested that you regenerate the services  to a 
 		clean directory and manually port any added code to the newly generated files. This will avoid any problems associated with the changes in this release.</div>
 </div>
 		
 <a name="N1000F"></a><a name="Change+History"></a>
 <h2 class="boxed">Change History</h2>
 <div class="section">
+<p>Changes since the 1.0 release:</p>
+<ul>
+				
+<li>Some API changes</li>
+				
+<li>Various refactorings and bug fixes</li>
+				
+<li>New config file format, we've removed jndi-config.xml in favor of Spring.  Please see the <a href="dev_guide/index.html">Developer's Guide</a> for more information.</li>
+				
+<li>WS-Metadata GET operation is no longer implemented.  This method will be generated as an abstract method and left to the developer to implement.  Please see the <a href="dev_guide/index.html">Developer's Guide</a> for more information.</li>
+				
+<li>Removed dependency on Apache WS-Addressing.  Since a project goal is to run on platforms other than Axis, and our usages were very simple, we decided to remove the dependency.</li>
+			
+</ul>
 <p>Changes since the 1.0 Beta release:</p>
 <ul>
 				
@@ -212,7 +226,7 @@
 <p></p>
 </div>
 		
-<a name="N1007E"></a><a name="Known+Issues"></a>
+<a name="N1009B"></a><a name="Known+Issues"></a>
 <h2 class="boxed">Known Issues</h2>
 <div class="section">
 <ul>
@@ -221,7 +235,6 @@
 				    framework. This can cause an infinite loop if a home, from its init() method, looks up itself from JNDI.
 				    Though this theoretically should never be necessary, if you must do it, you'll need to wrap the body of your init() 
 				    method in a conditional that checks if the home has already been initialized.</li>
-				    
 			
 </ul>
 <p>Please submit all issues to the WSRF project in 

Modified: webservices/wsrf/site/tutorial/index.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/tutorial/index.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/tutorial/index.html (original)
+++ webservices/wsrf/site/tutorial/index.html Mon Oct 24 09:10:05 2005
@@ -198,7 +198,7 @@
         		<a href="../getting_started.html#qd">Quick Demonstration</a>.</p>
 <div class="frame note">
 <div class="label">Note</div>
-<div class="content">To complete the tutorial, you must first<a href="../getting_started.html#install">install</a> the distribution.</div>
+<div class="content">To complete the tutorial, you must first <a href="../getting_started.html#install">install</a> the distribution.</div>
 </div>
 <p>The process consists of the following steps:</p>
 <ol>

Modified: webservices/wsrf/site/tutorial/mod_resource.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/tutorial/mod_resource.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/tutorial/mod_resource.html (original)
+++ webservices/wsrf/site/tutorial/mod_resource.html Mon Oct 24 09:10:05 2005
@@ -221,18 +221,19 @@
      */
     private example.filesystem.backend.FileSystem m_filesystem;
 			
+    /**
+     * Initializes this resource's state (properties, etc.).
+     */
     public void init()
     {
-
         super.init();
-
-        m_filesystem = new example.filesystem.backend.UnixFileSystem( (String)getID() );  // create a mock filesystem object
+        m_filesystem = new example.filesystem.backend.UnixFileSystem( (String)getID() );  // create a mock object representing the backend filesystem
 
         /*
          * 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;
+        org.apache.ws.resource.properties.ResourceProperty resourceProperty;
 
         try
         {
@@ -243,11 +244,13 @@
             DeviceSpecialFileDocument deviceDocXBean = DeviceSpecialFileDocument.Factory.newInstance();
             deviceDocXBean.setDeviceSpecialFile( m_filesystem.getDeviceSpecialFile() );
             resourceProperty.add( deviceDocXBean );
+            resourceProperty.getMetaData().setReadOnly( true );
 
             resourceProperty = resourcePropertySet.get( FilesystemPropertyQNames.TYPE );
             TypeDocument typeDocXBean = TypeDocument.Factory.newInstance();
             typeDocXBean.setType( m_filesystem.getType() );
             resourceProperty.add( typeDocXBean );
+            resourceProperty.getMetaData().setReadOnly( true );
 
             BackupFrequencyDocument backupDocXBean = BackupFrequencyDocument.Factory.newInstance();
             backupDocXBean.setBackupFrequency( m_filesystem.getBackupFrequency() );
@@ -297,9 +300,8 @@
 
         // 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();
@@ -313,7 +315,7 @@
     public boolean isMounted()
     {
         return m_filesystem.isMounted();
-    }
+    }    
 </pre>
 <p>
 				

Modified: webservices/wsrf/site/tutorial/wsdl2java.html
URL: http://svn.apache.org/viewcvs/webservices/wsrf/site/tutorial/wsdl2java.html?rev=328089&r1=328088&r2=328089&view=diff
==============================================================================
--- webservices/wsrf/site/tutorial/wsdl2java.html (original)
+++ webservices/wsrf/site/tutorial/wsdl2java.html Mon Oct 24 09:10:05 2005
@@ -228,7 +228,7 @@
 				
 <li>an Axis deploy.wsdd file</li>
 				
-<li>a jndi-config.xml file</li>
+<li>a wsrf-config.xml file</li>
 			
 </ul>
 <div class="frame note">