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/16 05:00:31 UTC
svn commit: r964663 [3/5] - in /incubator/oodt/trunk: ./ commons/
commons/src/main/java/org/apache/oodt/commons/date/ core/
crawler/src/main/java/org/apache/oodt/cas/crawl/
crawler/src/main/java/org/apache/oodt/cas/crawl/action/
crawler/src/main/java/o...
Modified: incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestGenericFileManagerObjectStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestGenericFileManagerObjectStructFactory.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestGenericFileManagerObjectStructFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestGenericFileManagerObjectStructFactory.java Fri Jul 16 03:00:26 2010
@@ -16,18 +16,18 @@
*/
-package gov.nasa.jpl.oodt.cas.filemgr.util;
+package org.apache.oodt.cas.filemgr.util;
//OODT imports
import java.io.File;
import java.io.FileInputStream;
-import gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog;
-import gov.nasa.jpl.oodt.cas.filemgr.datatransfer.DataTransfer;
-import gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.FilemgrMetExtractor;
-import gov.nasa.jpl.oodt.cas.filemgr.repository.RepositoryManager;
-import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
-import gov.nasa.jpl.oodt.cas.filemgr.versioning.Versioner;
+import org.apache.oodt.cas.filemgr.catalog.Catalog;
+import org.apache.oodt.cas.filemgr.datatransfer.DataTransfer;
+import org.apache.oodt.cas.filemgr.metadata.extractors.FilemgrMetExtractor;
+import org.apache.oodt.cas.filemgr.repository.RepositoryManager;
+import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
+import org.apache.oodt.cas.filemgr.versioning.Versioner;
//Junit imports
import junit.framework.TestCase;
@@ -42,17 +42,17 @@ import junit.framework.TestCase;
*/
public class TestGenericFileManagerObjectStructFactory extends TestCase {
- private static final String dataTransferServiceFactory = "gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
+ private static final String dataTransferServiceFactory = "org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
- private static final String validationServiceFactory = "gov.nasa.jpl.oodt.cas.filemgr.validation.XMLValidationLayerFactory";
+ private static final String validationServiceFactory = "org.apache.oodt.cas.filemgr.validation.XMLValidationLayerFactory";
- private static final String catalogServiceFactory = "gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory";
+ private static final String catalogServiceFactory = "org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory";
- private static final String repositoryServiceFactory = "gov.nasa.jpl.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory";
+ private static final String repositoryServiceFactory = "org.apache.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory";
- private static final String versionerClass = "gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner";
+ private static final String versionerClass = "org.apache.oodt.cas.filemgr.versioning.BasicVersioner";
- private static final String extractorClass = "gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor";
+ private static final String extractorClass = "org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor";
/*
* (non-Javadoc)
Modified: incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlRpcStructFactory.java Fri Jul 16 03:00:26 2010
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package gov.nasa.jpl.oodt.cas.filemgr.util;
+package org.apache.oodt.cas.filemgr.util;
-import gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ExtractorSpec;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.type.TypeHandler;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManager;
-import gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
+import org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory;
+import org.apache.oodt.cas.filemgr.structs.ExtractorSpec;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
+import org.apache.oodt.cas.filemgr.structs.type.TypeHandler;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManager;
+import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import java.io.File;
import java.io.FileInputStream;
@@ -96,15 +96,15 @@ public class TestXmlRpcStructFactory ext
}
System.setProperty("filemgr.catalog.factory",
- "gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory");
+ "org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory");
System.setProperty(
- "gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.idxPath",
+ "org.apache.oodt.cas.filemgr.catalog.lucene.idxPath",
"./src/testdata/ingest/cat");
// now override the repo mgr policy
try {
System.setProperty(
- "gov.nasa.jpl.oodt.cas.filemgr.repositorymgr.dirs",
+ "org.apache.oodt.cas.filemgr.repositorymgr.dirs",
"file://"
+ new File("./src/testdata/xmlrpc-struct-factory")
.getCanonicalPath());
@@ -113,14 +113,14 @@ public class TestXmlRpcStructFactory ext
}
// now override the val layer ones
- System.setProperty("gov.nasa.jpl.oodt.cas.filemgr.validation.dirs",
+ System.setProperty("org.apache.oodt.cas.filemgr.validation.dirs",
"file://"
+ new File("./src/testdata/xmlrpc-struct-factory")
.getAbsolutePath());
// set up mime repo path
System.setProperty(
- "gov.nasa.jpl.oodt.cas.filemgr.mime.type.repository", new File(
+ "org.apache.oodt.cas.filemgr.mime.type.repository", new File(
"./src/main/resources/mime-types.xml").getAbsolutePath());
try {
Modified: incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java (original)
+++ incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/util/TestXmlStructFactory.java Fri Jul 16 03:00:26 2010
@@ -16,11 +16,11 @@
*/
-package gov.nasa.jpl.oodt.cas.filemgr.util;
+package org.apache.oodt.cas.filemgr.util;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.commons.exec.EnvUtilities;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.commons.exec.EnvUtilities;
//JDK imports
import javax.xml.parsers.DocumentBuilder;
Modified: incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java (original)
+++ incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java Fri Jul 16 03:00:26 2010
@@ -16,13 +16,13 @@
*/
-package gov.nasa.jpl.oodt.cas.filemgr.validation;
+package org.apache.oodt.cas.filemgr.validation;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Element;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import static gov.nasa.jpl.oodt.cas.filemgr.metadata.CoreMetKeys.*;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
+import org.apache.oodt.cas.filemgr.structs.Element;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import static org.apache.oodt.cas.filemgr.metadata.CoreMetKeys.*;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java (original)
+++ incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java Fri Jul 16 03:00:26 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.filemgr.versioning;
+package org.apache.oodt.cas.filemgr.versioning;
//JDK imports
import java.io.File;
@@ -25,10 +25,10 @@ import java.util.List;
import java.util.Vector;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.VersioningException;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
//Junit imports
import junit.framework.TestCase;
@@ -48,7 +48,7 @@ public class TestBasicVersioner extends
private BasicVersioner basicVersioner = new BasicVersioner();
public TestBasicVersioner() {
- System.setProperty("gov.nasa.jpl.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
+ System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
}
protected void setUp() {
Modified: incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java (original)
+++ incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java Fri Jul 16 03:00:26 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.filemgr.versioning;
+package org.apache.oodt.cas.filemgr.versioning;
// JDK imports
import java.io.File;
@@ -27,13 +27,13 @@ import java.util.List;
import java.util.Vector;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.VersioningException;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
+import org.apache.oodt.cas.metadata.Metadata;
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
//Junit imports
import junit.framework.TestCase;
@@ -58,7 +58,7 @@ public class TestDateTimeVersioner exten
public TestDateTimeVersioner() {
super();
// TODO Auto-generated constructor stub
- System.setProperty("gov.nasa.jpl.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
+ System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
}
/**
@@ -67,7 +67,7 @@ public class TestDateTimeVersioner exten
public TestDateTimeVersioner(String arg0) {
super(arg0);
// TODO Auto-generated constructor stub
- System.setProperty("gov.nasa.jpl.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
+ System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
}
protected void setUp() {
Modified: incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java (original)
+++ incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestMetadataBasedFileVersioner.java Fri Jul 16 03:00:26 2010
@@ -16,17 +16,17 @@
*/
-package gov.nasa.jpl.oodt.cas.filemgr.versioning;
+package org.apache.oodt.cas.filemgr.versioning;
//JDK imports
import java.io.File;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.VersioningException;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
+import org.apache.oodt.cas.metadata.Metadata;
//Junit imports
import junit.framework.TestCase;
@@ -47,7 +47,7 @@ public class TestMetadataBasedFileVersio
*
*/
public TestMetadataBasedFileVersioner() {
- System.setProperty("gov.nasa.jpl.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
+ System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
}
protected void setUp() {
Modified: incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java (original)
+++ incubator/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/versioning/TestSingleFileBasicVersioner.java Fri Jul 16 03:00:26 2010
@@ -16,17 +16,17 @@
*/
-package gov.nasa.jpl.oodt.cas.filemgr.versioning;
+package org.apache.oodt.cas.filemgr.versioning;
//JDK imports
import java.io.File;
//OODT imports
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Product;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.Reference;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.VersioningException;
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.filemgr.structs.Product;
+import org.apache.oodt.cas.filemgr.structs.ProductType;
+import org.apache.oodt.cas.filemgr.structs.Reference;
+import org.apache.oodt.cas.filemgr.structs.exceptions.VersioningException;
+import org.apache.oodt.cas.metadata.Metadata;
//Junit imports
import junit.framework.TestCase;
@@ -50,7 +50,7 @@ public class TestSingleFileBasicVersione
*
*/
public TestSingleFileBasicVersioner() {
- System.setProperty("gov.nasa.jpl.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
+ System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", new File("./src/main/resources/mime-types.xml").getAbsolutePath());
}
public void testVersioning(){
Modified: incubator/oodt/trunk/filemgr/src/testdata/ingest/fmpolicy/product-types.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/testdata/ingest/fmpolicy/product-types.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/testdata/ingest/fmpolicy/product-types.xml (original)
+++ incubator/oodt/trunk/filemgr/src/testdata/ingest/fmpolicy/product-types.xml Fri Jul 16 03:00:26 2010
@@ -2,10 +2,10 @@
<cas:producttypes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<type id="urn:oodt:GenericFile" name="GenericFile">
<repository path="file:///tmp"/>
- <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/>
+ <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
<description>The default product type for any kind of file.</description>
<metExtractors>
- <extractor class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor">
+ <extractor class="org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor">
<configuration>
<!-- you can optionally include the envReplace tag to turn on/off environment var replacement -->
<property name="nsAware" value="true"/>
@@ -13,12 +13,12 @@
<property name="elements" value="ProductReceivedTime,ProductName,ProductId"/>
</configuration>
</extractor>
- <extractor class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor"/>
+ <extractor class="org.apache.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor"/>
</metExtractors>
</type>
<type id="urn:oodt:TestType" name="TestType">
<repository path="file:///tmp/test-type"/>
- <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/>
+ <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
<description>The default product type for any kind of file.</description>
</type>
</cas:producttypes>
Modified: incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt (original)
+++ incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt Fri Jul 16 03:00:26 2010
@@ -1 +1 @@
-this is a test text file
\ No newline at end of file
+this is a test text file
Modified: incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt.met
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt.met?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt.met (original)
+++ incubator/oodt/trunk/filemgr/src/testdata/ingest/test.txt.met Fri Jul 16 03:00:26 2010
@@ -7,4 +7,4 @@
<key>ProductType</key>
<val>GenericFile</val>
</keyval>
-</cas:metadata>
\ No newline at end of file
+</cas:metadata>
Modified: incubator/oodt/trunk/filemgr/src/testdata/repomgr/product-types.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/testdata/repomgr/product-types.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/testdata/repomgr/product-types.xml (original)
+++ incubator/oodt/trunk/filemgr/src/testdata/repomgr/product-types.xml Fri Jul 16 03:00:26 2010
@@ -2,7 +2,7 @@
<cas:producttypes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<type id="urn:oodt:GenericFile" name="GenericFile">
<repository path="file://[HOME]/files"/>
- <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/>
+ <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
<description trim="true">
The default product type for any kind of file, with real metadata.
</description>
@@ -20,7 +20,7 @@
</type>
<type id="urn:oodt:GenericFileWithBlankMet" name="GenericFileWithBlankMet">
<repository path="file://[HOME]/files"/>
- <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/>
+ <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
<description>
The default product type for any kind of file, with blank metadata.
</description>
@@ -28,7 +28,7 @@
</type>
<type id="urn:oodt:GenericFileNoTypeMetadata" name="GenericFileNoTypeMetadata">
<repository path="file://[HOME]/files"/>
- <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/>
+ <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
<description trim="false">
The default product type for any kind of file, without metadata.
</description>
Modified: incubator/oodt/trunk/filemgr/src/testdata/test.logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/testdata/test.logging.properties?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/testdata/test.logging.properties (original)
+++ incubator/oodt/trunk/filemgr/src/testdata/test.logging.properties Fri Jul 16 03:00:26 2010
@@ -19,28 +19,28 @@ java.util.logging.ConsoleHandler.level =
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
# catalog subsystem
-gov.nasa.jpl.oodt.cas.filemgr.catalog.level = INFO
+org.apache.oodt.cas.filemgr.catalog.level = INFO
# repository subsystem
-gov.nasa.jpl.oodt.cas.filemgr.repository.level = FINE
+org.apache.oodt.cas.filemgr.repository.level = FINE
# system subsystem
-gov.nasa.jpl.oodt.cas.filemgr.system.level = INFO
+org.apache.oodt.cas.filemgr.system.level = INFO
# versioning subsystem
-gov.nasa.jpl.oodt.cas.filemgr.versioning.level = INFO
+org.apache.oodt.cas.filemgr.versioning.level = INFO
# data transfer subsystem
-gov.nasa.jpl.oodt.cas.filemgr.datatransfer.level = FINE
+org.apache.oodt.cas.filemgr.datatransfer.level = FINE
# util
-gov.nasa.jpl.oodt.cas.filemgr.util.level = INFO
+org.apache.oodt.cas.filemgr.util.level = INFO
# validation
-gov.nasa.jpl.oodt.cas.filemgr.validation.level = INFO
+org.apache.oodt.cas.filemgr.validation.level = INFO
# tools
-gov.nasa.jpl.oodt.cas.filemgr.tools.level = SEVERE
+org.apache.oodt.cas.filemgr.tools.level = SEVERE
# control the underlying commons-httpclient transport layer for xmlrpc
org.apache.commons.httpclient.level = INFO
Modified: incubator/oodt/trunk/filemgr/src/testdata/test.txt
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/testdata/test.txt?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/testdata/test.txt (original)
+++ incubator/oodt/trunk/filemgr/src/testdata/test.txt Fri Jul 16 03:00:26 2010
@@ -1 +1 @@
-this is a test text file
\ No newline at end of file
+this is a test text file
Modified: incubator/oodt/trunk/filemgr/src/testdata/vallayer/product-types.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/testdata/vallayer/product-types.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/testdata/vallayer/product-types.xml (original)
+++ incubator/oodt/trunk/filemgr/src/testdata/vallayer/product-types.xml Fri Jul 16 03:00:26 2010
@@ -2,11 +2,11 @@
<cas:producttypes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<type id="urn:oodt:GenericFile" name="GenericFile">
<repository path="file://[HOME]/files"/>
- <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/>
+ <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
<description>The default product type for any kind of file.</description>
<metExtractors>
<extractor
- class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor">
+ class="org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor">
<configuration>
<!-- you can optionally include the envReplace tag to turn on/off environment var replacement -->
<property name="nsAware" value="true" />
@@ -16,7 +16,7 @@
</configuration>
</extractor>
<extractor
- class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor" />
+ class="org.apache.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor" />
</metExtractors>
</type>
</cas:producttypes>
Modified: incubator/oodt/trunk/filemgr/src/testdata/xmlrpc-struct-factory/product-types.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/filemgr/src/testdata/xmlrpc-struct-factory/product-types.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/filemgr/src/testdata/xmlrpc-struct-factory/product-types.xml (original)
+++ incubator/oodt/trunk/filemgr/src/testdata/xmlrpc-struct-factory/product-types.xml Fri Jul 16 03:00:26 2010
@@ -2,7 +2,7 @@
<cas:producttypes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<type id="urn:oodt:GenericFile" name="GenericFile">
<repository path="file://[HOME]/files"/>
- <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/>
+ <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/>
<!--
You can optionally specify a 'trim' tag to identify whether
or not you want newlines trimmed from the product type description. To
@@ -12,7 +12,7 @@
<description>The default product type for any kind of file.</description>
<metExtractors>
<extractor
- class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor">
+ class="org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor">
<configuration>
<!-- you can optionally include the envReplace tag to turn on/off environment var replacement -->
<property name="nsAware" value="true" />
@@ -23,7 +23,7 @@
</extractor>
</metExtractors>
<typeHandlers>
- <typeHandler class="gov.nasa.jpl.oodt.cas.filemgr.structs.type.examples.MajorMinorVersionTypeHandler" elementName="DataVersion"/>
+ <typeHandler class="org.apache.oodt.cas.filemgr.structs.type.examples.MajorMinorVersionTypeHandler" elementName="DataVersion"/>
</typeHandlers>
</type>
</cas:producttypes>
Propchange: incubator/oodt/trunk/metadata/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 03:00:26 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Modified: incubator/oodt/trunk/metadata/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/pom.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/pom.xml (original)
+++ incubator/oodt/trunk/metadata/pom.xml Fri Jul 16 03:00:26 2010
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2008 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -11,22 +21,22 @@ $Id$
<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>
- <artifactId>cas-metadata</artifactId>
+ <artifactId>metadata</artifactId>
<name>Catalog and Archive Service Generic Multi-valued Metadata Container</name>
<version>1.7.0-dev</version>
<description>A Multi-valued, generic Metadata container class. The class uses an internal
Map of string keys pointing to vectors of strings. The data
structure looks like the following:
- [std:string key]=>std:vector of std:strings
+ [std:string key]âstd:vector of std:strings
The multi-valued nature of the class is handled transparently by this Metadata
container. Since all values are stored internally as string vectors, the difference
- between a scalar value and a non-scalar is handled by determing whether the list of
+ between a scalar value and a non-scalar is handled by determining whether the list of
values for a particular key is greater than 1.</description>
<ciManagement>
<notifiers>
@@ -40,7 +50,7 @@ $Id$
<build>
<resources>
<resource>
- <targetPath>gov/nasa/jpl/oodt/cas/metadata/preconditions</targetPath>
+ <targetPath>org/apache/oodt/cas/metadata/preconditions</targetPath>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>tika-mimetypes.xml</include>
@@ -61,18 +71,25 @@ $Id$
<includes>
<include>**/*Test*.java</include>
</includes>
+ <excludes>
+ <!-- FIXME: These all assume $CWD, but should use getResourceAsStream instead. Later. -->
+ <exclude>org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java</exclude>
+ <exclude>org/apache/oodt/cas/metadata/extractors/TestMetReader.java</exclude>
+ <exclude>org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java</exclude>
+ <exclude>org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>cas-commons</artifactId>
- <version>1.1.1</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>commons</artifactId>
+ <version>1.2.0-dev</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>pcs-input</artifactId>
<version>1.0-dev</version>
</dependency>
Modified: incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp (original)
+++ incubator/oodt/trunk/metadata/src/main/cpp/Metadata.cpp Fri Jul 16 03:00:26 2010
@@ -223,6 +223,7 @@ DOMDocument* Metadata::toXML(void){
{
//DOMDocumentType* pDoctype = impl->createDocumentType( NULL, NULL, NULL );
DOMDocument* doc = impl->createDocument(
+ // FIXME: change namespace URI?
X("http://oodt.jpl.nasa.gov/1.0/cas"), // root element namespace URI.
X("cas:metadata"), // root element name
NULL/*pDoctype*/); // document type object (DTD).
Modified: incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml (original)
+++ incubator/oodt/trunk/metadata/src/main/cpp/data/sample.met.xml Fri Jul 16 03:00:26 2010
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!-- FIXME: change namespace URI? -->
<cas:metadata xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<keyval type="scalar">
Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/Metadata.java Fri Jul 16 03:00:26 2010
@@ -38,7 +38,7 @@ import java.io.UnsupportedEncodingExcept
import java.io.InputStream;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
/**
* @author mattmann
@@ -396,6 +396,7 @@ public class Metadata {
document = builder.newDocument();
Element root = (Element) document.createElement("cas:metadata");
+ // FIXME: change namespace URI?
root.setAttribute("xmlns:cas", "http://oodt.jpl.nasa.gov/1.0/cas");
document.appendChild(root);
Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/SerializableMetadata.java Fri Jul 16 03:00:26 2010
@@ -19,7 +19,7 @@
package org.apache.oodt.cas.metadata;
//JDK imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import java.io.IOException;
import java.io.InputStream;
@@ -166,6 +166,7 @@ public class SerializableMetadata extend
Document document = factory.newDocumentBuilder().newDocument();
Element root = (Element) document.createElement("cas:metadata");
+ // FIXME: change namespace URI?
root.setAttribute("xmlns:cas", "http://oodt.jpl.nasa.gov/1.0/cas");
document.appendChild(root);
Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/CmdLineMetExtractor.java Fri Jul 16 03:00:26 2010
@@ -30,8 +30,8 @@ import java.util.logging.Level;
import org.apache.oodt.cas.metadata.AbstractMetExtractor;
import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.commons.exec.EnvUtilities;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.exec.EnvUtilities;
+import org.apache.oodt.commons.xml.XMLUtils;
/**
* @author mattmann
Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java Fri Jul 16 03:00:26 2010
@@ -23,7 +23,7 @@ import org.apache.oodt.cas.metadata.MetE
import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternMetExtractor.java Fri Jul 16 03:00:26 2010
@@ -35,7 +35,7 @@ import org.apache.oodt.cas.metadata.Meta
import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
import org.apache.oodt.cas.metadata.extractors.CmdLineMetExtractor;
-import org.apache.oodt.cas.commons.exec.ExecUtils;
+import org.apache.oodt.commons.exec.ExecUtils;
/**
* @author mattmann
Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreConditionComparator.java Fri Jul 16 03:00:26 2010
@@ -22,7 +22,7 @@ package org.apache.oodt.cas.metadata.pre
import java.io.File;
//OODT imports
-import org.apache.oodt.cas.commons.spring.SpringSetIdInjectionType;
+import org.apache.oodt.commons.spring.SpringSetIdInjectionType;
import org.apache.oodt.cas.metadata.MetExtractor;
import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException;
Modified: incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java (original)
+++ incubator/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/util/PathUtils.java Fri Jul 16 03:00:26 2010
@@ -33,8 +33,8 @@ import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
//OODT imports
-import org.apache.oodt.cas.commons.date.DateUtils;
-import org.apache.oodt.cas.commons.exec.EnvUtilities;
+import org.apache.oodt.commons.date.DateUtils;
+import org.apache.oodt.commons.exec.EnvUtilities;
import org.apache.oodt.cas.metadata.Metadata;
/**
Modified: incubator/oodt/trunk/metadata/src/main/resources/examples/extern-config.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/resources/examples/extern-config.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/resources/examples/extern-config.xml (original)
+++ incubator/oodt/trunk/metadata/src/main/resources/examples/extern-config.xml Fri Jul 16 03:00:26 2010
@@ -10,6 +10,7 @@
Description: XML Configuration file describing external command-line metadata extractor
to be run through ExternMetExtractor facade.
-->
+<!-- FIXME: change namespace URI? -->
<cas:externextractor xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<!--
Modified: incubator/oodt/trunk/metadata/src/main/resources/examples/met_extr_preconditions.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/resources/examples/met_extr_preconditions.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/resources/examples/met_extr_preconditions.xml (original)
+++ incubator/oodt/trunk/metadata/src/main/resources/examples/met_extr_preconditions.xml Fri Jul 16 03:00:26 2010
@@ -16,10 +16,10 @@
<!-- Precondition Comparators -->
- <bean id="PreconditionComparator" lazy-init="true" abstract="true" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.PreConditionComparator"/>
+ <bean id="PreconditionComparator" lazy-init="true" abstract="true" class="org.apache.oodt.cas.metadata.preconditions.PreConditionComparator"/>
- <bean id="CheckThatDataFileSizeIsGreaterThanZero" lazy-init="true" parent="PreconditionComparator" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.FileSizeComparator">
+ <bean id="CheckThatDataFileSizeIsGreaterThanZero" lazy-init="true" parent="PreconditionComparator" class="org.apache.oodt.cas.metadata.preconditions.FileSizeComparator">
<property name="description" value="Check if the current data file size is greater than zero"/>
<property name="compareItem">
<value type="java.lang.Long">0</value>
@@ -27,7 +27,7 @@
<property name="type" value="greater_than"/>
</bean>
- <bean id="CheckThatDataFileExists" lazy-init="true" parent="PreconditionComparator" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.ExistanceCheckComparator">
+ <bean id="CheckThatDataFileExists" lazy-init="true" parent="PreconditionComparator" class="org.apache.oodt.cas.metadata.preconditions.ExistanceCheckComparator">
<property name="description" value="Check if the current data file exists"/>
<property name="compareItem">
<value type="java.lang.Boolean">true</value>
@@ -35,7 +35,7 @@
<property name="type" value="equal_to"/>
</bean>
- <bean id="CheckDataFileMimeType" lazy-init="true" parent="PreconditionComparator" class="gov.nasa.jpl.oodt.cas.metadata.preconditions.MimeTypeComparator">
+ <bean id="CheckDataFileMimeType" lazy-init="true" parent="PreconditionComparator" class="org.apache.oodt.cas.metadata.preconditions.MimeTypeComparator">
<property name="description" value="Check that data file mime type matches the specified mime type"/>
<property name="compareItem">
<value type="java.lang.String">application/xml</value>
Modified: incubator/oodt/trunk/metadata/src/main/resources/examples/samplemet.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/resources/examples/samplemet.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/resources/examples/samplemet.xml (original)
+++ incubator/oodt/trunk/metadata/src/main/resources/examples/samplemet.xml Fri Jul 16 03:00:26 2010
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- FIXME: change namespace URI? -->
<cas:metadata xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<keyval>
<key>Filename</key>
Modified: incubator/oodt/trunk/metadata/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/main/resources/logging.properties?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/main/resources/logging.properties (original)
+++ incubator/oodt/trunk/metadata/src/main/resources/logging.properties Fri Jul 16 03:00:26 2010
@@ -19,10 +19,10 @@ java.util.logging.ConsoleHandler.level =
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
# Set the default logging level for the subsystems
-gov.nasa.jpl.oodt.cas.metadata.level = SEVERE
-gov.nasa.jpl.oodt.cas.metadata.extractors.level = SEVERE
-gov.nasa.jpl.oodt.cas.metadata.preconditions.level = SEVERE
-gov.nasa.jpl.oodt.cas.metadata.util.level = SEVERE
+org.apache.oodt.cas.metadata.level = SEVERE
+org.apache.oodt.cas.metadata.extractors.level = SEVERE
+org.apache.oodt.cas.metadata.preconditions.level = SEVERE
+org.apache.oodt.cas.metadata.util.level = SEVERE
# quiet the unit tests
org.springframework.beans.level = SEVERE
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=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/site/xdoc/user/advanced.xml (original)
+++ incubator/oodt/trunk/metadata/src/site/xdoc/user/advanced.xml Fri Jul 16 03:00: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.
+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-Metadata Advanced User Guide</title>
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=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/site/xdoc/user/basic.xml (original)
+++ incubator/oodt/trunk/metadata/src/site/xdoc/user/basic.xml Fri Jul 16 03:00: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>CAS-Metadata Basic User Guide</title>
@@ -147,7 +155,7 @@ public class Metadata {
<subsection name="Java API">
<p>The CAS-Metadata project contains an interface class,
- <code>gov.nasa.jpl.oodt.cas.metadata.MetExtractor</code>. This API consists of
+ <code>org.apache.oodt.cas.metadata.MetExtractor</code>. This API consists of
two primary methods (with multiple method signatures each). This API can be seen
below:</p>
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestMetadata.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestMetadata.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestMetadata.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestMetadata.java Fri Jul 16 03:00:26 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.metadata;
+package org.apache.oodt.cas.metadata;
//JUnit imports
import junit.framework.TestCase;
@@ -29,7 +29,7 @@ import java.util.Vector;
import java.util.Hashtable;
//OODT imports
-import gov.nasa.jpl.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
/**
* @author mattmann
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/TestSerializableMetadata.java Fri Jul 16 03:00:26 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.metadata;
+package org.apache.oodt.cas.metadata;
//JDK imports
import java.io.ByteArrayInputStream;
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestCopyAndRewriteExtractor.java Fri Jul 16 03:00:26 2010
@@ -16,10 +16,10 @@
*/
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
//OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.Metadata;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractor.java Fri Jul 16 03:00:26 2010
@@ -16,11 +16,11 @@
*/
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
//OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestExternMetExtractorConfigReader.java Fri Jul 16 03:00:26 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestMetReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestMetReader.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestMetReader.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/TestMetReader.java Fri Jul 16 03:00:26 2010
@@ -16,15 +16,15 @@
*/
-package gov.nasa.jpl.oodt.cas.metadata.extractors;
+package org.apache.oodt.cas.metadata.extractors;
//JDK imports
import java.io.File;
//OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.MetExtractor; //for javadoc
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
-import gov.nasa.jpl.oodt.cas.metadata.exceptions.MetExtractionException;
+import org.apache.oodt.cas.metadata.MetExtractor; //for javadoc
+import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
//Junit imports
import junit.framework.TestCase;
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/samplemet.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/samplemet.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/samplemet.xml (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/samplemet.xml Fri Jul 16 03:00:26 2010
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- FIXME: change namespace URI? -->
<cas:metadata xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<keyval>
<key>Filename</key>
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testExtractor
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testExtractor?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testExtractor (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testExtractor Fri Jul 16 03:00:26 2010
@@ -18,4 +18,4 @@ set PROD_DIR
if [ $PROD_DIR = $MET_DIR ]; then
# just copy the sample metadata
cp samplemet.xml $MET_FILE
-fi
\ No newline at end of file
+fi
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testfile2.txt.met
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testfile2.txt.met?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testfile2.txt.met (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/extractors/testfile2.txt.met Fri Jul 16 03:00:26 2010
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- FIXME: change namespace URI? -->
<cas:metadata xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<keyval>
<key>Filename</key>
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java Fri Jul 16 03:00:26 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.metadata.preconditions;
+package org.apache.oodt.cas.metadata.preconditions;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestPathUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestPathUtils.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestPathUtils.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/util/TestPathUtils.java Fri Jul 16 03:00:26 2010
@@ -16,14 +16,14 @@
*/
-package gov.nasa.jpl.oodt.cas.metadata.util;
+package org.apache.oodt.cas.metadata.util;
//JDK imports
import java.util.List;
import java.util.Vector;
//OODT imports
-import gov.nasa.jpl.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.metadata.Metadata;
//Junit imports
import junit.framework.TestCase;
Modified: incubator/oodt/trunk/mvn/skin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/mvn/skin/pom.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/mvn/skin/pom.xml (original)
+++ incubator/oodt/trunk/mvn/skin/pom.xml Fri Jul 16 03:00:26 2010
@@ -1,20 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2008 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.
+-->
<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>
- <artifactId>oodt-core</artifactId>
- <version>2.0</version>
- </parent>
- <artifactId>oodt-m2-skin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <name>OODT Maven2 Site Skin</name>
- <description>OODT Maven2 Site Skin</description>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>gov.nasa.jpl.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>2.0</version>
+ </parent>
+ <artifactId>oodt-m2-skin</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <name>OODT Maven2 Site Skin</name>
+ <description>OODT Maven2 Site Skin</description>
</project>
Modified: incubator/oodt/trunk/mvn/skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/mvn/skin/src/main/resources/META-INF/maven/site.vm?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/mvn/skin/src/main/resources/META-INF/maven/site.vm (original)
+++ incubator/oodt/trunk/mvn/skin/src/main/resources/META-INF/maven/site.vm Fri Jul 16 03:00:26 2010
@@ -1,4 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
#macro ( link $href $name )
#if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
@@ -305,12 +307,11 @@
#end
#end
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>$title</title>
<style type="text/css" media="all">
@import url("$relativePath/css/maven-theme.css");
- @import url("$relativePath/css/oodt.css");
</style>
<link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
#foreach( $author in $authors )
@@ -335,68 +336,6 @@
<body class="composite">
-
- <!-- NASA style -->
-<table border="0" cellspacing="0" cellpadding="0" align="center" valign="top" bgcolor="#FFFFFF" width="750">
-<tr bgcolor="#000000">
-<td bgcolor="#000000" width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-<td bgcolor="#000000" width="730"><img src="$relativePath/images/spacer.gif" alt="spacer" width="730" height="10"/></td>
-<td bgcolor="#000000" width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-</tr>
-<tr>
-<td width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-<td width="730"><img src="$relativePath/images/spacer.gif" alt="spacer" width="730" height="10"/></td>
-<td width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-</tr>
-<tr>
-<td width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-<td width="730">
-
- <table id="nasaBanner" border="0" cellspacing="0" cellpadding="8" width="730">
- <tr>
- <!-- organization logo -->
- <td bgcolor="#cccccc" width="379">
- #set ( $logo = "${project.properties.organizationLogo}" )
- #if ( $logo )
- ## set url to org or project url
- #set ( $url = "${project.organization.url}" )
- #if ( $url )
- #set ( $home = "${project.organization.url}" )
- #else
- #set ( $home = "${project.url}" )
- #end
-
- ## set image to relative or complete
-
- #set ( $image = "${project.properties.organizationLogo}" )
- #if ( !$image.startsWith('http://') )
- #set ( $image = "$relativePath${image}" )
- #end
-
- <a href="$home">
- <img src="$image" align="left" alt="${project.organization.name}" border="0"/>
- </a>
- #end
- </td>
-
- <!-- NASA portal -->
- <td bgcolor="#cccccc" valign="middle" align="left" width="171">
- <a class="navLnkBlack" href="http://www.nasa.gov/"><span class="nasaBannerLinks">+ View the NASA Portal</span></a><br/>
- <a class="navLnkBlack" href="http://www.nasa.gov/about/highlights/En_Espanol.html"><span class="nasaBannerLinks">+ NASA en Español</span></a><br/>
- <a class="navLnkBlack" href="http://www.nasa.gov/about/contact/"><span class="nasaBannerLinks">+ Contact NASA</span></a> </td>
-
- <!-- Search box -->
- <td id="jplSearch" width="180" bgcolor="#006699" align="center" valign="middle"><center>
- <font size="2" face="arial" color="#ffffff">Search the API    </font>
- <form method="post" action="/ashkelon/search.do">
- <input type="hidden" name="simple" value="true"/>
- <input type="hidden" name="srch_type" value="class"/>
- <input name="searchField" maxlength="100" size="10" type="text" value=""/>
- <input height="14" border="0" name="search" width="16" type="image" alt="Search" src="$relativePath/images/arrow.gif" title="search"/>
- </form></center>
- </td>
- </tr>
- </table>
<div id="login">
#set ( $logo = "${project.properties.logo}" )
@@ -479,20 +418,6 @@
</div>
#end
-#if ( $project.properties.genDownloadLinks )
- <div>
- <strong>Download</strong>
- <div>
- <strong>Binary</strong>
- <div><small><a href="/download-guard/dg?group=${project.groupId}&type=distributions&artifact=${project.artifactId}-${project.version}.zip">${project.version}.zip</a></small></div>
- <div><small><a href="/download-guard/dg?group=${project.groupId}&type=distributions&artifact=${project.artifactId}-${project.version}.tar.gz">${project.version}.tar.gz</a></small></div>
- <strong>Source</strong>
- <div><small><a href="/download-guard/dg?group=${project.groupId}&type=distributions&artifact=${project.artifactId}-${project.version}-src.zip">${project.version}-src.zip</a></small></div>
- <div><small><a href="/download-guard/dg?group=${project.groupId}&type=distributions&artifact=${project.artifactId}-${project.version}-src.tar.gz">${project.version}-src.tar.gz</a></small></div>
- </div>
- </div>
-#end
-
#if ( $decoration.body.menus )
#mainMenu ( $decoration.body.menus )
@@ -537,55 +462,7 @@
</table>
</div>
-<table cellpadding="0" cellspacing="0" border="0" bgcolor="#cccccc" width="730">
- <tr>
- <td valign="top" width="135">
- <a href="http://www.firstgov.gov"><img src="$relativePath/images/logo_first_gov.gif" width="125" height="42" alt="FirstGov - Your First Click to the US Governmnet" border="0"/></a>
- </td>
- <td valign="top" width="330">
- <br/><a href="http://www.hq.nasa.gov/office/pao/FOIA/" class="navLnkBlack"><span class="nasaBannerLinks">+ Freedom of Information Act</span></a>
- <br/><a href="http://www.nasa.gov/about/highlights/HP_Privacy.html" class="navLnkBlack"><span class="nasaBannerLinks">+ NASA Privacy Statement, Disclaimer,<br/><img src="$relativePath/images/spacer.gif" width="9" height="1" alt="" border="0"/>and Accessibility Certification</span></a>
- <br/><a href="http://f2m.nasa.gov/" class="navLnkBlack"><span class="nasaBannerLinks">+ Freedom to Manage</span></a>
- </td>
- <td width="60" valign="top">
- <a href="http://www.nasa.gov/home/index.html">
- <img src="$relativePath/images/logo_nasa.gif" width="49" height="48" alt="NASA" border="0"/>
- </a>
- </td>
- <td class="light" width="205" valign="top">
- <br/>Editor: Sean Kelly
- <br/>NASA Official: Dan Crichton
- <br/>#publishDate ( $decoration.publishDate.position $decoration.publishDate $project.version )
- <br/><a href="http://www.nasa.gov/about/contact/index.html" class="navLnkBlack"><span class="nasaBannerLinks">+ Contact NASA</span></a>
- </td>
- </tr>
- <tr>
- <td colspan="4">
- <img src="$relativePath/images/spacer.gif" width="1" height="19" alt="" border="0"/>
- </td>
- </tr>
-</table>
-
-</td>
-<td width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-</tr>
-<tr>
-<td width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-<td width="730"><img src="$relativePath/images/spacer.gif" alt="spacer" width="730" height="10"/></td>
-<td width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-</tr>
-<tr bgcolor="#000000">
-<td bgcolor="#000000" width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-<td bgcolor="#000000" width="730"><img src="$relativePath/images/spacer.gif" alt="spacer" width="730" height="10"/></td>
-<td bgcolor="#000000" width="10"><img src="$relativePath/images/spacer.gif" alt="spacer" width="10" height="1"/></td>
-</tr>
-
-
-
-</table>
-
-
-
+<address>#publishDate ( $decoration.publishDate.position $decoration.publishDate $project.version )</address>
</body>
Modified: incubator/oodt/trunk/mvn/skin/src/main/resources/css/maven-theme.css
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/mvn/skin/src/main/resources/css/maven-theme.css?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/mvn/skin/src/main/resources/css/maven-theme.css (original)
+++ incubator/oodt/trunk/mvn/skin/src/main/resources/css/maven-theme.css Fri Jul 16 03:00:26 2010
@@ -1,15 +1,25 @@
-/*
- * Copyright 2008 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 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.
*/
body {
- font-family: Helvetica, Arial, sans-serif;
- background: #000;
- color: #000;
- }
+ font-family: Helvetica, Arial, sans-serif;
+ background: white;
+ color: black;
+}
.app h3 {
color: #fff;
@@ -91,7 +101,7 @@ div#banner {
}
a[name]:hover, #leftcol a[name]:hover {
- color: inherit !important;
+ color: inherit;
}
a:link, #breadcrumbs a:visited, #navcolumn a:visited, .app a:visited, .tasknav a:visited {
@@ -99,11 +109,11 @@ a:link, #breadcrumbs a:visited, #navcolu
}
a:active, a:hover, #leftcol a:active, #leftcol a:hover {
- color: #f30 !important;
+ color: #f30;
}
a:link.selfref, a:visited.selfref {
- color: #555 !important;
+ color: #555;
}
h3, h4 {
Propchange: incubator/oodt/trunk/pcs-input/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 03:00:26 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Added: incubator/oodt/trunk/pcs-input/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pcs-input/pom.xml?rev=964663&view=auto
==============================================================================
--- incubator/oodt/trunk/pcs-input/pom.xml (added)
+++ incubator/oodt/trunk/pcs-input/pom.xml Fri Jul 16 03:00:26 2010
@@ -0,0 +1,80 @@
+<?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 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>
+ <artifactId>pcs-input</artifactId>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>2.0</version>
+ </parent>
+ <name>Process Control System Input Data Package</name>
+ <version>1.0-dev</version>
+ <packaging>jar</packaging>
+ <description>The Process Control System's data handling package. This package contains data structures
+ and readers and writers to write an input file format similar to HDF, as represented in XML.
+ </description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <systemProperties>
+ <property>
+ <name>javax.xml.transform.TransformerFactory</name>
+ <value>com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl</value>
+ </property>
+ </systemProperties>
+ <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/pcs/input</targetPath>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>pge-config-example.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>commons</artifactId>
+ <version>1.2.0-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileException.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileException.java?rev=964663&view=auto
==============================================================================
--- incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileException.java (added)
+++ incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileException.java Fri Jul 16 03:00:26 2010
@@ -0,0 +1,56 @@
+// 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.
+
+package org.apache.oodt.pcs.input;
+
+/**
+ *
+ * <p>
+ * A PGEConfigFileException is thrown by the {@link PGEConfigFileReader} when
+ * there is some general error parsing the {@link PGEConfigurationFile}.
+ * </p>
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class PGEConfigFileException extends Exception {
+
+ /* needed for serializable interface */
+ private static final long serialVersionUID = 92938858585L;
+
+ /**
+ * <p>
+ * Constructs a new PGEConfigFileException.
+ * </p>
+ */
+ public PGEConfigFileException() {
+ super();
+ }
+
+ /**
+ * <p>
+ * Constructs a new PGEConfigFileException with the given <code>message</code>
+ * .
+ * </p>
+ *
+ * @param message
+ * The error message.
+ */
+ public PGEConfigFileException(String message) {
+ super(message);
+ }
+
+}
Added: incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java?rev=964663&view=auto
==============================================================================
--- incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java (added)
+++ incubator/oodt/trunk/pcs-input/src/main/java/org/apache/oodt/pcs/input/PGEConfigFileKeys.java Fri Jul 16 03:00:26 2010
@@ -0,0 +1,59 @@
+// 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.
+
+package org.apache.oodt.pcs.input;
+
+/**
+ *
+ * <p>
+ * Metadata keys used when building a {@link PGEConfigurationFile}
+ * </p>
+ *
+ * @author mattmann
+ * @version $Revision$
+ */
+public interface PGEConfigFileKeys {
+
+ public static final String RECORDED_AUX_INPUT_FILES_GROUP = "RecordedAuxiliaryInputFiles";
+
+ public static final String DYNAMIC_AUX_INPUT_FILES_GROUP = "DynamicAuxiliaryInputFiles";
+
+ public static final String INPUT_PRODUCT_FILES_GROUP = "InputProductFiles";
+
+ public static final String PRODUCT_PATH_GROUP = "ProductPathGroup";
+
+ public static final String PGE_NAME_GROUP = "PGENameGroup";
+
+ public static final String MODE_GROUP = "ModeGroup";
+
+ public static final String GEOMETRY_GROUP = "Geometry";
+
+ public static final String PRIMARY_EXECUTABLE_GROUP = "PrimaryExecutable";
+
+ public static final String SFIF_FILE_GROUP = "StaticFileIdentificationFiles";
+
+ public static final String JOB_IDENTIFICATION_GROUP = "JobIdentification";
+
+ public static final String SCF_IDENTIFICATION_GROUP = "SCFIdentification";
+
+ public static final String MONITOR_GROUP = "MonitorGroup";
+
+ public static final String MONITOR_LEVEL_GROUP = "MonitorLevel";
+
+ public static final String LOG_METADATA_GROUP = "LogMetadata";
+
+ public static final String COMMAND_LINE_PARAMETERS_GROUP = "CommandLineParameters";
+
+}