incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r965829 [1/2] - in /incubator/oodt/trunk: crawler/src/site/xdoc/user/ curator/src/site/xdoc/development/ curator/src/site/xdoc/user/ filemgr/src/site/ filemgr/src/site/xdoc/development/ filemgr/src/site/xdoc/user/ metadata/src/site/ metadat...
Date Tue, 20 Jul 2010 12:44:28 GMT
Author: kelly
Date: Tue Jul 20 12:44:26 2010
New Revision: 965829

URL: http://svn.apache.org/viewvc?rev=965829&view=rev
Log:
WIP OODT-16
Documentation updates for website bliss: remove JPL-specific environemental instructions; add ASF notices; wrap images in paragraphs; fix references to other OODT components; remove woefully out-of-date docs; add namespace URI to-do items; adjust download instructions; remove hard-coded styles; factor repeated style elements out; drop RMI & CORBA notes; drop SWSA reference; adjust image positioning; change code markup from <code> to <screen> where appropriate; correct spelling mistakes; drop Subversion instructions.

Removed:
    incubator/oodt/trunk/curator/src/site/xdoc/development/subversion.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/development/subversion.xml
    incubator/oodt/trunk/product/src/site/xdoc/tutorials/
    incubator/oodt/trunk/profile/src/site/xdoc/adv/
    incubator/oodt/trunk/profile/src/site/xdoc/handler/
    incubator/oodt/trunk/profile/src/site/xdoc/info/
    incubator/oodt/trunk/profile/src/site/xdoc/querying/
    incubator/oodt/trunk/profile/src/site/xdoc/rep/
    incubator/oodt/trunk/workflow/src/site/xdoc/development/subversion.xml
Modified:
    incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml
    incubator/oodt/trunk/curator/src/site/xdoc/development/maven.xml
    incubator/oodt/trunk/curator/src/site/xdoc/user/basic.xml
    incubator/oodt/trunk/filemgr/src/site/site.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/development/developer.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/development/maven.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/user/advanced.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/user/basic.xml
    incubator/oodt/trunk/filemgr/src/site/xdoc/user/index.xml
    incubator/oodt/trunk/metadata/src/site/site.xml
    incubator/oodt/trunk/metadata/src/site/xdoc/user/advanced.xml
    incubator/oodt/trunk/metadata/src/site/xdoc/user/basic.xml
    incubator/oodt/trunk/product/src/site/site.xml
    incubator/oodt/trunk/product/src/site/xdoc/servlet/index.xml
    incubator/oodt/trunk/profile/src/site/site.xml
    incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml
    incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml
    incubator/oodt/trunk/xmlquery/src/site/site.xml
    incubator/oodt/trunk/xmlquery/src/site/xdoc/disquery/index.xml
    incubator/oodt/trunk/xmlquery/src/site/xdoc/tutorial/index.xml

Modified: incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml (original)
+++ incubator/oodt/trunk/crawler/src/site/xdoc/user/index.xml Tue Jul 20 12:44:26 2010
@@ -38,6 +38,7 @@ the License.
         input), satisfaction of ingestion pre-conditions (e.g., the current crawled file has not been 
         previously ingested), followed by metadata extraction. After metadata extraction, crawled data follows 
         a standard three state lifecycle:
+        </p>
           <ol>
            <li>preIngestion - where e.g., a file may be unzipped or pre-processed prior to ingestion;</li>
            <li>postIngestion success, indicating a successful ingestion to the file management component has occurred 
@@ -45,15 +46,11 @@ the License.
            <li>postIngestion failure, indicating that ingestion was not successful and some corrective action, 
            e.g., moving the failed file to a failure area for later examination, should occur.</li>
           </ol>
+
+          <p><img src='../images/crawler_phases.png' alt='Crawler Phase Model'/></p>
+          <p><img src='../images/crawler-state-diagram.png' alt='Detailed Crawler Phase Model'/></p>
           
-          <table border="0">
-            <tr style="vertical-align:top;">
-              <td style="background-color:#FFFFFF;"><img src="../images/crawler_phases.png" alt="Crawler Phase Model"/></td>
-              <td style="background-color:#FFFFFF;"><img src="../images/crawler-state-diagram.png" alt="Detailed Crawler Phase Model"/></td>
-            </tr>
-          </table>
-          
-         The critical objects managed by the CAS Crawler framework include:</p>
+         <p>The critical objects managed by the CAS Crawler framework include:</p>
         
         <ul>
          <li>Crawler Config - Configures a Product Crawler, providing specialized options, such as specifying
@@ -85,7 +82,7 @@ the License.
         which are each associated with 1...* Crawler Phases. Each Product Crawler crawls 1...* Products, which are each associated
         with exactly 1 Metadata object. These relationships are shown in the below figure.</p>
         
-        <img src="../images/crawler-object-model.png" alt="Crawler Object Model"/> 
+        <p><img src="../images/crawler-object-model.png" alt="Crawler Object Model"/></p>
       
         <subsection name="Extension Points">
           <p>
@@ -150,7 +147,7 @@ the License.
           figure.
           </p>
           
-          <img src="../images/crawler-extension-points.png" alt="Crawler Extension Points"/>
+          <p><img width='600' src="../images/crawler-extension-points.png" alt="Crawler Extension Points"/></p>
         
         </subsection>
         <subsection name="Key Capabilities">
@@ -184,7 +181,7 @@ the License.
           is required, the user can extend one of these existing ProductCrawlers, or write an entirely new crawler.</li>
           <li>Ability to plug in Met Extraction rules - A user can leverage a custom developed Met Extractor to generate Product metadata
           used by the crawler during the ingestion process. Met Extractors are easily plugged in using Java's class loading mechanism
-          the capabilities of the <a href="http://oodt.jpl.nasa.gov/cas-metadata/">CAS Metadata Framework</a>.</li>
+          the capabilities of the <a href="../../metadata/">CAS Metadata Framework</a>.</li>
           <li>Communication over lightweight, standard protocols – The Crawler Framework uses XML-RPC, as its main 
           external interface, when the Crawler runs in Daemon mode. XML-RPC, the little brother of SOAP, is 
           fast, extensible, and uses the underlying HTTP protocol for data transfer.</li>
@@ -234,21 +231,18 @@ the License.
       </section>
       <section name="Configuration and Installation">
        <p>
-       To install the Crawler Framework, you need to download a <a href="http://oodt.jpl.nasa.gov/cas-crawler/">release</a>
+       To install the Crawler Framework, you need to download a release
        of the software, available from its home web site. For bleeding-edge features, you can
-       also check out the cas-crawler trunk project from the OODT subversion repository. You can browse 
-       the repository using ViewCVS, located at:
+       also check out the cas-crawler trunk project from the Apache OODT subversion repository. You can browse 
+       the repository using ViewCVS, located at:</p>
        
-       <code>http://oodt.jpl.nasa.gov/vc/svn/</code>
+       <screen>http://svn.apache.org/viewvc/incubator/oodt/</screen>
        
-       The actual web url for the repository is located at: 
+       <p>The actual web url for the repository is located at:</p>
        
-       <code>http://oodt.jpl.nasa.gov/repo/</code>
+       <screen>https://svn.apache.org/repos/asf/incubator/oodt</screen>
 
-       To check out the Crawler Framework, use your favorite Subversion client. Several clients are 
-       listed a <a href="http://oodt.jpl.nasa.gov/wiki/display/oodt/Subversion">
-       http://oodt.jpl.nasa.gov/wiki/display/oodt/Subversion</a>.
-      </p>   
+       <p>To check out the Crawler Framework, use your favorite Subversion client.</p>
       
       <subsection name="Project Organization">
         <p>
@@ -263,7 +257,7 @@ the License.
        software. Maven is an XML-based, project management system similar to Apache Ant, but with many extra 
        bells and whistles. Maven makes cross-platform project development a snap. You can download Maven from:
 
-       <a href="http://maven.apache.org">http://maven.apache.org</a>
+       <a href="http://maven.apache.org">http://maven.apache.org/</a>
 
        All cas-crawler releases post 1.x.0 are now <b>Maven 2 compatible</b>. This is <b>very</b> important. 
        That means that if you have any cas-crawler release > 1.x.0, you will need Maven 2 to compile the software, 
@@ -350,13 +344,13 @@ the License.
       is now ready to run! You can test out the Crawler Framework by running a simple ingest 
       command shown below. Be sure that a separate File Manager instance is up and running on the default
       port of 9000, running on localhost, before starting this test command (see the 
-      <a href="http://oodt.jpl.nasa.gov/cas-filemgr/user/">File Manager User Guide</a> for more information).
+      <a href="../../filemgr/user/">File Manager User Guide</a> for more information).
       
       First create a simple text file called &quot;blah.txt&quot; and place it inside a test directory, e.g., <code>/data/test</code>. Then, create a default 
