Author: lewismc
Date: Tue Jun 17 03:46:26 2014
New Revision: 1603047
URL: http://svn.apache.org/r1603047
Log:
OODT-685 Fix OODT 0.7-SNAPSHOT Jenkins nightly build on Ubuntu 1st Pass
Added:
oodt/trunk/filemgr/src/test/java/
oodt/trunk/filemgr/src/test/java/org/
- copied from r1603043, oodt/trunk/filemgr/src/test/org/
oodt/trunk/filemgr/src/test/resources/
oodt/trunk/filemgr/src/test/resources/cmd-line-actions.xml
oodt/trunk/filemgr/src/test/resources/cmd-line-options.xml
oodt/trunk/filemgr/src/test/resources/filemgr.properties
oodt/trunk/filemgr/src/test/resources/ingest/
- copied from r1592924, oodt/trunk/filemgr/src/testdata/ingest/
oodt/trunk/filemgr/src/test/resources/mime-types.xml
- copied unchanged from r1592924,
oodt/trunk/filemgr/src/main/resources/mime-types.xml
oodt/trunk/filemgr/src/test/resources/repomgr/
- copied from r1592924, oodt/trunk/filemgr/src/testdata/repomgr/
oodt/trunk/filemgr/src/test/resources/test.logging.properties
- copied unchanged from r1592924,
oodt/trunk/filemgr/src/testdata/test.logging.properties
oodt/trunk/filemgr/src/test/resources/test.txt
- copied unchanged from r1592924, oodt/trunk/filemgr/src/testdata/test.txt
oodt/trunk/filemgr/src/test/resources/testcat.mapped.sql
- copied unchanged from r1592924,
oodt/trunk/filemgr/src/testdata/testcat.mapped.sql
oodt/trunk/filemgr/src/test/resources/testcat.ordered.sql
- copied unchanged from r1592924,
oodt/trunk/filemgr/src/testdata/testcat.ordered.sql
oodt/trunk/filemgr/src/test/resources/testcat.sql
- copied unchanged from r1592924,
oodt/trunk/filemgr/src/testdata/testcat.sql
oodt/trunk/filemgr/src/test/resources/testcatalog.typemap.properties
- copied unchanged from r1592924,
oodt/trunk/filemgr/src/testdata/testcatalog.typemap.properties
oodt/trunk/filemgr/src/test/resources/vallayer/
- copied from r1592924, oodt/trunk/filemgr/src/testdata/vallayer/
oodt/trunk/filemgr/src/test/resources/xmlrpc-struct-factory/
- copied from r1592924,
oodt/trunk/filemgr/src/testdata/xmlrpc-struct-factory/
oodt/trunk/filemgr/src/test/resources/xmlrpc-struct-factory/product-types.xml
Removed:
oodt/trunk/filemgr/src/main/resources/REMOVE.log
oodt/trunk/filemgr/src/test/java/org/apache/
oodt/trunk/filemgr/src/test/org/
oodt/trunk/filemgr/src/testdata/
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/pom.xml
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/RepositoryManagerException.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml
oodt/trunk/filemgr/src/main/resources/filemgr.properties
oodt/trunk/pushpull/pom.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Jun 17 03:46:26 2014
@@ -3,6 +3,10 @@ Apache OODT Change Log
Release 0.7 - Current Development
--------------------------------------------
+
+* OODT-685 Fix OODT 0.7-SNAPSHOT Jenkins nightly build on Ubuntu 1st Pass
(lewismc) includes
+ OODT-688 filemgr jar should not ship with ALL resources, and (lewismc)
+ OODT-691 Remove inactive jglobus repository from pushpull pom.xml (lewismc)
* OODT-708 Add PGE RADiX Archetype (skhudiky)
Modified: oodt/trunk/filemgr/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/pom.xml?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
--- oodt/trunk/filemgr/pom.xml (original)
+++ oodt/trunk/filemgr/pom.xml Tue Jun 17 03:46:26 2014
@@ -36,18 +36,43 @@
<url>http://svn.apache.org/viewvc/oodt/trunk/filemgr</url>
</scm>
<build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <!--targetPath>${project.basedir}/target/classes/</targetPath-->
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.4.3</version>
<configuration>
- <forkMode>pertest</forkMode>
+ <!--forkMode>pertest</forkMode-->
+ <forkMode>none</forkMode> <!-- so we can DEBUG -->
+ <argLine>-enableassertions</argLine>
<useSystemClassLoader>false</useSystemClassLoader>
<systemProperties>
<property>
<name>java.util.logging.config.file</name>
- <value>${basedir}/src/testdata/test.logging.properties</value>
+ <value>src/test/resources/test.logging.properties</value>
</property>
</systemProperties>
<forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
@@ -262,12 +287,6 @@
<version>1.8.0.7</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
<version>2.2-beta1</version>
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
Tue Jun 17 03:46:26 2014
@@ -39,6 +39,8 @@ import org.apache.oodt.commons.util.Date
//SPRING imports
import org.springframework.util.StringUtils;
+
+
//JDK imports
import java.sql.Connection;
import java.sql.ResultSet;
@@ -52,6 +54,7 @@ import java.util.UUID;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.sql.DataSource;
/**
@@ -1943,7 +1946,8 @@ public class DataSourceCatalog implement
}
- private List<Product> getProductsFromCache(String productTypeId) {
+ @SuppressWarnings("unchecked")
+ private List<Product> getProductsFromCache(String productTypeId) {
List<Product> products = null;
if (PRODUCT_CACHE.get(productTypeId) == null) {
@@ -1966,7 +1970,8 @@ public class DataSourceCatalog implement
PRODUCT_CACHE.put(productTypeId, productListAndUpdateTime);
}
- private List<Product> getProductsByProductTypeCached(ProductType type) {
+ @SuppressWarnings("unused")
+ private List<Product> getProductsByProductTypeCached(ProductType type) {
List<Product> products = null;
// check the product cache first
if (stillFresh(type.getProductTypeId())) {
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/AddProductTypeCliAction.java
Tue Jun 17 03:46:26 2014
@@ -56,7 +56,6 @@ public class AddProductTypeCliAction ext
+ getClient().addProductType(type));
} catch (Exception e) {
throw new CmdLineActionException("Failed to add product type with "
- + "name '" + productTypeName + "', description '"
+ productTypeDescription + "', repository '"
+ fileRepositoryPath + ", and versioner '" + versioner + "' : "
+ e.getMessage(), e);
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/datatransfer/LocalDataTransferer.java
Tue Jun 17 03:46:26 2014
@@ -247,7 +247,7 @@ public class LocalDataTransferer impleme
if (transferType.equals("dir")) {
p.setProductStructure(Product.STRUCTURE_HIERARCHICAL);
dirReference.setDataStoreReference(new File(new URI(productRepo))
- .toURL().toExternalForm()
+ .toURI().toURL().toExternalForm()
+ URLEncoder.encode(p.getProductName(), "UTF-8") + "/");
p.getProductReferences().add(dirReference);
/* we'll do a simple versioning scheme ourselves: no versioning! */
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CmdLineIngester.java
Tue Jun 17 03:46:26 2014
@@ -21,10 +21,10 @@ package org.apache.oodt.cas.filemgr.inge
//OODT imports
import org.apache.oodt.cas.filemgr.structs.exceptions.IngestException;
import org.apache.oodt.cas.metadata.MetExtractor;
-import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.cas.metadata.util.GenericMetadataObjectFactory;
+
//JDK imports
import java.io.BufferedReader;
import java.io.File;
@@ -106,7 +106,7 @@ public class CmdLineIngester extends Std
CmdLineIngester ingester = new CmdLineIngester(transferServiceFactory);
MetExtractor extractor = null;
if (readFromStdin) {
- List prods = readProdFilesFromStdin();
+ List<String> prods = readProdFilesFromStdin();
extractor = GenericMetadataObjectFactory
.getMetExtractorFromClassName(extractorClassName);
ingester.ingest(new URL(fmUrlStr), prods, extractor, new File(
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManager.java
Tue Jun 17 03:46:26 2014
@@ -267,7 +267,7 @@ public class XMLRepositoryManager implem
InputStream xmlInputStream = null;
try {
- xmlInputStream = new File(xmlFile).toURL().openStream();
+ xmlInputStream = new File(xmlFile).toURI().toURL().openStream();
} catch (IOException e) {
LOG.log(Level.WARNING,
"IOException when getting input stream from [" + xmlFile
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/RepositoryManagerException.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/RepositoryManagerException.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/RepositoryManagerException.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/exceptions/RepositoryManagerException.java
Tue Jun 17 03:46:26 2014
@@ -21,7 +21,8 @@ package org.apache.oodt.cas.filemgr.stru
* @author mattmann
* @version $Revision$
*
- * <p>An exception thrown from the RepositoryManager interface.</p>
+ * <p>An exception thrown from the {@link
org.apache.oodt.cas.filemgr.repository.RepositoryManager}
+ * interface.</p>
*
*/
public class RepositoryManagerException extends Exception {
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
Tue Jun 17 03:46:26 2014
@@ -59,6 +59,7 @@ import org.apache.oodt.cas.filemgr.datat
import com.google.common.collect.Lists;
+
//JDK imports
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -942,7 +943,7 @@ public class XmlRpcFileManager {
return true;
}
- public boolean modifyProduct(Hashtable productHash) throws
CatalogException {
+ public boolean modifyProduct(Hashtable<?, ?> productHash) throws
CatalogException {
Product p = XmlRpcStructFactory.getProductFromXmlRpc(productHash);
try {
@@ -1014,8 +1015,6 @@ public class XmlRpcFileManager {
System.exit(1);
}
- XmlRpcFileManager manager = new XmlRpcFileManager(portNum);
-
for (;;)
try {
Thread.currentThread().join();
@@ -1245,6 +1244,7 @@ public class XmlRpcFileManager {
return query;
}
+ @SuppressWarnings("unchecked")
private List<QueryResult> applyFilterToResults(
List<QueryResult> queryResults, QueryFilter queryFilter)
throws Exception {
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
Tue Jun 17 03:46:26 2014
@@ -24,11 +24,8 @@ import org.apache.xmlrpc.XmlRpcClientExc
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.XmlRpcTransport;
import org.apache.xmlrpc.XmlRpcTransportFactory;
-
//JDK imports
import java.net.URL;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.util.Hashtable;
import java.util.List;
import java.util.Vector;
@@ -37,7 +34,6 @@ import java.util.logging.Logger;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.File;
-
//OODT imports
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
@@ -354,6 +350,7 @@ public class XmlRpcFileManagerClient {
}
+ @SuppressWarnings("unchecked")
public FileTransferStatus getCurrentFileTransfer()
throws DataTransferException {
Vector<Object> argList = new Vector<Object>();
@@ -378,6 +375,7 @@ public class XmlRpcFileManagerClient {
return status;
}
+ @SuppressWarnings("unchecked")
public List<FileTransferStatus> getCurrentFileTransfers()
throws DataTransferException {
Vector<Object> argList = new Vector<Object>();
@@ -450,6 +448,7 @@ public class XmlRpcFileManagerClient {
return -1.0;
}
+ @SuppressWarnings("unchecked")
public ProductPage pagedQuery(Query query, ProductType type, int pageNum)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -475,6 +474,7 @@ public class XmlRpcFileManagerClient {
return XmlRpcStructFactory.getProductPageFromXmlRpc(pageHash);
}
+ @SuppressWarnings("unchecked")
public ProductPage getFirstPage(ProductType type) throws CatalogException {
Vector<Object> argList = new Vector<Object>();
argList.add(XmlRpcStructFactory.getXmlRpcProductType(type));
@@ -499,6 +499,7 @@ public class XmlRpcFileManagerClient {
}
+ @SuppressWarnings("unchecked")
public ProductPage getLastPage(ProductType type) throws CatalogException {
Vector<Object> argList = new Vector<Object>();
argList.add(XmlRpcStructFactory.getXmlRpcProductType(type));
@@ -522,6 +523,7 @@ public class XmlRpcFileManagerClient {
return page;
}
+ @SuppressWarnings("unchecked")
public ProductPage getNextPage(ProductType type, ProductPage currPage)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -547,6 +549,7 @@ public class XmlRpcFileManagerClient {
return page;
}
+ @SuppressWarnings("unchecked")
public ProductPage getPrevPage(ProductType type, ProductPage currPage)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -630,6 +633,7 @@ public class XmlRpcFileManagerClient {
return numProducts.intValue();
}
+ @SuppressWarnings("unchecked")
public List<Product> getTopNProducts(int n) throws CatalogException {
Vector<Object> argList = new Vector<Object>();
argList.add(new Integer(n));
@@ -650,6 +654,7 @@ public class XmlRpcFileManagerClient {
return topNProductList;
}
+ @SuppressWarnings("unchecked")
public List<Product> getTopNProducts(int n, ProductType type)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -760,6 +765,7 @@ public class XmlRpcFileManagerClient {
return productId;
}
+ @SuppressWarnings("unchecked")
public Metadata getMetadata(Product product) throws CatalogException {
Vector<Object> argList = new Vector<Object>();
Hashtable<String, Object> productHash = XmlRpcStructFactory
@@ -783,7 +789,8 @@ public class XmlRpcFileManagerClient {
}
- public Metadata getReducedMetadata(Product product, List elements)
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public Metadata getReducedMetadata(Product product, List<?> elements)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
Hashtable<String, Object> productHash = XmlRpcStructFactory
@@ -859,6 +866,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public List<Product> getProductsByProductType(ProductType type)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -884,6 +892,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public List<Element> getElementsByProductType(ProductType type)
throws ValidationLayerException {
Vector<Object> argList = new Vector<Object>();
@@ -910,6 +919,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public Element getElementById(String elementId)
throws ValidationLayerException {
Vector<Object> argList = new Vector<Object>();
@@ -933,6 +943,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public Element getElementByName(String elementName)
throws ValidationLayerException {
Vector<Object> argList = new Vector<Object>();
@@ -956,6 +967,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public Element getElementByName(String elementName, ProductType type)
throws ValidationLayerException {
Vector<Object> argList = new Vector<Object>();
@@ -987,6 +999,7 @@ public class XmlRpcFileManagerClient {
.getXmlRpcComplexQuery(complexQuery);
Vector<Object> argList = new Vector<Object>();
argList.add(complexQueryHash);
+ @SuppressWarnings("unchecked")
Vector<Hashtable<String, Object>> queryResultHashVector =
(Vector<Hashtable<String, Object>>) client
.execute("filemgr.complexQuery", argList);
return XmlRpcStructFactory
@@ -997,6 +1010,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public List<Product> query(Query query, ProductType type)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -1028,6 +1042,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public ProductType getProductTypeByName(String productTypeName)
throws RepositoryManagerException {
Hashtable<String, Object> productTypeHash = new Hashtable<String,
Object>();
@@ -1038,7 +1053,7 @@ public class XmlRpcFileManagerClient {
productTypeHash = (Hashtable<String, Object>) client.execute(
"filemgr.getProductTypeByName", argList);
} catch (XmlRpcException e) {
- throw new RepositoryManagerException(e.getMessage());
+ throw new RepositoryManagerException(e.getLocalizedMessage());
} catch (IOException e) {
throw new RepositoryManagerException(e.getMessage());
}
@@ -1050,6 +1065,7 @@ public class XmlRpcFileManagerClient {
.getProductTypeFromXmlRpc(productTypeHash);
}
+ @SuppressWarnings("unchecked")
public ProductType getProductTypeById(String productTypeId)
throws RepositoryManagerException {
Hashtable<String, Object> productTypeHash = new Hashtable<String,
Object>();
@@ -1072,6 +1088,7 @@ public class XmlRpcFileManagerClient {
.getProductTypeFromXmlRpc(productTypeHash);
}
+ @SuppressWarnings("unchecked")
public List<ProductType> getProductTypes()
throws RepositoryManagerException {
Vector<Object> argList = new Vector<Object>();
@@ -1095,6 +1112,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public List<Reference> getProductReferences(Product product)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -1121,6 +1139,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public Product getProductById(String productId) throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -1143,6 +1162,7 @@ public class XmlRpcFileManagerClient {
}
}
+ @SuppressWarnings("unchecked")
public Product getProductByName(String productName) throws
CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -1286,6 +1306,7 @@ public class XmlRpcFileManagerClient {
}
+ @SuppressWarnings("unchecked")
public Metadata getCatalogValues(Metadata metadata, ProductType
productType)
throws XmlRpcException, IOException {
Vector<Object> args = new Vector<Object>();
@@ -1299,6 +1320,7 @@ public class XmlRpcFileManagerClient {
return m;
}
+ @SuppressWarnings("unchecked")
public Metadata getOrigValues(Metadata metadata, ProductType productType)
throws XmlRpcException, IOException {
Vector<Object> args = new Vector<Object>();
@@ -1312,6 +1334,7 @@ public class XmlRpcFileManagerClient {
return m;
}
+ @SuppressWarnings("unchecked")
public Query getCatalogQuery(Query query, ProductType productType)
throws XmlRpcException, IOException {
Vector<Object> args = new Vector<Object>();
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/GenericFileManagerObjectFactory.java
Tue Jun 17 03:46:26 2014
@@ -21,6 +21,13 @@ package org.apache.oodt.cas.filemgr.util
import java.util.logging.Level;
import java.util.logging.Logger;
+
+
+
+
+
+
+
//OODT imports
import org.apache.oodt.cas.filemgr.datatransfer.DataTransfer;
import org.apache.oodt.cas.filemgr.datatransfer.DataTransferFactory;
@@ -71,6 +78,7 @@ public final class GenericFileManagerObj
* provide DataTransfer objects.
* @return A newly instantiated {@link DataTransfer} object.
*/
+ @SuppressWarnings("unchecked")
public static DataTransfer getDataTransferServiceFromFactory(
String serviceFactory) {
DataTransferFactory dataTransferFactory = null;
@@ -111,6 +119,7 @@ public final class GenericFileManagerObj
* RepositoryManager objects.
* @return A newly constructed {@link RepositoryManager} object.
*/
+ @SuppressWarnings("unchecked")
public static RepositoryManager getRepositoryManagerServiceFromFactory(
String serviceFactory) {
RepositoryManagerFactory factory = null;
@@ -151,6 +160,7 @@ public final class GenericFileManagerObj
* Catalog objects.
* @return A newly constructed {@link Catalog} object.
*/
+ @SuppressWarnings("unchecked")
public static Catalog getCatalogServiceFromFactory(String serviceFactory) {
CatalogFactory factory = null;
Class<CatalogFactory> clazz = null;
@@ -191,6 +201,7 @@ public final class GenericFileManagerObj
* @return A new {@link ValidationLayer}, created from the specified
* ValidationLayerFactory.
*/
+ @SuppressWarnings("unchecked")
public static ValidationLayer getValidationLayerFromFactory(
String serviceFactory) {
ValidationLayerFactory factory = null;
@@ -220,6 +231,7 @@ public final class GenericFileManagerObj
return null;
}
+ @SuppressWarnings("unchecked")
public static Cache getCacheFromFactory(String serviceFactory){
CacheFactory factory = null;
Class<CacheFactory> clazz = null;
@@ -260,6 +272,7 @@ public final class GenericFileManagerObj
*/
public static Versioner getVersionerFromClassName(String className) {
try {
+ @SuppressWarnings("unchecked")
Class<Versioner> versionerClass = (Class<Versioner>)
Class.forName(className);
return versionerClass.newInstance();
} catch (ClassNotFoundException e) {
@@ -284,6 +297,7 @@ public final class GenericFileManagerObj
public static FilemgrMetExtractor getExtractorFromClassName(String
className) {
try {
+ @SuppressWarnings("unchecked")
Class<FilemgrMetExtractor> extractorClass =
(Class<FilemgrMetExtractor>) Class.forName(className);
return extractorClass.newInstance();
} catch (ClassNotFoundException e) {
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
Tue Jun 17 03:46:26 2014
@@ -44,7 +44,6 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Vector;
import java.util.List;
-import java.util.logging.Logger;
/**
* @author mattmann
@@ -60,10 +59,6 @@ import java.util.logging.Logger;
*/
public final class XmlRpcStructFactory {
- /* our log stream */
- private static final Logger LOG = Logger
- .getLogger(XmlRpcStructFactory.class.getName());
-
private XmlRpcStructFactory() throws InstantiationException {
throw new InstantiationException(
"Don't instantiate XmlRpcStructFactories!");
@@ -80,6 +75,7 @@ public final class XmlRpcStructFactory {
return statusHash;
}
+ @SuppressWarnings("unchecked")
public static FileTransferStatus getFileTransferStatusFromXmlRpc(
Hashtable<String, Object> statusHash) {
FileTransferStatus status = new FileTransferStatus();
@@ -128,6 +124,7 @@ public final class XmlRpcStructFactory {
return productPageHash;
}
+ @SuppressWarnings("unchecked")
public static ProductPage getProductPageFromXmlRpc(Hashtable<String,
Object> productPageHash) {
ProductPage page = new ProductPage();
page.setPageNum(((Integer) productPageHash.get("pageNum")).intValue());
@@ -160,6 +157,7 @@ public final class XmlRpcStructFactory {
return complexQueryHash;
}
+ @SuppressWarnings("unchecked")
public static ComplexQuery getComplexQueryFromXmlRpc(Hashtable<String,
Object> complexQueryHash) {
ComplexQuery complexQuery = new ComplexQuery();
complexQuery.setCriteria(getQueryFromXmlRpc(complexQueryHash).getCriteria());
@@ -188,6 +186,7 @@ public final class XmlRpcStructFactory {
String startDateTimeMetKey = (String)
queryFilterHash.get("startDateTimeMetKey");
String endDateTimeMetKey = (String)
queryFilterHash.get("endDateTimeMetKey");
String priorityMetKey = (String) queryFilterHash.get("priorityMetKey");
+ @SuppressWarnings("unchecked")
FilterAlgor filterAlgor = getFilterAlgorFromXmlRpc((Hashtable<String,
Object>) queryFilterHash.get("filterAlgor"));
QueryFilter queryFilter = new QueryFilter(startDateTimeMetKey,
endDateTimeMetKey, priorityMetKey, filterAlgor);
queryFilter.setConverter(GenericFileManagerObjectFactory.getVersionConverterFromClassName((String)
queryFilterHash.get("versionConverterClass")));
@@ -230,6 +229,7 @@ public final class XmlRpcStructFactory {
return queryResultHash;
}
+ @SuppressWarnings("unchecked")
public static QueryResult getQueryResultFromXmlRpc(Hashtable<String,
Object> queryResultHash) {
Product product = getProductFromXmlRpc((Hashtable<String, Object>)
queryResultHash.get("product"));
Metadata metadata = new Metadata();
@@ -267,7 +267,8 @@ public final class XmlRpcStructFactory {
return productHash;
}
- public static Product getProductFromXmlRpc(Hashtable<String, Object>
productHash) {
+ @SuppressWarnings("unchecked")
+ public static Product getProductFromXmlRpc(Hashtable<?, ?> productHash) {
Product product = new Product();
product.setProductId((String) productHash.get("id"));
product.setProductName((String) productHash.get("name"));
@@ -371,6 +372,7 @@ public final class XmlRpcStructFactory {
return productTypeHash;
}
+ @SuppressWarnings("unchecked")
public static ProductType getProductTypeFromXmlRpc(Hashtable<String,
Object> productTypeHash) {
ProductType type = new ProductType();
type.setDescription((String) productTypeHash.get("description"));
@@ -380,7 +382,7 @@ public final class XmlRpcStructFactory {
type.setVersioner((String) productTypeHash.get("versionerClass"));
if (productTypeHash.get("typeMetadata") != null) {
Metadata typeMet = new Metadata();
- typeMet.addMetadata((Hashtable)
productTypeHash.get("typeMetadata"));
+ typeMet.addMetadata((Hashtable<String, Object>)
productTypeHash.get("typeMetadata"));
type.setTypeMetadata(typeMet);
}
if (productTypeHash.get("typeExtractors") != null) {
@@ -452,6 +454,7 @@ public final class XmlRpcStructFactory {
return extractors;
}
+ @SuppressWarnings("unchecked")
public static ExtractorSpec getExtractorSpecFromXmlRpc(
Hashtable<String, Object> extractorSpecHash) {
ExtractorSpec spec = new ExtractorSpec();
@@ -612,6 +615,7 @@ public final class XmlRpcStructFactory {
public static Query getQueryFromXmlRpc(Hashtable<String, Object>
queryHash) {
Query query = new Query();
+ @SuppressWarnings("unchecked")
List<QueryCriteria> criteria =
getQueryCriteriaListFromXmlRpc((Vector<Hashtable<String, Object>>) queryHash
.get("criteria"));
query.setCriteria(criteria);
@@ -696,6 +700,7 @@ public final class XmlRpcStructFactory {
} catch (QueryFormulationException e){
System.out.println("Error generating Boolean Query.");
}
+ @SuppressWarnings("unchecked")
List<Hashtable<String, Object>> terms = (List<Hashtable<String,
Object>>) criteriaHash.get("terms");
for(int i=0;i<terms.size();i++){
Hashtable<String, Object> term = terms.get(i);
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
Tue Jun 17 03:46:26 2014
@@ -28,9 +28,11 @@ import java.util.Properties;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -109,6 +111,7 @@ public final class XmlStructFactory {
Element keyValElem = (Element) keyValElems.item(i);
String elemName = XMLUtils.read(keyValElem, "key");
+ @SuppressWarnings("unchecked")
List<String> elemValues = XMLUtils.readMany(keyValElem, "val");
metHash.put(elemName, elemValues);
}
Modified: oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml (original)
+++ oodt/trunk/filemgr/src/main/resources/cmd-line-options.xml Tue Jun 17
03:46:26 2014
@@ -117,30 +117,6 @@
</property>
</bean>
- <bean id="typeName"
class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
- <property name="shortOption" value="tn" />
- <property name="longOption" value="typeName" />
- <property name="description" value="ProductType name" />
- <property name="hasArgs" value="true" />
- <property name="argsDescription" value="product-type-name" />
- <property name="requirementRules">
- <list>
- <bean
class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule"
- p:actionName="addProductType" p:relation="REQUIRED" />
- </list>
- </property>
- <property name="handler">
- <bean
class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler">
- <property name="applyToActions">
- <list>
- <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction"
- p:actionName="addProductType" p:methodName="setProductTypeName"
/>
- </list>
- </property>
- </bean>
- </property>
- </bean>
-
<bean id="typeDesc"
class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
<property name="shortOption" value="td" />
<property name="longOption" value="typeDesc" />
Modified: oodt/trunk/filemgr/src/main/resources/filemgr.properties
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/resources/filemgr.properties?rev=1603047&r1=1603046&r2=1603047&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/filemgr.properties (original)
+++ oodt/trunk/filemgr/src/main/resources/filemgr.properties Tue Jun 17
03:46:26 2014
@@ -153,4 +153,4 @@ org.apache.oodt.cas.filemgr.metadata.exp
#org.apache.oodt.cas.filemgr.versioning.configuration.<product_type>=[Year]/[Month]/[Filename]
# Enable to use only server-side versioning.
-#org.apache.oodt.cas.filemgr.serverside.versioning=true
\ No newline at end of file
+#org.apache.oodt.cas.filemgr.serverside.versioning=true
Added: oodt/trunk/filemgr/src/test/resources/cmd-line-actions.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/resources/cmd-line-actions.xml?rev=1603047&view=auto
==============================================================================
--- oodt/trunk/filemgr/src/test/resources/cmd-line-actions.xml (added)
+++ oodt/trunk/filemgr/src/test/resources/cmd-line-actions.xml Tue Jun 17
03:46:26 2014
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+
+ Author: bfoster (Brian Foster)
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:p="http://www.springframework.org/schema/p";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+
+ <bean id="addProductType"
class="org.apache.oodt.cas.filemgr.cli.action.AddProductTypeCliAction">
+ <property name="description" value="Adds a ProductType to list
of supported ProductTypes" />
+ </bean>
+ <bean id="deleteProductByName"
class="org.apache.oodt.cas.filemgr.cli.action.DeleteProductByNameCliAction">
+ <property name="description" value="Delete Product by name" />
+ </bean>
+ <bean id="deleteProductById"
class="org.apache.oodt.cas.filemgr.cli.action.DeleteProductByIdCliAction">
+ <property name="description" value="Delete Product by ID" />
+ </bean>
+ <bean id="dumpMetadata"
class="org.apache.oodt.cas.filemgr.cli.action.DumpMetadataCliAction">
+ <property name="description" value="Dumps Product Metadata out to XML" />
+ </bean>
+ <bean id="getCurrentTransfer"
class="org.apache.oodt.cas.filemgr.cli.action.GetCurrentTransferCliAction">
+ <property name="description" value="Gets the status of the current Product
file transfer" />
+ </bean>
+ <bean id="getCurrentTransfers"
class="org.apache.oodt.cas.filemgr.cli.action.GetCurrentTransfersCliAction">
+ <property name="description" value="Gets the status of the current Product
file transfers" />
+ </bean>
+ <bean id="getFilePercentTransferred"
class="org.apache.oodt.cas.filemgr.cli.action.GetFilePercentTransferredCliAction">
+ <property name="description" value="Gets the percent amount transferred of
given file" />
+ </bean>
+ <bean id="getFirstPage"
class="org.apache.oodt.cas.filemgr.cli.action.GetFirstPageCliAction">
+ <property name="description" value="Gets first page of Products of given
ProductType" />
+ </bean>
+ <bean id="getLastPage"
class="org.apache.oodt.cas.filemgr.cli.action.GetLastPageCliAction">
+ <property name="description" value="Gets last page of Products of given
ProductType" />
+ </bean>
+ <bean id="getNextPage"
class="org.apache.oodt.cas.filemgr.cli.action.GetNextPageCliAction">
+ <property name="description" value="Gets next page of Products of given
ProductType" />
+ </bean>
+ <bean id="getNumProducts"
class="org.apache.oodt.cas.filemgr.cli.action.GetNumProductsCliAction">
+ <property name="description" value="Gets number of Products ingested for a
given ProductType" />
+ </bean>
+ <bean id="getPrevPage"
class="org.apache.oodt.cas.filemgr.cli.action.GetPrevPageCliAction">
+ <property name="description" value="Gets prev page of Products of given
ProductType" />
+ </bean>
+ <bean id="getProductByName"
class="org.apache.oodt.cas.filemgr.cli.action.GetProductByNameCliAction">
+ <property name="description" value="Get Product info by name" />
+ </bean>
+ <bean id="getProductById"
class="org.apache.oodt.cas.filemgr.cli.action.GetProductByIdCliAction">
+ <property name="description" value="Gets Product info by ID" />
+ </bean>
+ <bean id="getProductPercentTransferred"
class="org.apache.oodt.cas.filemgr.cli.action.GetProductPercentTransferredCliAction">
+ <property name="description" value="Gets percent amount transferred of a
Products data files" />
+ </bean>
+ <bean id="getProductTypeByName"
class="org.apache.oodt.cas.filemgr.cli.action.GetProductTypeByNameCliAction">
+ <property name="description" value="Gets a ProductType by its name" />
+ </bean>
+ <bean id="hasProduct"
class="org.apache.oodt.cas.filemgr.cli.action.HasProductCliAction">
+ <property name="description" value="Checks if Product with given name has
been ingested" />
+ </bean>
+ <bean id="ingestProduct"
class="org.apache.oodt.cas.filemgr.cli.action.IngestProductCliAction">
+ <property name="description" value="Ingests a Product" />
+ </bean>
+ <bean id="luceneQuery"
class="org.apache.oodt.cas.filemgr.cli.action.LuceneQueryCliAction">
+ <property name="description" value="Queries by parsing an Lucene-like
query into a FileManager Query" />
+ </bean>
+ <bean id="retrieveFilesById"
class="org.apache.oodt.cas.filemgr.cli.action.RetrieveFilesCliAction">
+ <property name="description" value="Retrieve a Product's files by Product
ID" />
+ </bean>
+ <bean id="retrieveFilesByName"
class="org.apache.oodt.cas.filemgr.cli.action.RetrieveFilesCliAction">
+ <property name="description" value="Retrieve a Product's files by Product
name" />
+ </bean>
+ <bean id="sqlQuery"
class="org.apache.oodt.cas.filemgr.cli.action.SqlQueryCliAction">
+ <property name="description" value="Queries by parsing an SQL-like query
into a FileManager Query" />
+ <property name="detailedDescription">
+ <value>
+ This supports sending queries to the FileManager in form of
+ SELECT [Elements] FROM [ProductTypes] WHERE [where-clause], where:
+ - [Elements]: is a comma separated list of Element names; may also be *
which
+ represents all Elements
+ - [ProductTypes]: is a comma separated list of ProductType names; may also
+ be * which represents all ProductTypes
+ - [where-clause]: is an optional Element name filter supporting the
following:
+ * AND and OR boolean operators
+ * () grouping of queries
+ * element-name == 'element-value'
+ * element-name < 'element-value'
+ * element-name > 'element-value'
+ * element-name <= 'element-value'
+ * element-name >= 'element-value'"
+
+ An additional post-query FilterAlgor can also be specified where you specify
+ which Metadata fields which should be used as each Product's StartDateTime,
+ EndDateTime, and Priority values
+ </value>
+ </property>
+ <property name="examples">
+ <value>
+ (Assume you have a ProductType, GenericFile, which supports the
+ Elements: Filename, NominalDate, Group, and DataVersion)
+ $ ./filemgr-client -u http://localhost:9000 -op -sql
+ -q "SELECT Filename FROM GenericFile WHERE (NominalDate == '2011-20-10' OR
+ NominalDate == '2011-20-11') AND Group == 'Test' AND DataVersion > '1.0'"
+ (Returns all Products in FileManager -- use with care)
+ $ ./filemgr-client -u http://localhost:9000 -op -sql -q "SELECT * FROM *"
+ </value>
+ </property>
+ </bean>
+</beans>
