You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2013/06/22 18:47:59 UTC

svn commit: r1495755 - in /oodt/trunk: CHANGES.txt filemgr/src/main/resources/examples/geo/elements.xml filemgr/src/main/resources/examples/geo/product-type-element-map.xml

Author: mattmann
Date: Sat Jun 22 16:47:59 2013
New Revision: 1495755

URL: http://svn.apache.org/r1495755
Log:
- fix for OODT-637: Geo Product Type policy includes duplicative elements

Modified:
    oodt/trunk/CHANGES.txt
    oodt/trunk/filemgr/src/main/resources/examples/geo/elements.xml
    oodt/trunk/filemgr/src/main/resources/examples/geo/product-type-element-map.xml

Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1495755&r1=1495754&r2=1495755&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Sat Jun 22 16:47:59 2013
@@ -4,6 +4,8 @@ Apache OODT Change Log
 Release 0.6 - Current Development
 --------------------------------------------
 
+* OODT-637 Geo Product Type policy includes duplicative elements (mattmann)
+
 * OODT-635 Fix trivial errors in Basic CAS Curation Example (lewismc via mattmann, Bill Rideout)
 
 * OODT-636 Fixed Javadoc warnings in CAS-Product (rlaidlaw)

Modified: oodt/trunk/filemgr/src/main/resources/examples/geo/elements.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/resources/examples/geo/elements.xml?rev=1495755&r1=1495754&r2=1495755&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/examples/geo/elements.xml (original)
+++ oodt/trunk/filemgr/src/main/resources/examples/geo/elements.xml Sat Jun 22 16:47:59 2013
@@ -16,8 +16,7 @@
   limitations under the License.
 -->
 <cas:elements xmlns:cas="http://oodt.apache.org/components/cas">
-  <element id="urn:oodt:ProductId" name="CAS.ProductId">
-    <dcElement>Identifier</dcElement>
+  <element id="urn:oodt:Latitude" name="Latitude">
     <!--
       You can optionally specify a 'trim' tag to identify whether or not you
       want newlines trimmed from the element description. To turn off trimming
@@ -25,54 +24,6 @@
       definition: trim="false"
     -->
     <description>
-      A product's unique identifier within the CAS namespace.
-    </description>
-  </element>
-  <element id="urn:oodt:ProductName" name="CAS.ProductName">
-    <dcElement>Title</dcElement>
-    <description>
-      A product's name within the CAS namespace.
-    </description>
-  </element>
-  <element id="urn:oodt:ProductReceivedTime" name="CAS.ProductReceivedTime">
-    <description>
-      The ISO 8601 formatted time that a product was received.
-    </description>
-    <dcElement />
-  </element>
-  <element id="urn:oodt:Filename" name="Filename">
-    <description>
-      The names of the files that represent a product.
-    </description>
-    <dcElement />
-  </element>
-  <element id="urn:oodt:FileLocation" name="FileLocation">
-    <description>
-      The locations of the files that represent a product.
-    </description>
-    <dcElement />
-  </element>
-  <element id="urn:oodt:ProductType" name="ProductType">
-    <description>
-      Type of product, as specified by, e.g. a data bible.
-    </description>
-    <dcElement />
-  </element>
-  <element id="urn:oodt:ProductStructure" name="ProductStructure">
-    <description>
-      Whether or not a product is flat, e.g. a set of independent files, or
-      hierarchical, e.g. a directory structure.
-    </description>
-    <dcElement />
-  </element>
-  <element id="urn:oodt:MimeType" name="MimeType">
-    <description>
-      The IETF MIME type of a product.
-    </description>
-    <dcElement />
-  </element>
-  <element id="urn:oodt:Latitude" name="Latitude">
-    <description>
       Geographical latitude data for a product.
     </description>
     <dcElement />
@@ -83,10 +34,4 @@
     </description>
     <dcElement />
   </element>
-  <element id="urn:test:DataVersion" name="DataVersion">
-    <description>
-      The version of a data product.
-    </description>
-    <dcElement />
-  </element>
 </cas:elements>

Modified: oodt/trunk/filemgr/src/main/resources/examples/geo/product-type-element-map.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/resources/examples/geo/product-type-element-map.xml?rev=1495755&r1=1495754&r2=1495755&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/examples/geo/product-type-element-map.xml (original)
+++ oodt/trunk/filemgr/src/main/resources/examples/geo/product-type-element-map.xml Sat Jun 22 16:47:59 2013
@@ -20,17 +20,8 @@
     You can set the "parent" attribute on types below to allow inheritance of
     elements between the types.
   -->
-  <type id="urn:oodt:LocationAwareProduct">
-    <element id="urn:oodt:ProductReceivedTime" />
-    <element id="urn:oodt:ProductName" />
-    <element id="urn:oodt:ProductId" />
-    <element id="urn:oodt:ProductType" />
-    <element id="urn:oodt:ProductStructure" />
-    <element id="urn:oodt:Filename" />
-    <element id="urn:oodt:FileLocation" />
-    <element id="urn:oodt:MimeType" />
+  <type id="urn:oodt:LocationAwareProduct" parent="urn:oodt:GenericFile">
     <element id="urn:oodt:Latitude"/>
     <element id="urn:oodt:Longitude"/>
-    <element id="urn:test:DataVersion" />
   </type>
 </cas:producttypemap>