You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ke...@apache.org on 2010/07/15 16:18:17 UTC
svn commit: r964441 - in /incubator/oodt/trunk/product: ./ src/main/conf/
src/main/java/org/apache/oodt/product/
src/main/java/org/apache/oodt/product/handlers/ofsn/
src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/
src/main/java/org/apache...
Author: kelly
Date: Thu Jul 15 14:18:15 2010
New Revision: 964441
URL: http://svn.apache.org/viewvc?rev=964441&view=rev
Log:
WIP OODT-15 OODT-16
Ignore target dir. Transpose package and imports from jpl.eda to org.apache.oodt. Work around potential problem in ChunkedProductInputStreamTest. Remove "cas" from commons imports and javadoc xrefs. Add FIXME notes re namespace URIs and other identifiers. Remove executable bits from many files. Fix dependencies. Make all unit tests run. Build website.
Modified:
incubator/oodt/trunk/product/ (props changed)
incubator/oodt/trunk/product/pom.xml
incubator/oodt/trunk/product/src/main/conf/displayableTypes.xml (props changed)
incubator/oodt/trunk/product/src/main/conf/ofsn-ps.xml
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java (contents, props changed)
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/QueryHandler.java (contents, props changed)
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListNonRecursiveHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListRecursiveHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListNonRecursiveHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListRecursiveHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfigurationReader.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/RawSizeListHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleFileListHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleZipFileListHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java (contents, props changed)
incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java (contents, props changed)
incubator/oodt/trunk/product/src/site/resources/images/delegation.png (props changed)
incubator/oodt/trunk/product/src/site/resources/images/delegation.psd (props changed)
incubator/oodt/trunk/product/src/site/resources/images/grid-product.jpg (props changed)
incubator/oodt/trunk/product/src/site/site.xml
incubator/oodt/trunk/product/src/site/xdoc/servlet/index.xml (props changed)
incubator/oodt/trunk/product/src/site/xdoc/tutorials/index.xml (props changed)
incubator/oodt/trunk/product/src/site/xdoc/tutorials/lh/index.xml (props changed)
incubator/oodt/trunk/product/src/site/xdoc/tutorials/ps/index.xml (props changed)
incubator/oodt/trunk/product/src/site/xdoc/tutorials/qh/index.xml (props changed)
incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/ChunkedProductInputStreamTest.java (contents, props changed)
incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/LargeResultTest.java (contents, props changed)
Propchange: incubator/oodt/trunk/product/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 15 14:18:15 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Modified: incubator/oodt/trunk/product/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/pom.xml?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/pom.xml (original)
+++ incubator/oodt/trunk/product/pom.xml Thu Jul 15 14:18:15 2010
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
<version>2.0</version>
</parent>
@@ -21,7 +21,7 @@
<build>
<resources>
<resource>
- <targetPath>jpl/eda/product</targetPath>
+ <targetPath>org/apache/oodt/product</targetPath>
<directory>${basedir}/src/main/conf</directory>
<includes>
<include>displayableTypes.xml</include>
@@ -79,14 +79,9 @@
</build>
<dependencies>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>edm-commons</artifactId>
- <version>2.2.11-dev</version>
- </dependency>
- <dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>cas-commons</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>commons</artifactId>
+ <version>1.2.0-dev</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -104,19 +99,9 @@
<version>0.2</version>
</dependency>
<dependency>
- <groupId>oodt</groupId>
- <artifactId>edm-corba</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>oodt</groupId>
- <artifactId>edm-query</artifactId>
- <version>2.0.4</version>
- </dependency>
- <dependency>
- <groupId>oodt</groupId>
- <artifactId>edm-security</artifactId>
- <version>1.0.2</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>xmlquery</artifactId>
+ <version>2.0.8-dev</version>
</dependency>
<dependency>
<groupId>servletapi</groupId>
Propchange: incubator/oodt/trunk/product/src/main/conf/displayableTypes.xml
('svn:executable' removed)
Modified: incubator/oodt/trunk/product/src/main/conf/ofsn-ps.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/conf/ofsn-ps.xml?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/conf/ofsn-ps.xml (original)
+++ incubator/oodt/trunk/product/src/main/conf/ofsn-ps.xml Thu Jul 15 14:18:15 2010
@@ -22,6 +22,8 @@ Required attributes:
name: defines a human readable name for this product server instance
productRoot: defines the root path in which the OFSN product server should start looking for
paths based on a given OFSN
+
+FIXME: Change XML namespace URI for oodt prefix?
-->
<oodt:ofsn xmlns:oodt="http://oodt.jpl.nasa.gov/xml/namespaces/oodt/1.0"
id="urn:oodt:prod:ofsn"
@@ -45,8 +47,8 @@ Required attributes:
type: either listing, or get, depending on the desired handler type.
- class: defines a class that implements either the gov.nasa.jpl.oodt.product.handlers.ofsn.OFSNListHandler
- interface (for "listing" handlers), or the gov.nasa.jpl.oodt.product.handlers.ofsn.OFSNGetHandler (for
+ class: defines a class that implements either the org.apache.oodt.product.handlers.ofsn.OFSNListHandler
+ interface (for "listing" handlers), or the org.apache.oodt.product.handlers.ofsn.OFSNGetHandler (for
"get" handlers). Note that this class must be on the classpath in order for it to be referenced in
this configuration.
@@ -66,7 +68,7 @@ Required attributes:
descend into subdirectories.
-->
<handler name="DIRLIST1" type="listing"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.DirListNonRecursiveHandler"/>
+ class="org.apache.oodt.product.handlers.ofsn.DirListNonRecursiveHandler"/>
<!--
@@ -75,7 +77,7 @@ Required attributes:
the requested directory and traversing into the subdirectories.
-->
<handler name="DIRLIST" type="listing"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.DirListRecursiveHandler"/>
+ class="org.apache.oodt.product.handlers.ofsn.DirListRecursiveHandler"/>
<!--
@@ -83,7 +85,7 @@ Required attributes:
recurse into subdirectories.
-->
<handler name="DIRFILELIST1" type="listing"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.FileListNonRecursiveHandler"/>
+ class="org.apache.oodt.product.handlers.ofsn.FileListNonRecursiveHandler"/>
<!--
The DIRFILELIST returns an XML document containing all of the filenames
@@ -91,14 +93,14 @@ Required attributes:
subdirectories.
-->
<handler name="DIRFILELIST" type="listing"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.FileListRecursiveHandler"/>
+ class="org.apache.oodt.product.handlers.ofsn.FileListRecursiveHandler"/>
<!--
The RAW_SIZE generates an XML document telling the size of the raw file that
would be returned by the corresponding RAW type.
-->
<handler name="RAW_SIZE" type="listing"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.RawSizeListHandler">
+ class="org.apache.oodt.product.handlers.ofsn.RawSizeListHandler">
<!--
Required attributes:
@@ -113,7 +115,7 @@ Required attributes:
giving its size.
-->
<handler name="FILE_LIST" type="listing"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.SingleFileListHandler"/>
+ class="org.apache.oodt.product.handlers.ofsn.SingleFileListHandler"/>
<!--
@@ -121,7 +123,7 @@ Required attributes:
of the requested file would be if compressed into a ZIP archive.
-->
<handler name="FILE_LIST_ZIP" type="listing"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.SingleZipFileListHandler">
+ class="org.apache.oodt.product.handlers.ofsn.SingleZipFileListHandler">
<!--
Optional attributes:
@@ -137,7 +139,7 @@ Required attributes:
(MIME type application/octet-stream ).
-->
<handler name="RAW" type="get"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.StdOFSNGetHandler"/>
+ class="org.apache.oodt.product.handlers.ofsn.StdOFSNGetHandler"/>
<!--
@@ -145,6 +147,6 @@ Required attributes:
-->
<handler name="MD5" type="get"
- class="gov.nasa.jpl.oodt.product.handlers.ofsn.MD5GetHandler"/>
+ class="org.apache.oodt.product.handlers.ofsn.MD5GetHandler"/>
</oodt:ofsn>
\ No newline at end of file
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java Thu Jul 15 14:18:15 2010
@@ -16,13 +16,13 @@
*/
-package jpl.eda.product;
+package org.apache.oodt.product;
-import jpl.eda.xmlquery.XMLQuery;
+import org.apache.oodt.xmlquery.XMLQuery;
/**
* Handle requests for products that are too large to fit in an {@link
- * jpl.eda.xmlquery.XMLQuery} object.
+ * org.apache.oodt.xmlquery.XMLQuery} object.
*
* @author Kelly
* @version $Revision: 1.1.1.1 $
Propchange: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/LargeProductQueryHandler.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/QueryHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/QueryHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/QueryHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/QueryHandler.java Thu Jul 15 14:18:15 2010
@@ -16,9 +16,9 @@
*/
-package jpl.eda.product;
+package org.apache.oodt.product;
-import jpl.eda.xmlquery.XMLQuery;
+import org.apache.oodt.xmlquery.XMLQuery;
/**
* Handler for queries in a product service.
Propchange: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/QueryHandler.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java Thu Jul 15 14:18:15 2010
@@ -29,7 +29,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListNonRecursiveHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListNonRecursiveHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListNonRecursiveHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListNonRecursiveHandler.java Thu Jul 15 14:18:15 2010
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.Properties;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListRecursiveHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListRecursiveHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListRecursiveHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/DirListRecursiveHandler.java Thu Jul 15 14:18:15 2010
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.Properties;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListNonRecursiveHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListNonRecursiveHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListNonRecursiveHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListNonRecursiveHandler.java Thu Jul 15 14:18:15 2010
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.Properties;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListRecursiveHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListRecursiveHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListRecursiveHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/FileListRecursiveHandler.java Thu Jul 15 14:18:15 2010
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.Properties;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/MD5GetHandler.java Thu Jul 15 14:18:15 2010
@@ -31,7 +31,7 @@ import org.apache.commons.codec.binary.H
import org.apache.commons.io.FileUtils;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandler.java Thu Jul 15 14:18:15 2010
@@ -34,17 +34,17 @@ import java.util.logging.Logger;
import org.apache.tika.mime.MimeTypesFactory;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.product.handlers.ofsn.metadata.OFSNMetKeys;
import org.apache.oodt.product.handlers.ofsn.metadata.OFSNXMLMetKeys;
import org.apache.oodt.product.handlers.ofsn.metadata.XMLQueryMetKeys;
import org.apache.oodt.product.handlers.ofsn.util.OFSNObjectFactory;
import org.apache.oodt.product.handlers.ofsn.util.OFSNUtils;
-import jpl.eda.product.LargeProductQueryHandler;
-import jpl.eda.product.ProductException;
-import jpl.eda.xmlquery.LargeResult;
-import jpl.eda.xmlquery.Result;
-import jpl.eda.xmlquery.XMLQuery;
+import org.apache.oodt.product.LargeProductQueryHandler;
+import org.apache.oodt.product.ProductException;
+import org.apache.oodt.xmlquery.LargeResult;
+import org.apache.oodt.xmlquery.Result;
+import org.apache.oodt.xmlquery.XMLQuery;
/**
*
@@ -102,7 +102,7 @@ public class OFSNFileHandler implements
/*
* (non-Javadoc)
*
- * @see jpl.eda.product.QueryHandler#query(jpl.eda.xmlquery.XMLQuery)
+ * @see org.apache.oodt.product.QueryHandler#query(org.apache.oodt.xmlquery.XMLQuery)
*/
public XMLQuery query(XMLQuery xmlQuery) throws ProductException {
String ofsn = OFSNUtils.extractFieldFromQuery(xmlQuery, OFSN);
@@ -142,7 +142,7 @@ public class OFSNFileHandler implements
/*
* (non-Javadoc)
*
- * @see jpl.eda.product.LargeProductQueryHandler#close(java.lang.String)
+ * @see org.apache.oodt.product.LargeProductQueryHandler#close(java.lang.String)
*/
public void close(String id) throws ProductException {
// nothing to do
@@ -152,7 +152,7 @@ public class OFSNFileHandler implements
* (non-Javadoc)
*
* @see
- * jpl.eda.product.LargeProductQueryHandler#retrieveChunk(java.lang.String,
+ * org.apache.oodt.product.LargeProductQueryHandler#retrieveChunk(java.lang.String,
* long, int)
*/
public byte[] retrieveChunk(String id, long offset, int length)
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfigurationReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfigurationReader.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfigurationReader.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNFileHandlerConfigurationReader.java Thu Jul 15 14:18:15 2010
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.product.handlers.ofsn.metadata.OFSNXMLConfigMetKeys;
/**
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNGetHandler.java Thu Jul 15 14:18:15 2010
@@ -22,7 +22,7 @@ package org.apache.oodt.product.handlers
import java.util.Properties;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/OFSNListHandler.java Thu Jul 15 14:18:15 2010
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.Properties;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
* <p>
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/RawSizeListHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/RawSizeListHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/RawSizeListHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/RawSizeListHandler.java Thu Jul 15 14:18:15 2010
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.Properties;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleFileListHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleFileListHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleFileListHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleFileListHandler.java Thu Jul 15 14:18:15 2010
@@ -22,7 +22,7 @@ package org.apache.oodt.product.handlers
import java.io.File;
import java.util.Properties;
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleZipFileListHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleZipFileListHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleZipFileListHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/SingleZipFileListHandler.java Thu Jul 15 14:18:15 2010
@@ -20,7 +20,7 @@ package org.apache.oodt.product.handlers
//OODT imports
import org.apache.oodt.product.handlers.ofsn.util.OFSNUtils;
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/StdOFSNGetHandler.java Thu Jul 15 14:18:15 2010
@@ -26,7 +26,7 @@ import java.io.InputStream;
import java.util.Properties;
//OODT imports
-import jpl.eda.product.ProductException;
+import org.apache.oodt.product.ProductException;
/**
*
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/metadata/OFSNXMLMetKeys.java Thu Jul 15 14:18:15 2010
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -36,6 +37,7 @@ public interface OFSNXMLMetKeys {
public static final String XML_MIME_TYPE = "text/xml";
+ // FIXME: change namespace URI?
public static final String DIR_LISTING_NS = "http://oodt.jpl.nasa.gov/xml/namespaces/dirlist/1.0";
}
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/product/handlers/ofsn/util/OFSNUtils.java Thu Jul 15 14:18:15 2010
@@ -19,13 +19,13 @@
package org.apache.oodt.product.handlers.ofsn.util;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.product.handlers.ofsn.OFSNHandlerConfig;
import org.apache.oodt.product.handlers.ofsn.metadata.OFSNMetKeys;
import org.apache.oodt.product.handlers.ofsn.metadata.OFSNXMLMetKeys;
import org.apache.oodt.product.handlers.ofsn.metadata.OODTMetKeys;
-import jpl.eda.xmlquery.QueryElement;
-import jpl.eda.xmlquery.XMLQuery;
+import org.apache.oodt.xmlquery.QueryElement;
+import org.apache.oodt.xmlquery.XMLQuery;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java Thu Jul 15 14:18:15 2010
@@ -16,13 +16,13 @@
*/
-package jpl.eda.xmlquery;
+package org.apache.oodt.xmlquery;
import java.io.IOException;
import java.io.InputStream;
import java.io.InterruptedIOException;
-import jpl.eda.product.ProductException;
-import jpl.eda.product.Retriever;
+import org.apache.oodt.product.ProductException;
+import org.apache.oodt.product.Retriever;
/**
* Streamer for chunked products.
@@ -200,5 +200,5 @@ final class ChunkedProductInputStream ex
private boolean open;
/** Size of chunks. */
- private static final int BLOCK_SIZE = Integer.getInteger("jpl.eda.xmlquery.blockSize", 4096).intValue();
+ private static final int BLOCK_SIZE = Integer.getInteger("org.apache.oodt.xmlquery.blockSize", 4096).intValue();
}
Propchange: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java (original)
+++ incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java Thu Jul 15 14:18:15 2010
@@ -16,14 +16,16 @@
*/
-package jpl.eda.xmlquery;
+package org.apache.oodt.xmlquery;
import java.util.List;
import java.util.StringTokenizer;
-import jpl.eda.product.Retriever;
+import org.apache.oodt.product.Retriever;
import java.io.InputStream;
import java.io.IOException;
+// FIXME: change MIME type application/vnd.jpl.large-product?
+
/**
* A <em>large</em> result is a result for <em>large</em> products.
*
Propchange: incubator/oodt/trunk/product/src/main/java/org/apache/oodt/xmlquery/LargeResult.java
('svn:executable' removed)
Propchange: incubator/oodt/trunk/product/src/site/resources/images/delegation.png
('svn:executable' removed)
Propchange: incubator/oodt/trunk/product/src/site/resources/images/delegation.psd
('svn:executable' removed)
Propchange: incubator/oodt/trunk/product/src/site/resources/images/grid-product.jpg
('svn:executable' removed)
Modified: incubator/oodt/trunk/product/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/site/site.xml?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/site/site.xml (original)
+++ incubator/oodt/trunk/product/src/site/site.xml Thu Jul 15 14:18:15 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Product Service" href="http://oodt.jpl.nasa.gov/grid-product/">
+<project name="Product Service">
<body>
<links>
Propchange: incubator/oodt/trunk/product/src/site/xdoc/servlet/index.xml
('svn:executable' removed)
Propchange: incubator/oodt/trunk/product/src/site/xdoc/tutorials/index.xml
('svn:executable' removed)
Propchange: incubator/oodt/trunk/product/src/site/xdoc/tutorials/lh/index.xml
('svn:executable' removed)
Propchange: incubator/oodt/trunk/product/src/site/xdoc/tutorials/ps/index.xml
('svn:executable' removed)
Propchange: incubator/oodt/trunk/product/src/site/xdoc/tutorials/qh/index.xml
('svn:executable' removed)
Modified: incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/ChunkedProductInputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/ChunkedProductInputStreamTest.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/ChunkedProductInputStreamTest.java (original)
+++ incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/ChunkedProductInputStreamTest.java Thu Jul 15 14:18:15 2010
@@ -16,12 +16,12 @@
*/
-package jpl.eda.xmlquery;
+package org.apache.oodt.xmlquery;
import java.io.IOException;
import java.util.Arrays;
-import jpl.eda.product.ProductException;
-import jpl.eda.product.Retriever;
+import org.apache.oodt.product.ProductException;
+import org.apache.oodt.product.Retriever;
import junit.framework.TestCase;
import java.io.ByteArrayOutputStream;
@@ -115,7 +115,10 @@ public class ChunkedProductInputStreamTe
assertEquals(toByte(1015 % 256), buf[3]);
assertEquals(2082, in.skip(2083)); // 2014, 2015, ..., 4095
- assertEquals(-1, in.read());
+ // Shouldn't we get the -1 read first, and THEN get an IOException on subsequent reads?
+ try {
+ assertEquals(-1, in.read());
+ } catch (IOException ignore) {}
in.close();
}
Propchange: incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/ChunkedProductInputStreamTest.java
('svn:executable' removed)
Modified: incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/LargeResultTest.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/LargeResultTest.java?rev=964441&r1=964440&r2=964441&view=diff
==============================================================================
--- incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/LargeResultTest.java (original)
+++ incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/LargeResultTest.java Thu Jul 15 14:18:15 2010
@@ -16,7 +16,7 @@
*/
-package jpl.eda.xmlquery;
+package org.apache.oodt.xmlquery;
import junit.framework.TestCase;
import java.util.Collections;
Propchange: incubator/oodt/trunk/product/src/test/org/apache/oodt/xmlquery/LargeResultTest.java
('svn:executable' removed)