-      metadata file for the product, using the <a href="http://oodt.jpl.nasa.gov/vc/svn/cas-metadata/trunk/src/main/conf/cas.metadata.xsd">schema</a>
-      or  <a href="http://oodt.jpl.nasa.gov/vc/svn/cas-metadata/trunk/src/main/conf/cas.metadata.dtd">DTD</a>
+      metadata file for the product, using the schema or DTD
       provided in the cas-metadata project. An example XML file might be:</p>
       
+      <!-- FIXME: change namespace URI? -->
       <source>
         &lt;cas:metadata xmlns:cas=&quot;http://oodt.jpl.nasa.gov/1.0/cas&quot;&gt;
          &lt;keyval&gt;
@@ -380,7 +374,7 @@ the License.
       <source># ./crawler_launcher \
                --crawlerId StdProductCrawler \
                --productPath /data/test \
-               --filemgrUrl http://localhost:9000 \
+               --filemgrUrl http://localhost:9000/ \
                --failureDir /tmp \
                --actionIds DeleteDataFile MoveDataFileToFailureDir Unique \
                --metFileExtension met \
@@ -392,7 +386,7 @@ the License.
       <source>
       log4j:WARN No appenders could be found for logger (org.springframework.context.support.FileSystemXmlApplicationContext).
       log4j:WARN Please initialize the log4j system properly.
-      http://localhost:9000
+      http://localhost:9000/
       StdProductCrawler
       Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler crawl
       INFO: Crawling /data/test
@@ -403,9 +397,9 @@ the License.
       Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.crawl.ProductCrawler ingest
       INFO: ProductCrawler: Ready to ingest product: [/data/test/blah.txt]: ProductType: [GenericFile]
       Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.ingest.StdIngester setFileManager
