Author: lewismc
Date: Tue Jun 17 03:55:51 2014
New Revision: 1603049
URL: http://svn.apache.org/r1603049
Log:
revert OODT-685 Fix OODT 0.7-SNAPSHOT Jenkins nightly build on Ubuntu 1st Pass
Added:
oodt/trunk/filemgr/src/main/resources/REMOVE.log
- copied unchanged from r1602971,
oodt/trunk/filemgr/src/main/resources/REMOVE.log
oodt/trunk/filemgr/src/test/org/
- copied from r1602971, oodt/trunk/filemgr/src/test/org/
oodt/trunk/filemgr/src/testdata/
- copied from r1602971, 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=1603049&r1=1603048&r2=1603049&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Jun 17 03:55:51 2014
@@ -3,10 +3,6 @@ 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=1603049&r1=1603048&r2=1603049&view=diff
==============================================================================
--- oodt/trunk/filemgr/pom.xml (original)
+++ oodt/trunk/filemgr/pom.xml Tue Jun 17 03:55:51 2014
@@ -36,43 +36,18 @@
<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>none</forkMode> <!-- so we can DEBUG -->
- <argLine>-enableassertions</argLine>
+ <forkMode>pertest</forkMode>
<useSystemClassLoader>false</useSystemClassLoader>
<systemProperties>
<property>
<name>java.util.logging.config.file</name>
- <value>src/test/resources/test.logging.properties</value>
+ <value>${basedir}/src/testdata/test.logging.properties</value>
</property>
</systemProperties>
<forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
@@ -287,6 +262,12 @@
<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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -39,8 +39,6 @@ import org.apache.oodt.commons.util.Date
//SPRING imports
import org.springframework.util.StringUtils;
-
-
//JDK imports
import java.sql.Connection;
import java.sql.ResultSet;
@@ -54,7 +52,6 @@ import java.util.UUID;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
-
import javax.sql.DataSource;
/**
@@ -1946,8 +1943,7 @@ public class DataSourceCatalog implement
}
- @SuppressWarnings("unchecked")
- private List<Product> getProductsFromCache(String productTypeId) {
+ private List<Product> getProductsFromCache(String productTypeId) {
List<Product> products = null;
if (PRODUCT_CACHE.get(productTypeId) == null) {
@@ -1970,8 +1966,7 @@ public class DataSourceCatalog implement
PRODUCT_CACHE.put(productTypeId, productListAndUpdateTime);
}
- @SuppressWarnings("unused")
- private List<Product> getProductsByProductTypeCached(ProductType type) {
+ 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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -56,6 +56,7 @@ 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=1603049&r1=1603048&r2=1603049&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:55:51 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))
- .toURI().toURL().toExternalForm()
+ .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=1603049&r1=1603048&r2=1603049&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:55:51 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<String> prods = readProdFilesFromStdin();
+ List 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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -267,7 +267,7 @@ public class XMLRepositoryManager implem
InputStream xmlInputStream = null;
try {
- xmlInputStream = new File(xmlFile).toURI().toURL().openStream();
+ xmlInputStream = new File(xmlFile).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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -21,8 +21,7 @@ package org.apache.oodt.cas.filemgr.stru
* @author mattmann
* @version $Revision$
*
- * <p>An exception thrown from the {@link
org.apache.oodt.cas.filemgr.repository.RepositoryManager}
- * interface.</p>
+ * <p>An exception thrown from the 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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -59,7 +59,6 @@ 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;
@@ -943,7 +942,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 {
@@ -1015,6 +1014,8 @@ public class XmlRpcFileManager {
System.exit(1);
}
+ XmlRpcFileManager manager = new XmlRpcFileManager(portNum);
+
for (;;)
try {
Thread.currentThread().join();
@@ -1244,7 +1245,6 @@ 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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -24,8 +24,11 @@ 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;
@@ -34,6 +37,7 @@ 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;
@@ -350,7 +354,6 @@ public class XmlRpcFileManagerClient {
}
- @SuppressWarnings("unchecked")
public FileTransferStatus getCurrentFileTransfer()
throws DataTransferException {
Vector<Object> argList = new Vector<Object>();
@@ -375,7 +378,6 @@ public class XmlRpcFileManagerClient {
return status;
}
- @SuppressWarnings("unchecked")
public List<FileTransferStatus> getCurrentFileTransfers()
throws DataTransferException {
Vector<Object> argList = new Vector<Object>();
@@ -448,7 +450,6 @@ 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>();
@@ -474,7 +475,6 @@ 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,7 +499,6 @@ public class XmlRpcFileManagerClient {
}
- @SuppressWarnings("unchecked")
public ProductPage getLastPage(ProductType type) throws CatalogException {
Vector<Object> argList = new Vector<Object>();
argList.add(XmlRpcStructFactory.getXmlRpcProductType(type));
@@ -523,7 +522,6 @@ public class XmlRpcFileManagerClient {
return page;
}
- @SuppressWarnings("unchecked")
public ProductPage getNextPage(ProductType type, ProductPage currPage)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -549,7 +547,6 @@ public class XmlRpcFileManagerClient {
return page;
}
- @SuppressWarnings("unchecked")
public ProductPage getPrevPage(ProductType type, ProductPage currPage)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -633,7 +630,6 @@ 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));
@@ -654,7 +650,6 @@ public class XmlRpcFileManagerClient {
return topNProductList;
}
- @SuppressWarnings("unchecked")
public List<Product> getTopNProducts(int n, ProductType type)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -765,7 +760,6 @@ 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
@@ -789,8 +783,7 @@ public class XmlRpcFileManagerClient {
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public Metadata getReducedMetadata(Product product, List<?> elements)
+ public Metadata getReducedMetadata(Product product, List elements)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
Hashtable<String, Object> productHash = XmlRpcStructFactory
@@ -866,7 +859,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public List<Product> getProductsByProductType(ProductType type)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -892,7 +884,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public List<Element> getElementsByProductType(ProductType type)
throws ValidationLayerException {
Vector<Object> argList = new Vector<Object>();
@@ -919,7 +910,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public Element getElementById(String elementId)
throws ValidationLayerException {
Vector<Object> argList = new Vector<Object>();
@@ -943,7 +933,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public Element getElementByName(String elementName)
throws ValidationLayerException {
Vector<Object> argList = new Vector<Object>();
@@ -967,7 +956,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public Element getElementByName(String elementName, ProductType type)
throws ValidationLayerException {
Vector<Object> argList = new Vector<Object>();
@@ -999,7 +987,6 @@ 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
@@ -1010,7 +997,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public List<Product> query(Query query, ProductType type)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -1042,7 +1028,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public ProductType getProductTypeByName(String productTypeName)
throws RepositoryManagerException {
Hashtable<String, Object> productTypeHash = new Hashtable<String,
Object>();
@@ -1053,7 +1038,7 @@ public class XmlRpcFileManagerClient {
productTypeHash = (Hashtable<String, Object>) client.execute(
"filemgr.getProductTypeByName", argList);
} catch (XmlRpcException e) {
- throw new RepositoryManagerException(e.getLocalizedMessage());
+ throw new RepositoryManagerException(e.getMessage());
} catch (IOException e) {
throw new RepositoryManagerException(e.getMessage());
}
@@ -1065,7 +1050,6 @@ public class XmlRpcFileManagerClient {
.getProductTypeFromXmlRpc(productTypeHash);
}
- @SuppressWarnings("unchecked")
public ProductType getProductTypeById(String productTypeId)
throws RepositoryManagerException {
Hashtable<String, Object> productTypeHash = new Hashtable<String,
Object>();
@@ -1088,7 +1072,6 @@ public class XmlRpcFileManagerClient {
.getProductTypeFromXmlRpc(productTypeHash);
}
- @SuppressWarnings("unchecked")
public List<ProductType> getProductTypes()
throws RepositoryManagerException {
Vector<Object> argList = new Vector<Object>();
@@ -1112,7 +1095,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public List<Reference> getProductReferences(Product product)
throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -1139,7 +1121,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public Product getProductById(String productId) throws CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -1162,7 +1143,6 @@ public class XmlRpcFileManagerClient {
}
}
- @SuppressWarnings("unchecked")
public Product getProductByName(String productName) throws
CatalogException {
Vector<Object> argList = new Vector<Object>();
@@ -1306,7 +1286,6 @@ public class XmlRpcFileManagerClient {
}
- @SuppressWarnings("unchecked")
public Metadata getCatalogValues(Metadata metadata, ProductType
productType)
throws XmlRpcException, IOException {
Vector<Object> args = new Vector<Object>();
@@ -1320,7 +1299,6 @@ public class XmlRpcFileManagerClient {
return m;
}
- @SuppressWarnings("unchecked")
public Metadata getOrigValues(Metadata metadata, ProductType productType)
throws XmlRpcException, IOException {
Vector<Object> args = new Vector<Object>();
@@ -1334,7 +1312,6 @@ 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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -21,13 +21,6 @@ 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;
@@ -78,7 +71,6 @@ 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;
@@ -119,7 +111,6 @@ public final class GenericFileManagerObj
* RepositoryManager objects.
* @return A newly constructed {@link RepositoryManager} object.
*/
- @SuppressWarnings("unchecked")
public static RepositoryManager getRepositoryManagerServiceFromFactory(
String serviceFactory) {
RepositoryManagerFactory factory = null;
@@ -160,7 +151,6 @@ 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;
@@ -201,7 +191,6 @@ 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;
@@ -231,7 +220,6 @@ public final class GenericFileManagerObj
return null;
}
- @SuppressWarnings("unchecked")
public static Cache getCacheFromFactory(String serviceFactory){
CacheFactory factory = null;
Class<CacheFactory> clazz = null;
@@ -272,7 +260,6 @@ 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) {
@@ -297,7 +284,6 @@ 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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -44,6 +44,7 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Vector;
import java.util.List;
+import java.util.logging.Logger;
/**
* @author mattmann
@@ -59,6 +60,10 @@ import java.util.List;
*/
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!");
@@ -75,7 +80,6 @@ public final class XmlRpcStructFactory {
return statusHash;
}
- @SuppressWarnings("unchecked")
public static FileTransferStatus getFileTransferStatusFromXmlRpc(
Hashtable<String, Object> statusHash) {
FileTransferStatus status = new FileTransferStatus();
@@ -124,7 +128,6 @@ 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());
@@ -157,7 +160,6 @@ 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());
@@ -186,7 +188,6 @@ 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")));
@@ -229,7 +230,6 @@ 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,8 +267,7 @@ public final class XmlRpcStructFactory {
return productHash;
}
- @SuppressWarnings("unchecked")
- public static Product getProductFromXmlRpc(Hashtable<?, ?> productHash) {
+ public static Product getProductFromXmlRpc(Hashtable<String, Object>
productHash) {
Product product = new Product();
product.setProductId((String) productHash.get("id"));
product.setProductName((String) productHash.get("name"));
@@ -372,7 +371,6 @@ 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"));
@@ -382,7 +380,7 @@ public final class XmlRpcStructFactory {
type.setVersioner((String) productTypeHash.get("versionerClass"));
if (productTypeHash.get("typeMetadata") != null) {
Metadata typeMet = new Metadata();
- typeMet.addMetadata((Hashtable<String, Object>)
productTypeHash.get("typeMetadata"));
+ typeMet.addMetadata((Hashtable)
productTypeHash.get("typeMetadata"));
type.setTypeMetadata(typeMet);
}
if (productTypeHash.get("typeExtractors") != null) {
@@ -454,7 +452,6 @@ public final class XmlRpcStructFactory {
return extractors;
}
- @SuppressWarnings("unchecked")
public static ExtractorSpec getExtractorSpecFromXmlRpc(
Hashtable<String, Object> extractorSpecHash) {
ExtractorSpec spec = new ExtractorSpec();
@@ -615,7 +612,6 @@ 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);
@@ -700,7 +696,6 @@ 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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -28,11 +28,9 @@ 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;
@@ -111,7 +109,6 @@ 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=1603049&r1=1603048&r2=1603049&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:55:51 2014
@@ -117,6 +117,30 @@
</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=1603049&r1=1603048&r2=1603049&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/filemgr.properties (original)
+++ oodt/trunk/filemgr/src/main/resources/filemgr.properties Tue Jun 17
03:55:51 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
+#org.apache.oodt.cas.filemgr.serverside.versioning=true
\ No newline at end of file
Modified: oodt/trunk/pushpull/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/pushpull/pom.xml?rev=1603049&r1=1603048&r2=1603049&view=diff
==============================================================================
--- oodt/trunk/pushpull/pom.xml (original)
+++ oodt/trunk/pushpull/pom.xml Tue Jun 17 03:55:51 2014
@@ -31,7 +31,19 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</developerConnection>
<url>http://svn.apache.org/viewvc/oodt/trunk/pushpull</url>
</scm>
-
+ <repositories>
+ <repository>
+ <id>globus-repo</id>
+ <name>Globus Toolkit Internal Maven2 Repository</name>
+
<url>http://projects.iplantcollaborative.org/archiva/repository/internal</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
<build>
<plugins>
<plugin>