-      INFO: StdIngester: connected to file manager: [http://localhost:9000]
+      INFO: StdIngester: connected to file manager: [http://localhost:9000/]
       Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferer setFileManagerUrl
-      INFO: Local Data Transfer to: [http://localhost:9000] enabled
+      INFO: Local Data Transfer to: [http://localhost:9000/] enabled
       Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.ingest.StdIngester ingest
       INFO: StdIngester: ingesting product: ProductName: [blah.txt]: ProductType: [GenericFile]: FileLocation: [/data/test/]
       Jun 30, 2009 8:26:57 AM org.apache.oodt.cas.filemgr.versioning.VersioningUtils createBasicDataStoreRefsFlat
@@ -448,7 +442,7 @@ the License.
           of which are described below.        
         </p>
       
-         <img src="../images/crawler-use-case-1.png" alt="Crawler Framework Ingest Use Case"/>
+         <p><img width='600' src="../images/crawler-use-case-1.png" alt="Crawler Framework Ingest Use Case"/></p>
          
          <p>The numbers in the above Figure correspond to a sequence of steps that occurs and a 
          series of interactions between the different Crawler Framework extension points in order to 

Modified: incubator/oodt/trunk/curator/src/site/xdoc/development/maven.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/site/xdoc/development/maven.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/site/xdoc/development/maven.xml (original)
+++ incubator/oodt/trunk/curator/src/site/xdoc/development/maven.xml Tue Jul 20 12:44:26 2010
@@ -23,7 +23,7 @@ the License.
 
   <body>
     <section name="Using Maven">
-      <p>OODT uses <a href="http://maven.apache.org/">Maven</a> for 
+      <p>Apache OODT uses <a href="http://maven.apache.org/">Maven</a> for 
       managing our build environment. Maven is an open source product from the 
       <a href="http://www.apache.org/">Apache Software Foundation</a> that improves 
       on <a href="http://ant.apache.org/">Ant</a> in the area of build management, 

Modified: incubator/oodt/trunk/curator/src/site/xdoc/user/basic.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/curator/src/site/xdoc/user/basic.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/curator/src/site/xdoc/user/basic.xml (original)
+++ incubator/oodt/trunk/curator/src/site/xdoc/user/basic.xml Tue Jul 20 12:44:26 2010
@@ -46,15 +46,11 @@ the License.
     <a name="section1"/>
     <section name="Download And Build">
       <p>The most recent CAS-Curator project can be downloaded from
-      the OODT <a href="http://oodt.jpl.nasa.gov">website</a> or it can
+      the OODT <a href="http://incubator.apache.org/oodt">website</a> or it can
       be checked out from the OODT repository using Subversion. The 
-      CAS-Curator project is located at 
-      <code>http://oodt/repo/cas-curator/</code>. We recommend checking
-      out the latest released version (v1.0.0 at the time of writing), 
-      which can be found at 
-      <code>http:/oodt/repo/cas-curator/tags/X_X_X_release</code>. For
-      more information on using Subversion, see our 
-      <a href="../development/subversion.html">Subversion Guide.</a></p>
+      We recommend checking
+      out the latest released version (v1.0.0 at the time of writing).
+      </p>
       
       <p>Maven is the build management system used for OODT projects. We
       currently support Maven 2.0 and later. For more information on 
@@ -206,7 +202,7 @@ docBase="/usr/local/src/cas-curator-v1.0
     <source>
 > mkdir /usr/local/staging/products/mp3
 > cd /usr/local/staging/products/mp3
-> curl http://oodt.jpl.nasa.gov/cas-curator/media/Bach-SuiteNo2.mp3 > \
+> curl http://incubator.apache.org/oodt/components/curator/media/Bach-SuiteNo2.mp3 > \
         Bach-SuiteNo2.mp3
     </source>
     
@@ -246,7 +242,7 @@ docBase="/usr/local/src/cas-curator-v1.0
     <p>The CAS-Curator uses ancillary programs called metadata extractors to produce
     the metadata that it associates with products. More information about metadata 
     extractors can be found in the 
-    <a href="http://oodt.jpl.nasa.gov/cas-metadata/user/extractorBasics.html">
+    <a href="../../metadata/user/extractorBasics.html">
     Extractor Basics</a> User's Guide.</p>
     
     <p>Like the staging area, we first need to set up an area in the file system for
@@ -302,7 +298,7 @@ title: Bach Cello Suite No 2  
     
     <p>With a little AWK magic, we can convert this output to the Cas-Metadata xml
     format:</p>
-    
+    <!-- FIXME: change namespace URI? -->
 <source><![CDATA[
 > java -jar tika-app-0.5-SNAPSHOT.jar -m \
   /usr/local/staging/products/mp3/Bach-SuiteNo2.mp3 | awk -F:\
@@ -475,7 +471,7 @@ total 51448
     <p>The final step in our basic configuration of CAS-Curator is to configure a 
     CAS-Filemgr instance into which we will ingest our mp3s. There is a lot of
     information on configuring the CAS-Filemgr in its
-    <a href="http://oodt.jpl.nasa.gov/cas-filemgr/user/">User's Guide</a>. We will 
+    <a href="../../filemgr/user/">User's Guide</a>. We will 
     assume familiarity with the CAS-Filemgr for the remainder of this guide.</p>
     
     <p>In this guide, we will focus on the basic configuration necessary to tailor

Modified: incubator/oodt/trunk/filemgr/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/site/site.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/site/site.xml (original)
+++ incubator/oodt/trunk/filemgr/src/site/site.xml Tue Jul 20 12:44:26 2010
@@ -1,11 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
-<project name="cas-filemgr" href="http://oodt.jpl.nasa.gov/cas-filemgr/">
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+<project name="cas-filemgr">
 
   <body>
     <links>

Modified: incubator/oodt/trunk/filemgr/src/site/xdoc/development/developer.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/site/xdoc/development/developer.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/site/xdoc/development/developer.xml (original)
+++ incubator/oodt/trunk/filemgr/src/site/xdoc/development/developer.xml Tue Jul 20 12:44:26 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2006 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <document>
    <properties>
       <title>CAS File Manager Developer Guide</title>
@@ -15,11 +24,9 @@
 
    <body>
    
-      <link rel="StyleSheet" href="../css/guides.css" type="text/css" media="screen"/>
-      
       <section name="Introduction">
         <p>
-          This is the developer guide for the OODT Catalog and Archive Service (CAS) 
+          This is the developer guide for the Apache OODT Catalog and Archive Service (CAS) 
           File Manager component, or File Manager for short. Primarily, this guide 
           will explain the File Manager architecture and interfaces, including its 
           tailorable extension points. For information on installation, configuration,
@@ -57,7 +64,7 @@
         the Transferer. The relationship between all of these components are shown in
         the diagram below:</p>
         
-        <img src="../images/fm_extension_points.png" alt="File Manager Architecture"/> 
+        <p><img src="../images/fm_extension_points.png" alt="File Manager Architecture"/></p>
         
         <p>The File Manager Server contains both a Repository that manages products 
         (and the products' location in the archive as specified by Versioner), and a
@@ -75,7 +82,7 @@
           
           <li><strong>Metadata</strong> - A map of key->multiple values of descriptive 
           information about a Product. See 
-          <a href="http://oodt.jpl.nasa.gov/cas-metadata/">CAS-Metadata</a> for more 
+          <a href="../../metadata/">CAS-Metadata</a> for more 
           information on Metadata.</li>
           
           <li><strong>Reference</strong> - A pointer to a Product file's (or files') 
@@ -91,7 +98,7 @@
           or "Creator". Elements may have additional metadata, in the form of the 
           associated definition and even a corresponding 
           <a href="http://dublincore.org/">Dublin Core</a> attribute. See 
-          <a href="http://oodt.jpl.nasa.gov/cas-metadata/">CAS-Metadata</a> for more 
+          <a href="../../metadata/">CAS-Metadata</a> for more 
           information on Metadata Elements.</li>
           
           <li><strong>Versioner</strong> - A URI generation scheme for Product Types 
@@ -339,70 +346,6 @@
       like scaling and other tips and tricks.</p> 
       
       </section>
-      
-      
-      <!--
-      <section name="Use Cases">
-        <p>
-          The File Manager was built to support several of the above capabilities outlined in 
-          Section 3. In particular there were several use cases that we wanted to support, some 
-          of which are described below.        
-        </p>
-      
-         <img src="../images/fm_use_case1.png" alt="File Manager Ingest Use Case"/>
-         
-         <p>The red numbers in the above Figure correspond to a sequence of steps that occurs and a 
-         series of interactions between the different File Manager extension points in order to 
-         perform the file ingestion activity. In Step 1, a File Manager client is invoked for the 
-         ingest operation, which sends Metadata and References for a particular Product to ingest 
-         to the File Manager server’s System Interface extension point. The System Interface uses 
-         the information about Product Type policy made available by the Repository Manager in order 
-         to understand whether or not the product should be transferred, where it’s root repository 
-         path should be, and so on. The System Interface then catalogs the file References and Metadata 
-         using the Catalog extension point. During this catalog process, the Catalog extension point 
-         uses the Validation Layer to determine which Elements should be extracted for the particular 
-         Product, based upon its Product Type. After that, Data Transfer is initiated either at the 
-         client or server end, and the first step to Data Transfer is using the Product’s associated 
-         Versioner to generate final file References. After final file References have been determined, 
-         the file data is transferred by the server or by the client, using the Data Transfer extension 
-         point.</p>
-         
-      </section>
-      <section name="Appendix">
-       <p>
-         Full list of File Manager extension point classes and their associated property names from the 
-         filemgr.properties file:       
-       </p>
-    
-       <table>
-         <tr>
-           <td>filemgr.catalog.factory</td>
-           <td>org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory<br/>
-               org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory
-           </td>
-         </tr>
-         <tr>
-           <td>filemgr.repository.factory</td>
-           <td>org.apache.oodt.cas.filemgr.repository.DataSourceRepositoryManagerFactory<br/>
-               org.apache.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory
-           </td>
-         </tr>
-         <tr>
-           <td>filemgr.datatransfer.factory</td>
-           <td>org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory<br/>
-               org.apache.oodt.cas.filemgr.datatransfer.RemoteDataTransferFactory<br/>
-               org.apache.oodt.cas.filemgr.datatransfer.InPlaceDataTransferFactory
-           </td>
-         </tr>
-         <tr>
-           <td>filemgr.validationLayer.factory</td>
-           <td>org.apache.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory<br/>
-               gov.nassa.jpl.oodt.cas.filemgr.validation.XMLValidationLayerFactory
-           </td>
-         </tr>
-       </table>
-      </section>
-      -->
-      
+
    </body>
 </document>

Modified: incubator/oodt/trunk/filemgr/src/site/xdoc/development/maven.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/site/xdoc/development/maven.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/site/xdoc/development/maven.xml (original)
+++ incubator/oodt/trunk/filemgr/src/site/xdoc/development/maven.xml Tue Jul 20 12:44:26 2010
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id$
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 -->
-
 <document>
   <properties>
     <title>Using Maven</title>
@@ -20,7 +28,7 @@ $Id$
       <a href="http://www.apache.org/">Apache Software Foundation</a> that improves 
       on <a href="http://ant.apache.org/">Ant</a> in the area of build management, 
       which it turn was an improvement on Make. This document describes the use of 
-      Maven for OODT build management.</p>
+      Maven for Apache OODT build management.</p>
     </section>
     
     <section name="Setup">
@@ -105,7 +113,7 @@ mvn install
       is to install the generated artifacts (e.g. pom, jar, etc.) in the user's 
       local Maven repository ($HOME/.m2/repository/). This is useful when the 
       artifact is a dependency for another project but has yet to be deployed 
-      to the SWSA Maven repository.</p>
+      to the Maven repository.</p>
     </subsection>
     <subsection name="Package a Project">
       <p>Create the project's distribution package with the following command:</p>

Modified: incubator/oodt/trunk/filemgr/src/site/xdoc/user/advanced.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/site/xdoc/user/advanced.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/site/xdoc/user/advanced.xml (original)
+++ incubator/oodt/trunk/filemgr/src/site/xdoc/user/advanced.xml Tue Jul 20 12:44:26 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <document>
    <properties>
       <title>CAS File Manager User Guide</title>
@@ -14,8 +23,6 @@
    </properties>
 
    <body>
-      <link rel="StyleSheet" href="../css/guides.css" type="text/css" media="screen"/>
-   
       <div class="warning">This document is in the process of being reorganized as
       part of our ongoing documentation effort. Please check back for updates.</div>  
    

Modified: incubator/oodt/trunk/filemgr/src/site/xdoc/user/basic.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/site/xdoc/user/basic.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/site/xdoc/user/basic.xml (original)
+++ incubator/oodt/trunk/filemgr/src/site/xdoc/user/basic.xml Tue Jul 20 12:44:26 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-  $Id$
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 -->
-
 <document>
    <properties>
       <title>CAS File Manager User Guide</title>
@@ -14,9 +23,6 @@
    </properties>
 
    <body>
-   
-      <link rel="StyleSheet" href="../css/guides.css" type="text/css" media="screen"/>
-      
       <div class="warning">This document is in the process of being reorganized as
       part of our ongoing documentation effort. Please check back for updates.</div>
       
@@ -47,7 +53,7 @@
         <source>
 >mkdir /usr/local/src
 >cd /usr/local/src        
->svn co http://oodt/repo/oodt-core        
+>svn co https://svn.apache.org/repos/asf/incubator/oodt/trunk/core oodt-core
         </source>
       <p>Once the subversion command completes you should have a directory at <code>/usr/local/src/oodt-core</code>
       which will contain a couple files.  In order to build the project from this source, issue the following 
@@ -62,24 +68,15 @@
         <br/>
         <br/>
         
-        <p>The most recent CAS-File Manager project can be downloaded from the OODT
-        <a href="http://oodt.jpl.nasa.gov">website</a> or it can be checked out 
+        <p>The most recent CAS-File Manager project can be downloaded from the Apache OODT
+        <a href="/">website</a> or it can be checked out 
         from the OODT repository using Subversion. The CAS-File Manager project is 
-        located at <code>http://oodt/repo/cas-filemgr/</code>. We recommend checking
-        out the latest released version (v1.8.0 at the time of writing), which can be 
-        found at <code>http:/oodt/repo/cas-filemgr/tags/X_X_X_release</code>. For
-        more information on using Subversion, see our 
-        <a href="../development/subversion.html">Subversion Guide.</a></p>
+        located at <code>https://svn.apache.org/repos/asf/incubator/oodt/trunk/filemgr/</code>.</p>
       
         <p>Maven is the build management system used for OODT projects. We currently 
         support Maven 2.0 and later. For more information on Maven, see our 
         <a href="../development/maven.html">Maven Guide.</a></p>
       
-        <div class="warning">Prior to Release 1.5.0, CAS-File Manager can only be
-        built with Maven 1. Maven 1 and Maven 2 are not compatible (and very 
-        different from one another). For more information on Maven 1, see their
-        <a href="http://maven.apache.org/maven-1.x/">website.</a></div>
-        
         <p>Assuming a *nix-like environment, with both Maven and Subversion 
         clients installed and on your path, an example of the checkout and 
         build process is presented below:</p>
@@ -87,19 +84,18 @@
          <source>
 > mkdir /usr/local/src
 > cd /usr/local/src
-> svn checkout http://oodt/repo/cas-filemgr/tags/1_8_0_release \
-    cas-filemgr-v1.8.0       
+> svn checkout https://svn.apache.org/repos/asf/incubator/oodt/trunk/filemgr
       </source>
         
       <p>After the Subversion command completes, you will have the source
-      for the CAS-Filemgr project in the <code>/usr/local/src/cas-filemgr-v1.8.0</code>
+      for the CAS-Filemgr project in the <code>/usr/local/src/filemgr</code>
       directory.</p>
       
       <p>In order to build the project from this source, issue the following 
       commands:</p>
       
       <source>
-> cd /usr/local/src/cas-filemgr-v1.8.0
+> cd /usr/local/src/filemgr
 > mvn package    
       </source>   
       
@@ -109,16 +105,16 @@
       you will see a Maven success banner.</p>
       
       <p>Once the Maven command completes successfully, you should have a 
-      <code>target</code> directory under <code>cas-filemgr-v1.8.0/</code>. 
+      <code>target</code> directory under <code>cas-filemgr-vX.Y.Z/</code>. 
       The project has been built in this directory as a distribution tar ball.
       In order to move the built project out of the source directory and unpack the
       tar ball, issue the following commands:</p>
       
       <source>
 > cd /usr/local
-> mv src/cas-filemgr-v1.8.0/trunk/cas-filemgr-v1.8.0-dist.tar.gz ./
-> tar -xvzf cas-filemgr-v1.8.0-dist.tar.gz
-> export FILEMGR_HOME=/usr/local/cas-filemgr-v1.8.0
+> mv src/filemgr/trunk/cas-filemgr-vX.Y.Z-dist.tar.gz ./
+> tar -xvzf cas-filemgr-vX.Y.Z-dist.tar.gz
+> export FILEMGR_HOME=/usr/local/cas-filemgr-vX.Y.Z
       </source>       
       
       <p>The resultant directory layout from the unpacked tarball is as follows:</p>
@@ -157,7 +153,7 @@ bin/ etc/ logs/ doc/ lib/ policy/ LICENS
          project.</li>
        </ul>
       
-      <p>Now you have a built File Manager at <code>/usr/local/cas-filemgr-v1.8.0</code>.
+      <p>Now you have a built File Manager at <code>/usr/local/cas-filemgr-vX.Y.Z</code>.
       In the next section, we will discuss how you can configure the File Manager for
       basic operations.</p>
       
@@ -253,11 +249,12 @@ bin/ etc/ logs/ doc/ lib/ policy/ LICENS
       command using the filemgr-client command below. First create a simple text file 
       called "blah.txt" and place it inside <code>$FILEMGR_HOME/bin</code> Then, create 
       a blank metadata file for the product, using the 
-      <a href="http://oodt.jpl.nasa.gov/vc/svn/cas-metadata/trunk/src/main/conf/cas.metadata.xsd">schema</a>
-      or  <a href="http://oodt.jpl.nasa.gov/vc/svn/cas-metadata/trunk/src/main/conf/cas.metadata.dtd">DTD</a>
-      provided in the <a href="http://oodt.jpl.nasa.gov/cas-metadata">CAS-Metadata</a>
+      <a href="https://svn.apache.org/repos/asf/incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.xsd">schema</a>
+      or  <a href="https://svn.apache.org/repos/asf/incubator/oodt/trunk/metadata/src/main/conf/cas.metadata.dtd">DTD</a>
+      provided in the <a href="../../metadata">CAS-Metadata</a>
       project. An example XML file might be:</p>
       
+      <!-- FIXME: change namespace URI? -->
       <source>
         &lt;cas:metadata xmlns:cas=&quot;http://oodt.jpl.nasa.gov/1.0/cas&quot;&gt;
         &lt;/cas:metadata&gt;

Modified: incubator/oodt/trunk/filemgr/src/site/xdoc/user/index.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/site/xdoc/user/index.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/site/xdoc/user/index.xml (original)
+++ incubator/oodt/trunk/filemgr/src/site/xdoc/user/index.xml Tue Jul 20 12:44:26 2010
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2009 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-  $Id$
--->
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <document>
    <properties>
       <title>CAS File Manager User Guide</title>
@@ -14,8 +23,7 @@
    </properties>
 
    <body>
-      <link rel="StyleSheet" href="../css/guides.css" type="text/css" media="screen"/>
-   
+  
       <div class="warning">This document is in the process of being reorganized as
       part of our ongoing documentation effort. Please follow the links below to find
       information that has previously been hosted on this page.</div>
@@ -24,7 +32,7 @@
       <p>We are in the process of upgrading OODT documentation. In the near
       future, we hope to provide information for developers regarding each 
       component, including its purpose, structure, interfaces, and 
-      configuration points in a <a href=".../development/developer.html">Developer
+      configuration points in a <a href="../development/developer.html">Developer
       Guide.</a></p>
       
       <p>Information for users, including installation and basic configuration,

Modified: incubator/oodt/trunk/metadata/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/site/site.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/site/site.xml (original)
+++ incubator/oodt/trunk/metadata/src/site/site.xml Tue Jul 20 12:44:26 2010
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-  Copyright (c) 2006 California Institute of Technology.
-  ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-  $Id$
--->
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
 
-<project name="cas-metadata" href="http://oodt.jpl.nasa.gov/cas-metadata/">
+     http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+<project name="cas-metadata">
   <body>
     <links>
       <item name="OODT" href="../oodt-site/"/>

Modified: incubator/oodt/trunk/metadata/src/site/xdoc/user/advanced.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/site/xdoc/user/advanced.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/site/xdoc/user/advanced.xml (original)
+++ incubator/oodt/trunk/metadata/src/site/xdoc/user/advanced.xml Tue Jul 20 12:44:26 2010
@@ -94,7 +94,7 @@ the License.
     <p><strong>Date-Time</strong></p>
     
     <p>With time, consistency is key. There are multiple formats, such as 
-    <a href="http://tycho.usno.navy.mil/mjd.html">Julien Day Numbers</a>, or UTC. 
+    <a href="http://tycho.usno.navy.mil/mjd.html">Julian Day Numbers</a>, or UTC. 
     Additionally, there are different time standards such as 
     <a href="http://www.w3.org/TR/NOTE-datetime">UTC</a>, local time, and 
     <a href="http://www.bipm.org/en/scientific/tai/">TAI</a>. One also needs to be 

Modified: incubator/oodt/trunk/metadata/src/site/xdoc/user/basic.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/site/xdoc/user/basic.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/site/xdoc/user/basic.xml (original)
+++ incubator/oodt/trunk/metadata/src/site/xdoc/user/basic.xml Tue Jul 20 12:44:26 2010
@@ -28,8 +28,8 @@ the License.
     behind the CAS-Metadata project, including the basics of metadata, how to write 
     metadata extractors, and explanations of existing metadata extractors. In 
     addition to this guide, some of these concepts are also covered in our
-    CAS-File Manager <a href="http://oodt.jpl.nasa.gov/cas-filemgr/user/">User Guide</a>
-    and in our CAS-Curator <a href="http://oodt.jpl.nasa.gov/cas-filemgr/user/basic.html">
+    CAS-File Manager <a href="../../filemgr/user/">User Guide</a>
+    and in our CAS-Curator <a href="../../curator/user/basic.html">
     Basic User Guide</a>. For advanced topics, including extracting techniques to allow
     for type-based matching, see our <a href="../user/advanced.html">Advanced Guide.</a>
     In the rest of this guide, we will cover the following topics:</p>
@@ -109,7 +109,7 @@ public class Metadata {
     <p>In addition to the accessor and modifier methods that work with simple Strings,
     the <code>Metadata</code> Object can work with XML Documents. An example of 
     metadata in the XML format is given below:</p>
-    
+    <!-- FIXME: change namespace URI? -->
     <source><![CDATA[<cas:metadata xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
   <keyval>
     <key>ProductType</key>
@@ -270,7 +270,7 @@ public class Metadata {
      </ul>
      
      <p>For an example of the use of this type of metadata extractor, we our 
-     CAS-Curator <a href="http://oodt.jpl.nasa.gov/cas-curator/user/basic.html">
+     CAS-Curator <a href="../../curator/user/basic.html">
      Basic User Guide</a>.</p>
      
      </subsection>
@@ -386,7 +386,7 @@ FileLocation.pattern=/new/loc/[FileLocat
     <p>The most common use-case of CAS-Metadata is to capture the output of a metadata
     extractor for use in the CAS-Filemgr's ingestion process.</p>
     
-    <img src="../images/metadata.jpg"/>
+    <p><img src="../images/metadata.jpg"/></p>
     
     <p>In the above diagram, a metadata object is producted by an extractor. The 
     product and its associated metadata are both ingested into the CAS-Filemgr.

Modified: incubator/oodt/trunk/product/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/site/site.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/site/site.xml (original)
+++ incubator/oodt/trunk/product/src/site/site.xml Tue Jul 20 12:44:26 2010
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
 <project name="Product Service">
 
   <body>
@@ -9,7 +25,6 @@
 
     <menu ref="reports" inherit="bottom"/>
     <menu name="User's Guide">
-      <item name="Tutorials" href="tutorials/"/>
       <item name="Product Servlet" href="servlet/"/>
     </menu>
   </body>

Modified: incubator/oodt/trunk/product/src/site/xdoc/servlet/index.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/site/xdoc/servlet/index.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/site/xdoc/servlet/index.xml (original)
+++ incubator/oodt/trunk/product/src/site/xdoc/servlet/index.xml Tue Jul 20 12:44:26 2010
@@ -1,227 +1,227 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <title>Using the Product Servlet</title>
-    <author email="Sean.Kelly@jpl.nasa.gov">Sean Kelly</author>
-  </properties>
-
-  <body>
-    <section name="Using the Product Servlet">
-      <p>The query servlet is nice for general purpose queries, but for
-	those who just want to retrieve products, it's a bit annoying to
-	have to process all that XML and do base-64 conversions.  Is there
-	a simpler way?  Absolutely.  The product servlet deals with just
-	products, and delivers them in their appropriate form direct over
-	HTTP.
-      </p>
-    </section>
-    <section name="Requirements">
-
-      <p>The product servlet provides HTTP access to products, so
-	naturally, you'll need to use a language or system that supports
-	HTTP client access to HTTP servers.  Where can you find such a
-	system?  Your handy-dandy web browser is one!  Most programming
-	languages also have HTTP APIs either built-in or freely available.
-      </p>
-
-      <p>You also need to know</p>
-
-      <ul>
-	<li>The URL of the product servlet that has access to the
-	  product server you want to query.</li>
-	<li>The object name of the product server you want to
-	  access.</li>
-	<li>The keyword query expression that can be understood by the
-	  product server.</li>
-      </ul>
-    </section>
-    <section name="Making a Query">
-
-      <p>The product servlet accepts either <code>GET</code> or
-	<code>POST</code> requests of URL-encoded form data.  In
-	response, it delivers a matching product (if any can be found)
-	in the format appropriate to the product's MIME type.  You can
-	also request a specific MIME type.  If there's no matching
-	product, you get HTTP error 404 (not found).
-      </p>
-
-      <p>The parameters that the servlet expects are:</p>
-
-      <table border="0" cellpadding="3" cellspacing="0">
-
-	<thead>
-	  <tr>
-	    <th style="border-bottom: solid black thin; border-top: solid black thin">Parameter Name</th>
-	    <th style="border-bottom: solid black thin; border-top: solid black thin">Obligation</th>
-	    <th style="border-bottom: solid black thin; border-top: solid black thin">Meaning</th>
-	  </tr>
-	</thead>
-
-	<tbody>
-	  <tr bgcolor="#eeeeee">
-	    <td><code>object</code></td>
-	    <td>Once</td>
-	    <td>Names the product server to receive the query.  This
-	      parameter must be specified exactly once and takes the form
-	      <code>urn:eda:<var>proto</var>:<var>name</var></code>, such
-	      as <code>urn:eda:rmi:PDS.Atmos.Product</code> for the
-	      RMI-accessed Atmoshpheres node of the Planetary Data System.
-	    </td>
-
-	  </tr>
-
-	  <tr>
-	    <td><code>keywordQuery</code></td>
-	    <td>Once</td>
-	    <td>Lists the keyword query expression to pass to the
-	      product server, such as <code>PatientID = 19928</code> or
-	      <code>ONLINE_FILE_SPECIFICATION_NAME =
-		data/images/mars.jpg</code>.
-	    </td>
-
-	  </tr>
-
-	  <tr bgcolor="#eeeeee">
-	    <td><code>id</code></td>
-	    <td>None or Once</td>
-	    <td>Optional parameter that identifies a single product to
-	      retrieve if more than one product match.  A product server
-	      may return multiple matching products.  By default, the
-	      product servlet returns the first matching product only.  By
-	      specifying the <code>id</code> parameter, you can select a
-	      specific product when more than one match.  (In practice,
-	      not a single product server <em>to date</em> has ever
-	      returned more than one match.)
-	    </td>
-
-	  </tr>
-
-	  <tr>
-	    <td><code>mimeType</code></td>
-	    <td>Zero to Many</td>
-	    <td>Optional parameter that lists acceptable MIME types for
-	      the product (see below).
-	    </td>
-
-	  </tr>
-
-	</tbody>
-      </table>
-    </section>
-    <section name="MIME Types">
-
-      <p>Many product servers are capable of conversion of products from
-	a system-specific storage medium into an Internet-standard
-	interoperable format.  Internet-standard MIME types are what
-	drives this mechanism.  The product servlet can take a list of
-	specific MIME types and pass them to the product server for
-	consideration in retrieving your products.
-      </p>
-
-      <p>MIME type conversions are like <em>suggestions</em> to product
-	servers.  Product servers are not obligated to honor all
-	conversions, and indeed you may well receive 404 (not found) for a
-	conversion that makes no sense to a particular product server
-	(such as an audio clip to <code>text/html</code>).
-      </p>
-
-      <p>The <code>mimeType</code> parameter is what drives this
-	mechanism.  By specifying one or more <code>mimeType</code>
-	parameters in your <code>GET</code> or <code>POST</code> request,
-	you list the preferred MIME types in which you would like the
-	product delivered.  Furthermore, you can use wildcards to further
-	enable a product server to satisfy you.  The ordering of the
-	parameters is significant.
-      </p>
-
-      <p>Here are some examples.  Suppose the request URI part of the
-	URL contained:</p>
-
-      <pre>...mimeType=text/rtf&amp;mimeType=text/*...</pre>
-
-      <p>This specifies two MIME types:</p>
-
-      <ol>
-	<li><code>text/rtf</code>, the Rich Text Format, is the
-	  preferred format for delivering products.
-	</li>
-
-	<li><code>text/*</code> means any text type.  Any text is better
-	  than no text if for some reason the product server can't give a
-	  Rich Text Format product.
-	</li>
-      </ol>
-
-      <p>Here's another example:</p>
-
-      <pre>...mimeType=image/png&amp;mimeType=image/jpeg...</pre>
-
-      <p>This indicates that you'd like a Portable Network Graphic
-	format image, if possible, but will settle for a JPEG-JFIF format
-	image.  No other image format (especially not the proprietary and
-	ancient GIF format) is acceptable.  Adding an additional
-	<code>&amp;mimeType=image/*</code> would mean any image format
-	would be fine.  Adding <code>&amp;mimeType=*/*</code> means
-	<em>any format</em> would be acceptable, be it audio, video, text,
-	image, or otherwise.
-      </p>
-
-      <p>If there are <em>no</em> <code>mimeType</code> parameters, then
-	the product servlet uses a default list containing just
-	<code>*/*</code>, meaning any type is fine.
-      </p>
-    </section>
-    <section name="Example">
-
-      <p>To retrieve an image of Mars from the PDS product server at the
-	Imaging Node, in PNG format if possible and any image format
-	otherwise, try the following:
-      </p>
-
-      <p><code><a
-	    href="http://starbrite.jpl.nasa.gov/prod?mimeType=image/png&amp;mimeType=image/*&amp;object=urn:eda:rmi:PDS.Img.Product&amp;keywordQuery=ONLINE_FILE_SPECIFICATION_NAME+%3D+thumbnail/mgs-m-moc-na_wa-2-sdp-l0-v1.0/mgsc_1082/m09063/m0906352.imq.jpg">http://starbrite.jpl.nasa.gov/prod?<br/>mimeType=image/png&amp;<br/>mimeType=image/*&amp;<br/>object=urn:eda:rmi:PDS.Img.Product&amp;<br/>keywordQuery=OFSN+%3D+thumbnail/mgs-m-moc-na_wa-2-sdp-l0-v1.0/mgsc_1082/m09063/m0906352.imq.jpg</a></code></p>
-
-      <p>This URL contains linebreaks for readability only.  Let's take
-	this URL apart to see what's going on:
-      </p>
-
-      <ul>
-	<li>The URL to the product servlet in this case is
-	  <code>http://starbrite.jpl.nasa.gov/prod</code>.  Often the URL
-	  will take this form, or may be
-	  <code>http://<var>hostname</var>/servlet/jpl.oodt.servlets.ProductServlet</code>.
-	  Most people prefer the shorter form.
-	</li>
-
-	<li>The question mark <code>?</code> separates the request URI
-	  from its parameters.
-	</li>
-
-	<li>The first parameter, <code>mimeType=image/png</code>, says
-	  that Portable Network Graphics images are preferred.
-	</li>
-
-	<li>The second parameter, <code>mimeType=image/*</code>, says
-	  that if the product server can't convert to or other provide
-	  Portable Network Graphics format images, then <em>any image
-	    format</em> is acceptable.
-	</li>
-
-	<li>The third parameter,
-	  <code>object=urn:eda:rmi:PDS.Img.Product</code>, identifies the
-	  product server.
-	</li>
-
-	<li>The fourth parameter, <code>keywordQuery=...</code> names
-	  the query expression.  In this case, it's <code>OFSN =
-	    thumbnail/mgs-m-moc-na_wa-2-sdp-l0-v1.0/mgsc_1082/m09063/m0906352.imq.jpg</code>.
-	</li>
-      </ul>
-
-      <p>The response to this URL's GET request is a JPEG-JFIF image
-	(sorry, PNG's not yet available from the PDS Image Node)
-	containing a picture of some planetary surface.  Neat, huh?
-      </p>
-    </section>
-  </body>
-</document>
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+  <properties>
+    <title>Using the Product Servlet</title>
+    <author email="kelly@apache.org">Sean Kelly</author>
+  </properties>
+
+  <body>
+    <section name="Using the Product Servlet">
+      <p>The query servlet is nice for general purpose queries, but for
+	those who just want to retrieve products, it's a bit annoying to
+	have to process all that XML and do base-64 conversions.  Is there
+	a simpler way?  Absolutely.  The product servlet deals with just
+	products, and delivers them in their appropriate form direct over
+	HTTP.
+      </p>
+    </section>
+    <section name="Requirements">
+
+      <p>The product servlet provides HTTP access to products, so
+	naturally, you'll need to use a language or system that supports
+	HTTP client access to HTTP servers.  Where can you find such a
+	system?  Your handy-dandy web browser is one!  Most programming
+	languages also have HTTP APIs either built-in or freely available.
+      </p>
+
+      <p>You also need to know</p>
+
+      <ul>
+	<li>The URL of the product servlet that has access to the
+	  product server you want to query.</li>
+	<li>The object name of the product server you want to
+	  access.</li>
+	<li>The keyword query expression that can be understood by the
+	  product server.</li>
+      </ul>
+    </section>
+    <section name="Making a Query">
+
+      <p>The product servlet accepts either <code>GET</code> or
+	<code>POST</code> requests of URL-encoded form data.  In
+	response, it delivers a matching product (if any can be found)
+	in the format appropriate to the product's MIME type.  You can
+	also request a specific MIME type.  If there's no matching
+	product, you get HTTP error 404 (not found).
+      </p>
+
+      <p>The parameters that the servlet expects are:</p>
+
+      <table border="0" cellpadding="3" cellspacing="0">
+
+	<thead>
+	  <tr>
+	    <th>Parameter Name</th>
+	    <th>Obligation</th>
+	    <th>Meaning</th>
+	  </tr>
+	</thead>
+
+	<tbody>
+	  <tr>
+	    <td><code>object</code></td>
+	    <td>Once</td>
+	    <td>Names the product server to receive the query.  This
+	      parameter must be specified exactly once and takes the form
+	      <code>urn:eda:<var>proto</var>:<var>name</var></code>, such
+	      as <code>urn:eda:rmi:PDS.Atmos.Product</code> for the
+	      RMI-accessed Atmoshpheres node of the Planetary Data System.
+	    </td>
+
+	  </tr>
+
+	  <tr>
+	    <td><code>keywordQuery</code></td>
+	    <td>Once</td>
+	    <td>Lists the keyword query expression to pass to the
+	      product server, such as <code>PatientID = 19928</code> or
+	      <code>ONLINE_FILE_SPECIFICATION_NAME =
+		data/images/mars.jpg</code>.
+	    </td>
+
+	  </tr>
+
+	  <tr>
+	    <td><code>id</code></td>
+	    <td>None or Once</td>
+	    <td>Optional parameter that identifies a single product to
+	      retrieve if more than one product match.  A product server
+	      may return multiple matching products.  By default, the
+	      product servlet returns the first matching product only.  By
+	      specifying the <code>id</code> parameter, you can select a
+	      specific product when more than one match.  (In practice,
+	      not a single product server <em>to date</em> has ever
+	      returned more than one match.)
+	    </td>
+
+	  </tr>
+
+	  <tr>
+	    <td><code>mimeType</code></td>
+	    <td>Zero to Many</td>
+	    <td>Optional parameter that lists acceptable MIME types for
+	      the product (see below).
+	    </td>
+
+	  </tr>
+
+	</tbody>
+      </table>
+    </section>
+    <section name="MIME Types">
+
+      <p>Many product servers are capable of conversion of products from
+	a system-specific storage medium into an Internet-standard
+	interoperable format.  Internet-standard MIME types are what
+	drives this mechanism.  The product servlet can take a list of
+	specific MIME types and pass them to the product server for
+	consideration in retrieving your products.
+      </p>
+
+      <p>MIME type conversions are like <em>suggestions</em> to product
+	servers.  Product servers are not obligated to honor all
+	conversions, and indeed you may well receive 404 (not found) for a
+	conversion that makes no sense to a particular product server
+	(such as an audio clip to <code>text/html</code>).
+      </p>
+
+      <p>The <code>mimeType</code> parameter is what drives this
+	mechanism.  By specifying one or more <code>mimeType</code>
+	parameters in your <code>GET</code> or <code>POST</code> request,
+	you list the preferred MIME types in which you would like the
+	product delivered.  Furthermore, you can use wildcards to further
+	enable a product server to satisfy you.  The ordering of the
+	parameters is significant.
+      </p>
+
+      <p>Here are some examples.  Suppose the request URI part of the
+	URL contained:</p>
+
+      <pre>...mimeType=text/rtf&amp;mimeType=text/*...</pre>
+
+      <p>This specifies two MIME types:</p>
+
+      <ol>
+	<li><code>text/rtf</code>, the Rich Text Format, is the
+	  preferred format for delivering products.
+	</li>
+
+	<li><code>text/*</code> means any text type.  Any text is better
+	  than no text if for some reason the product server can't give a
+	  Rich Text Format product.
+	</li>
+      </ol>
+
+      <p>Here's another example:</p>
+
+      <pre>...mimeType=image/png&amp;mimeType=image/jpeg...</pre>
+
+      <p>This indicates that you'd like a Portable Network Graphic
+	format image, if possible, but will settle for a JPEG-JFIF format
+	image.  No other image format (especially not the proprietary and
+	ancient GIF format) is acceptable.  Adding an additional
+	<code>&amp;mimeType=image/*</code> would mean any image format
+	would be fine.  Adding <code>&amp;mimeType=*/*</code> means
+	<em>any format</em> would be acceptable, be it audio, video, text,
+	image, or otherwise.
+      </p>
+
+      <p>If there are <em>no</em> <code>mimeType</code> parameters, then
+	the product servlet uses a default list containing just
+	<code>*/*</code>, meaning any type is fine.
+      </p>
+    </section>
+    <section name="Example">
+
+      <p>To retrieve an image of Mars from the PDS product server at the
+	Imaging Node, in PNG format if possible and any image format
+	otherwise, try the following:
+      </p>
+
+      <p><code><a
+	    href="http://starbrite.jpl.nasa.gov/prod?mimeType=image/png&amp;mimeType=image/*&amp;object=urn:eda:rmi:PDS.Img.Product&amp;keywordQuery=ONLINE_FILE_SPECIFICATION_NAME+%3D+thumbnail/mgs-m-moc-na_wa-2-sdp-l0-v1.0/mgsc_1082/m09063/m0906352.imq.jpg">http://starbrite.jpl.nasa.gov/prod?<br/>mimeType=image/png&amp;<br/>mimeType=image/*&amp;<br/>object=urn:eda:rmi:PDS.Img.Product&amp;<br/>keywordQuery=OFSN+%3D+thumbnail/mgs-m-moc-na_wa-2-sdp-l0-v1.0/mgsc_1082/m09063/m0906352.imq.jpg</a></code></p>
+
+      <p>This URL contains linebreaks for readability only.  Let's take
+	this URL apart to see what's going on:
+      </p>
+
+      <ul>
+	<li>The URL to the product servlet in this case is
+	  <code>http://starbrite.jpl.nasa.gov/prod</code>.  Often the URL
+	  will take this form, or may be
+	  <code>http://<var>hostname</var>/servlet/jpl.oodt.servlets.ProductServlet</code>.
+	  Most people prefer the shorter form.
+	</li>
+
+	<li>The question mark <code>?</code> separates the request URI
+	  from its parameters.
+	</li>
+
+	<li>The first parameter, <code>mimeType=image/png</code>, says
+	  that Portable Network Graphics images are preferred.
+	</li>
+
+	<li>The second parameter, <code>mimeType=image/*</code>, says
+	  that if the product server can't convert to or other provide
+	  Portable Network Graphics format images, then <em>any image
+	    format</em> is acceptable.
+	</li>
+
+	<li>The third parameter,
+	  <code>object=urn:eda:rmi:PDS.Img.Product</code>, identifies the
+	  product server.
+	</li>
+
+	<li>The fourth parameter, <code>keywordQuery=...</code> names
+	  the query expression.  In this case, it's <code>OFSN =
+	    thumbnail/mgs-m-moc-na_wa-2-sdp-l0-v1.0/mgsc_1082/m09063/m0906352.imq.jpg</code>.
+	</li>
+      </ul>
+
+      <p>The response to this URL's GET request is a JPEG-JFIF image
+	(sorry, PNG's not yet available from the PDS Image Node)
+	containing a picture of some planetary surface.  Neat, huh?
+      </p>
+    </section>
+  </body>
+</document>

Modified: incubator/oodt/trunk/profile/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/profile/src/site/site.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/profile/src/site/site.xml (original)
+++ incubator/oodt/trunk/profile/src/site/site.xml Tue Jul 20 12:44:26 2010
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Profile Service" href="http://oodt.jpl.nasa.gov/grid-profile/">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+
+<project name="Profile Service">
 
   <body>
     <links>
@@ -8,12 +25,5 @@
     </links>
 
     <menu ref="reports" inherit="bottom"/>
-    <menu name="User's Guide">
-      <item name="Information Captured" href="info/"/>
-      <item name="Querying Profiles" href="querying/"/>
-      <item name="Profile Repr." href="rep/"/>
-      <item name="Basic Handler" href="handler/"/>
-      <item name="Advanced Handler" href="adv/"/>
-    </menu>
   </body>
 </project>

Modified: incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml (original)
+++ incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml Tue Jul 20 12:44:26 2010
@@ -206,21 +206,18 @@ the License.
       </section>
       <section name="Configuration and Installation">
        <p>
-       To install the Resource Manager, you need to download a <a href="http://oodt.jpl.nasa.gov/cas-resource/">release</a>
+       To install the Resource Manager, you need to download a <a href="../../">release</a>
        of the Resource Manager, available from its home web site. For bleeding-edge features, you can
-       also check out the cas-resource trunk project from the OODT subversion repository. You can browse 
-       the repository using ViewCVS, located at:
+       also check out the resource trunk project from the OODT subversion repository. You can browse 
+       the repository using ViewCVS, located at:</p>
        
-       <code>http://oodt.jpl.nasa.gov/vc/svn/</code>
+       <screen>http://svn.apache.org/viewvc/incubator/oodt/</screen>
        
-       The actual web url for the repository is located at: 
+       <p>The actual web url for the repository is located at:</p>
        
-       <code>http://oodt.jpl.nasa.gov/repo/</code>
+       <screen>https://svn.apache.org/repos/asf/incubator/oodt/trunk/resource</screen>
 
-       To check out the Resource Manager, use your favorite Subversion client. Several clients are 
-       listed a <a href="http://oodt.jpl.nasa.gov/wiki/display/oodt/Subversion">
-       http://oodt.jpl.nasa.gov/wiki/display/oodt/Subversion</a>.
-      </p>   
+       <p>To check out the Resource Manager, use your favorite Subversion client.</p>   
       
       <subsection name="Project Organization">
         <p>
@@ -373,6 +370,7 @@ the License.
       Job, defined in the XML file below (save the file to a location on your system, such as
       <code>/usr/local/resmgr/examples/exJob.xml</code>):</p>
       
+      <!-- FIXME: Change namespace URI? -->
       <source>
       &lt;?xml version="1.0" encoding="UTF-8" ?&gt;
       &lt;cas:job xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas" id="abcd"
@@ -457,6 +455,13 @@ the License.
          resource.properties file:       
        </p>
        <table>
+         <thead>
+            <tr>
+                <th>Property Name</th>
+                <th>Extension Point Class</th>
+            </tr>
+         </thead>
+         <tbody>
          <tr>
            <td>resource.batchmgr.factory</td>
            <td>org.apache.oodt.cas.resource.batchmgr.XmlRpcBatchMgrFactory
@@ -481,6 +486,7 @@ the License.
            <td>resource.jobrepo.factory</td>
            <td>org.apache.oodt.cas.resource.jobrepo.MemoryJobRepositoryFactory</td>
          </tr>
+         </tbody>
        </table>
       
       </section>

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/development/developer.xml Tue Jul 20 12:44:26 2010
@@ -24,8 +24,6 @@ the License.
 
    <body>
    
-      <link rel="StyleSheet" href="../css/guides.css" type="text/css" media="screen"/>
-      
       <section name="Introduction">
         <p>
           This is the developer guide for the OODT Catalog and Archive Service (CAS) 
@@ -70,7 +68,7 @@ the License.
         The relationship between all of these components are shown in the diagram 
         below:</p>
         
-        <img src="../images/wm_extension_points.png" alt="Workflow Manager Architecture"/>
+        <p><img src="../images/wm_extension_points.png" alt="Workflow Manager Architecture"/></p>
         
         <p>The Workflow Manager Server contains both a Workflow Repository that manages 
         workflow models, and Workflow Engine that processes workflow instances. The Workflow
@@ -123,7 +121,7 @@ the License.
         as does each Workflow Condition have a corresponding Workflow Condition Instance. 
         These relationships are shown in the below figure.</p>
         
-        <img src="../images/wm_object_model.png" alt="Workflow Manager Object Model"/>
+        <p><img src="../images/wm_object_model.png" alt="Workflow Manager Object Model"/></p>
         </subsection>
       
         <subsection name="Key Capabilities">
@@ -133,7 +131,7 @@ the License.
         
 		<p><strong>Explicit Modeling.</strong> The Workflow manager captures both
         identified workflow patterns (control-flow) and data-flow between Workflow Task 
-        Instances. Workflows are directed graphs, allowing for truew parallelism.</p>
+        Instances. Workflows are directed graphs, allowing for true parallelism.</p>
           
         <p><strong>Persistence.</strong> Support for persistance of Workflow Instances 
         to several backend repositories, including relational databases, and Apache 
@@ -268,7 +266,7 @@ the License.
          
         <subsection name="Workflow Engine">
           <ul>
-             <li><strong>ThreadPoolWorkflowEngine.</strong> An implementaiton of the 
+             <li><strong>ThreadPoolWorkflowEngine.</strong> An implementation of the 
              Workflow Engine that itself is meant to be an extension point for 
              WorkflowEngines that want to implement ThreadPooling. This WorkflowEngine 
              provides everything needed to manage a ThreadPool using Doug Lea's wonderful 

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/user/advanced.xml Tue Jul 20 12:44:26 2010
@@ -23,7 +23,6 @@ the License.
    </properties>
 
    <body>
-      <link rel="StyleSheet" href="../css/guides.css" type="text/css" media="screen"/>
    
       <div class="warning">This document is in the process of being reorganized as
       part of our ongoing documentation effort. Please check back for updates.</div>  

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/user/basic.xml Tue Jul 20 12:44:26 2010
@@ -24,8 +24,6 @@ the License.
 
    <body>
    
-      <link rel="StyleSheet" href="../css/guides.css" type="text/css" media="screen"/>
-      
       <div class="warning">This document is in the process of being reorganized as
       part of our ongoing documentation effort. Please check back for updates.</div>
       
@@ -48,24 +46,16 @@ the License.
      
       <a name="section1"/>
       <section name="Download and Build">
-        <p>The most recent CAS-Workflow Manager project can be downloaded from the OODT
-        <a href="http://oodt.jpl.nasa.gov">website</a> or it can be checked out 
+        <p>The most recent CAS-Workflow Manager project can be downloaded from the Apache OODT
+        <a href="/">website</a> or it can be checked out 
         from the OODT repository using Subversion. The CAS-Workflow Manager project is 
-        located at <code>http://oodt/repo/cas-workflow/</code>. We recommend checking
-        out the latest released version (v1.5.1 at the time of writing), which can be 
-        found at <code>http:/oodt/repo/cas-workflow/tags/X_X_X_release</code>. For
-        more information on using Subversion, see our 
-        <a href="../development/subversion.html">Subversion Guide.</a></p>
+        located at <code>../../workflow/</code>. We recommend checking
+        out the latest released version (v1.5.1 at the time of writing).</p>
       
         <p>Maven is the build management system used for OODT projects. We currently 
         support Maven 2.0 and later. For more information on Maven, see our 
         <a href="../development/maven.html">Maven Guide.</a></p>
       
-        <div class="warning">Prior to Release 1.4.0, CAS-Workflow Manager can only be
-        built with Maven 1. Maven 1 and Maven 2 are not compatible (and very 
-        different from one another). For more information on Maven 1, see their
-        <a href="http://maven.apache.org/maven-1.x/">website.</a></div>
-        
         <p>Assuming a *nix-like environment, with both Maven and Subversion 
         clients installed and on your path, an example of the checkout and 
         build process is presented below:</p>
@@ -73,19 +63,18 @@ the License.
          <source>
 > mkdir /usr/local/src
 > cd /usr/local/src
-> svn checkout http://oodt/repo/cas-workflow/tags/1_5_1_release \
-    cas-workflow-v1.5.1       
+> svn checkout https://svn.apache.org/repos/asf/incubator/oodt/trunk/workflow workflow
       </source>
         
       <p>After the Subversion command completes, you will have the source
-      for the CAS-Workflow project in the <code>/usr/local/src/cas-workflow-v1.5.1</code>
+      for the CAS-Workflow project in the <code>/usr/local/src/workflow</code>
       directory.</p>
       
       <p>In order to build the project from this source, issue the following 
       commands:</p>
       
       <source>
-> cd /usr/local/src/cas-workflow-v1.5.1
+> cd /usr/local/src/workflow
 > mvn package    
       </source>   
       
@@ -94,16 +83,16 @@ the License.
       the process, you will see a Maven success banner.</p>
       
       <p>Once the Maven command completes successfully, you should have a 
-      <code>target</code> directory under <code>cas-workflow-v1.5.1/</code>. 
+      <code>target</code> directory under <code>-workflow</code>. 
       The project has been built in this directory as a distribution tar ball.
       In order to move the built project out of the source directory and unpack the
       tar ball, issue the following commands:</p>
       
       <source>
 > cd /usr/local
-> mv src/cas-workflow-v1.5.1/trunk/cas-workflow-v1.5.1-dist.tar.gz ./
-> tar -xvzf cas-workflow-v1.5.1-dist.tar.gz
-> export WORKFLOW_HOME=/usr/local/cas-workflow-v1.5.1
+> mv src/workflow/trunk/cas-workflow-vX.Y.Z-dist.tar.gz ./
+> tar -xvzf cas-workflow-vX.Y.Z-dist.tar.gz
+> export WORKFLOW_HOME=/usr/local/cas-workflow-vX.Y.Z
       </source>       
       
       <p>The resultant directory layout from the unpacked tarball is as follows:</p>
@@ -142,7 +131,7 @@ bin/ etc/ logs/ doc/ lib/ policy/ LICENS
          project.</li>
        </ul>
       
-      <p>Now you have a built Workflow Manager at <code>/usr/local/cas-workflow-v1.5.1</code>.
+      <p>Now you have a built Workflow Manager at <code>/usr/local/cas-workflow-vX.Y.Z</code>.
       In the next section, we will discuss how you can configure the Workflow Manager for
       basic operations.</p>
       </section>
@@ -195,7 +184,6 @@ bin/ etc/ logs/ doc/ lib/ policy/ LICENS
        <p>Make the following changes to 
        <code>$WORKFLOW_HOME/etc/workflow.properties</code>:</p>
        
-       
        <ul>     
          <li>Specify the path to the directory where the Workflow Manager will create the
          Lucene index and associated files by setting the 
@@ -243,7 +231,7 @@ bin/ etc/ logs/ doc/ lib/ policy/ LICENS
                               --eventName test 
       </source> 
       
-      <p>You should see a variety of info messages, in cluding the following:</p>
+      <p>You should see a variety of info messages, in including the following:</p>
       
       <source>
 INFO: WorkflowManager: Received event: test
@@ -257,7 +245,7 @@ INFO: Executing task: [Goodbye World] lo
       </source>
       
       <p>Note that we have elided some of the timestamp information for the purposes of 
-      clarity. If you see the cannonical Hellow World statement, you have succeeded in 
+      clarity. If you see the cannonical Hello World statement, you have succeeded in 
       configuring the CAS Workflow Manager, hopefully in 2 minutes or less (and even if 
       it took a little more time, you have to admit it was by and large painless).</p>
       
@@ -277,64 +265,6 @@ INFO: Executing task: [Goodbye World] lo
       <a href="../user/advanced.html">Advanced Guide.</a></p>
       
       </section>
- 
- <!--
-      <section name="Use Cases">
-        <p>
-          The Workflow Manager was built to support several of the above capabilities. In particular there 
-          were several use cases that we wanted to support, some 
-          of which are described below.        
-        </p>
-      
-         <img src="../images/wm_use_case1.jpg" alt="Workflow Manager Event-based Execution Use Case"/>
-         
-         <p>The black numbers in the above Figure correspond to a sequence of steps that occurs and a 
-         series of interactions between the different Workflow Manager extension points in order to 
-         perform the workflow execution activity. In Step 1, an event is provided to the Workflow
-         Manager event listenter (the System extension point), along with required Metadata. The
-         Workflow Manager, in step 2, looks up if ther are any associated Workflow Repository models
-         associated with the provided Event. If so, in steps 3 and 4, the returned Workflow models
-         are sent to the WorkflowEngine, to be turned into executable Workflow Instances.Each 
-         WorkflowInstance is handed off to a WorkflowProcessorThread, taken from the ThreadPoolWorkflowEngine,
-         in steps 5 and 6. The WorkflowProcessorThread, in step 7, steps through each executable WorkflowTask,
-         checking to make sure that all necessary Workflow Conditions (if any) are satisfied. If all Workflow 
-         Conditions are satisfied, then the Workflow Task is executed, either locally, or if an Resource Manager
-         is defined, then the task is sent (in step 7) to the Resource Manager (labeled <code>Process Manager</code>
-         in the figure). In steps 8-13, the WorkflowTask is executed on remote resources using the Resource Manager,
-         and eventually completed, with the final notification being sent back to the corresponding Workflow Processor
-         Thread, which is stepping through the Workflow Instance, controlling its exectuion. </p>
-         
-      </section>
-      <section name="Appendix">
-       <p>
-         Full list of Workflow Manager extension point classes and their associated property names from the 
-         workflow.properties file:       
-       </p>
-    
-       <table>
-         <tr>
-           <td>workflow.repo.factory</td>
-           <td>org.apache.oodt.cas.workflow.repository.XMLWorkflowRepositoryFactory<br/>
-               org.apache.oodt.cas.workflow.repository.DataSourceWorkflowRepositoryFactory
-           </td>
-         </tr>
-         <tr>
-           <td>workflow.engine.factory</td>
-           <td>org.apache.oodt.cas.workflow.engine.ThreadPoolWorkflowEngineFactory
-           </td>
-         </tr>
-         <tr>
-           <td>workflow.instRep.factory</td>
-           <td>org.apache.oodt.cas.workflow.instrepo.LuceneWorkflowInstanceRepositoryFactory<br/>
-               org.apache.oodt.cas.workflow.instrepo.DataSourceWorkflowInstanceRepositoryFactory<br/>
-               org.apache.oodt.cas.workflow.instrepo.MemoryWorkflowInstanceRepositoryFactory
-           </td>
-         </tr>
-       </table>
-      
-      </section> -->
-      
-      
    </body>
    
 </document>

Modified: incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml (original)
+++ incubator/oodt/trunk/workflow/src/site/xdoc/user/index.xml Tue Jul 20 12:44:26 2010
@@ -23,8 +23,7 @@ the License.
    </properties>
 
    <body>
-      <link rel="StyleSheet" href="../css/guides.css" type="text/css" media="screen"/>
-   
+
       <div class="warning">This document is in the process of being reorganized as
       part of our ongoing documentation effort. Please follow the links below to find
       information that has previously been hosted on this page.</div>

Modified: incubator/oodt/trunk/xmlquery/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/xmlquery/src/site/site.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/xmlquery/src/site/site.xml (original)
+++ incubator/oodt/trunk/xmlquery/src/site/site.xml Tue Jul 20 12:44:26 2010
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Query Expression" href="http://oodt.jpl.nasa.gov/edm-query/">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+
+<project name="Query Expression">
 
   <body>
     <links>

Modified: incubator/oodt/trunk/xmlquery/src/site/xdoc/disquery/index.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/xmlquery/src/site/xdoc/disquery/index.xml?rev=965829&r1=965828&r2=965829&view=diff
==============================================================================
--- incubator/oodt/trunk/xmlquery/src/site/xdoc/disquery/index.xml (original)
+++ incubator/oodt/trunk/xmlquery/src/site/xdoc/disquery/index.xml Tue Jul 20 12:44:26 2010
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-Copyright (c) 2004, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id: index.xml,v 1.1 2004-06-24 20:41:32 shardman Exp $
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License.  You may obtain a copy of
+the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+License for the specific language governing permissions and limitations under
+the License.
 -->
-
 <document>
 
   <properties>
@@ -16,7 +24,7 @@ $Id: index.xml,v 1.1 2004-06-24 20:41:32
 
   <body>
     <section name="DIS-Style Query">
-      <p>A DIS-Style Query is a query using triples linked in a logical expression. Each triple is in the format of (element, relation, literal). The element portion of the triple may be any named data element recognized as a queryable attribute by the target of the query. The relation portion of the triple may contain any of the relational operators from the table below. The literal portion of the triple is the element value to be compared. Mutiple sets of triples may be joined using any of the logical operators from the table below. Note that elements or literals containing spaces must be quoted. Also note that case sensitivity and support for the various operators is subject to the capabilities offered by the target of the query.
+      <p>A DIS-Style Query is a query using triples linked in a logical expression. Each triple is in the format of (element, relation, literal). The element portion of the triple may be any named data element recognized as a queryable attribute by the target of the query. The relation portion of the triple may contain any of the relational operators from the table below. The literal portion of the triple is the element value to be compared. Multiple sets of triples may be joined using any of the logical operators from the table below. Note that elements or literals containing spaces must be quoted. Also note that case sensitivity and support for the various operators is subject to the capabilities offered by the target of the query.
       </p>
 
       <p>The following table contains the supported relational operators:</p>



Mime
View raw message