You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@oodt.apache.org by "ASF GitHub Bot (JIRA)" <ji...@apache.org> on 2018/12/01 04:51:01 UTC
[jira] [Commented] (OODT-1002) Rename CoreMetKeys.java in filemgr
and workflow to CoreFilemgrMetKeys.java and CoreWorkflowMetKeys.java
respectively
[ https://issues.apache.org/jira/browse/OODT-1002?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16705633#comment-16705633 ]
ASF GitHub Bot commented on OODT-1002:
--------------------------------------
lewismc closed pull request #88: OODT-1002 Rename CoreMetKeys.java in filemgr and workflow to CoreFilemgrMetKeys.java and CoreWorkflowMetKeys.java respectively
URL: https://github.com/apache/oodt/pull/88
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
index f94686254..52a13b539 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
@@ -21,7 +21,7 @@
import org.apache.oodt.cas.crawl.typedetection.MetExtractorSpec;
import org.apache.oodt.cas.crawl.typedetection.MimeExtractorConfigReader;
import org.apache.oodt.cas.crawl.typedetection.MimeExtractorRepo;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
import org.apache.oodt.cas.metadata.exceptions.NamingConventionException;
@@ -67,7 +67,7 @@
* @author bfoster (Brian Foster)
*/
public class AutoDetectProductCrawler extends ProductCrawler implements
- CoreMetKeys {
+ CoreFilemgrMetKeys {
public static final String MIME_TYPES_HIERARCHY = "MimeTypesHierarchy";
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FilemgrUniquenessChecker.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FilemgrUniquenessChecker.java
index 36b0b37bd..d17ca3b9e 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FilemgrUniquenessChecker.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/FilemgrUniquenessChecker.java
@@ -17,7 +17,7 @@
package org.apache.oodt.cas.crawl.action;
//OODT static imports
-import static org.apache.oodt.cas.filemgr.metadata.CoreMetKeys.PRODUCT_NAME;
+import static org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys.PRODUCT_NAME;
//JDK imports
import java.io.File;
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
index 76f5cd927..744bea062 100755
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/IngestAncillary.java
@@ -26,7 +26,7 @@
import org.apache.oodt.cas.crawl.structs.exceptions.CrawlerActionException;
import org.apache.oodt.cas.filemgr.ingest.Ingester;
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.util.PathUtils;
@@ -81,19 +81,19 @@ public boolean performFileAction(File actionFile, Metadata metadata) {
}
}
- if (ingestMetadata.getMetadata(CoreMetKeys.FILE_LOCATION) == null) {
- ingestMetadata.addMetadata(CoreMetKeys.FILE_LOCATION,
+ if (ingestMetadata.getMetadata(CoreFilemgrMetKeys.FILE_LOCATION) == null) {
+ ingestMetadata.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION,
actionFile.getParent());
}
- if (ingestMetadata.getMetadata(CoreMetKeys.FILENAME) == null) {
- ingestMetadata.addMetadata(CoreMetKeys.FILENAME, actionFile.getName());
+ if (ingestMetadata.getMetadata(CoreFilemgrMetKeys.FILENAME) == null) {
+ ingestMetadata.addMetadata(CoreFilemgrMetKeys.FILENAME, actionFile.getName());
}
- if (ingestMetadata.getMetadata(CoreMetKeys.PRODUCT_NAME) == null) {
- ingestMetadata.addMetadata(CoreMetKeys.PRODUCT_NAME, actionFile.getName()
+ if (ingestMetadata.getMetadata(CoreFilemgrMetKeys.PRODUCT_NAME) == null) {
+ ingestMetadata.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, actionFile.getName()
.substring(0, actionFile.getName().indexOf(".")));
}
- if (ingestMetadata.getMetadata(CoreMetKeys.PRODUCT_TYPE) == null) {
- ingestMetadata.addMetadata(CoreMetKeys.PRODUCT_TYPE, productType);
+ if (ingestMetadata.getMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE) == null) {
+ ingestMetadata.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, productType);
}
try {
@@ -117,7 +117,7 @@ public boolean performFileAction(File actionFile, Metadata metadata) {
if (writeBackKeyPrefix == null) {
writeBackKeyPrefix = "";
}
- ingestMetadata.addMetadata(writeBackKeyPrefix + CoreMetKeys.PRODUCT_ID,
+ ingestMetadata.addMetadata(writeBackKeyPrefix + CoreFilemgrMetKeys.PRODUCT_ID,
identifier);
for (String writeBackKey : writeBackKeys) {
metadata.addMetadata(writeBackKeyPrefix + writeBackKey,
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/WorkflowMgrStatusUpdate.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/WorkflowMgrStatusUpdate.java
index 334216fbf..ac112f579 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/action/WorkflowMgrStatusUpdate.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/action/WorkflowMgrStatusUpdate.java
@@ -23,7 +23,7 @@
//OODT imports
import org.apache.commons.lang.Validate;
import org.apache.oodt.cas.crawl.structs.exceptions.CrawlerActionException;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.workflow.system.WorkflowManagerClient;
import org.apache.oodt.cas.workflow.system.rpc.RpcCommunicationFactory;
@@ -39,7 +39,7 @@
* @author mattmann (Chris Mattmann)
*/
public class WorkflowMgrStatusUpdate extends CrawlerAction implements
- CoreMetKeys {
+ CoreFilemgrMetKeys {
private String ingestSuffix;
private String workflowMgrUrl;
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
index d4f677426..0f71a2567 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
@@ -24,7 +24,7 @@
//OODT imports
import org.apache.oodt.commons.spring.SpringSetIdInjectionType;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.metadata.Metadata;
//Spring imports
@@ -37,7 +37,7 @@
* @author bfoster (Brian Foster)
*/
public abstract class ProductCrawlerBean implements
- SpringSetIdInjectionType, CoreMetKeys {
+ SpringSetIdInjectionType, CoreFilemgrMetKeys {
private HashSet<String> requiredMetadata;
diff --git a/crawler/src/test/java/org/apache/oodt/cas/crawl/TestProductCrawler.java b/crawler/src/test/java/org/apache/oodt/cas/crawl/TestProductCrawler.java
index f0acef1bd..e4d0ae583 100644
--- a/crawler/src/test/java/org/apache/oodt/cas/crawl/TestProductCrawler.java
+++ b/crawler/src/test/java/org/apache/oodt/cas/crawl/TestProductCrawler.java
@@ -36,7 +36,7 @@
import org.apache.oodt.cas.crawl.structs.exceptions.CrawlerActionException;
import org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory;
import org.apache.oodt.cas.filemgr.ingest.Ingester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.exceptions.IngestException;
import org.apache.oodt.cas.metadata.Metadata;
@@ -365,10 +365,10 @@ public void testValidateActions() throws CrawlerActionException {
public void testContainsRequiredMetadata() {
ProductCrawler pc = createDummyCrawler();
Metadata m = new Metadata();
- m.replaceMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
- m.replaceMetadata(CoreMetKeys.FILENAME, "TestFile.txt");
- m.replaceMetadata(CoreMetKeys.FILE_LOCATION, "/tmp/dir");
- m.replaceMetadata(CoreMetKeys.FILE_SIZE, "0");
+ m.replaceMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
+ m.replaceMetadata(CoreFilemgrMetKeys.FILENAME, "TestFile.txt");
+ m.replaceMetadata(CoreFilemgrMetKeys.FILE_LOCATION, "/tmp/dir");
+ m.replaceMetadata(CoreFilemgrMetKeys.FILE_SIZE, "0");
assertTrue(pc.containsRequiredMetadata(m));
assertFalse(pc.containsRequiredMetadata(new Metadata()));
}
@@ -379,11 +379,11 @@ public void testAddKnowMetadata() {
ProductCrawler pc = createDummyCrawler();
pc.addKnownMetadata(p, m);
assertEquals(4, m.getAllKeys().size());
- assertEquals(p.getName(), m.getMetadata(CoreMetKeys.PRODUCT_NAME));
- assertEquals(p.getName(), m.getMetadata(CoreMetKeys.FILENAME));
+ assertEquals(p.getName(), m.getMetadata(CoreFilemgrMetKeys.PRODUCT_NAME));
+ assertEquals(p.getName(), m.getMetadata(CoreFilemgrMetKeys.FILENAME));
assertEquals(p.getParentFile().getAbsolutePath(),
- m.getMetadata(CoreMetKeys.FILE_LOCATION));
- assertEquals(String.valueOf(p.length()), m.getMetadata(CoreMetKeys.FILE_SIZE));
+ m.getMetadata(CoreFilemgrMetKeys.FILE_LOCATION));
+ assertEquals(String.valueOf(p.length()), m.getMetadata(CoreFilemgrMetKeys.FILE_SIZE));
}
public void testCreateIngestStatus() {
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DumpMetadataCliAction.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DumpMetadataCliAction.java
index 28bb2a05e..194e06b58 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DumpMetadataCliAction.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/cli/action/DumpMetadataCliAction.java
@@ -17,8 +17,8 @@
package org.apache.oodt.cas.filemgr.cli.action;
//OODT static imports
-import static org.apache.oodt.cas.filemgr.metadata.CoreMetKeys.FILENAME;
-import static org.apache.oodt.cas.filemgr.metadata.CoreMetKeys.PRODUCT_NAME;
+import static org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys.FILENAME;
+import static org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys.PRODUCT_NAME;
//JDK imports
import java.io.File;
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
index 0195bb651..f4f069b36 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/StdIngester.java
@@ -19,7 +19,7 @@
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
@@ -75,7 +75,7 @@
* </ul>
* </p>.
*/
-public class StdIngester implements Ingester, CoreMetKeys {
+public class StdIngester implements Ingester, CoreFilemgrMetKeys {
/* our log stream */
private final static Logger LOG = Logger.getLogger(StdIngester.class
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreFilemgrMetKeys.java
similarity index 97%
rename from filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
rename to filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreFilemgrMetKeys.java
index d23a7f5de..79d89be32 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreFilemgrMetKeys.java
@@ -24,7 +24,7 @@
*
* <p>Describe your class here</p>.
*/
-public interface CoreMetKeys {
+public interface CoreFilemgrMetKeys {
String PRODUCT_NAME = "ProductName";
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java
index 93daa83ce..7a0099511 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/CoreMetExtractor.java
@@ -18,7 +18,7 @@
package org.apache.oodt.cas.filemgr.metadata.extractors;
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
@@ -36,12 +36,12 @@
* @version $Revision$
*
* <p>
- * The core {@link FilemgrMetExtractor} providing the {@link CoreMetKeys}
+ * The core {@link FilemgrMetExtractor} providing the {@link CoreFilemgrMetKeys}
* for this {@link Product}.
* </p>.
*/
public class CoreMetExtractor extends AbstractFilemgrMetExtractor implements
- CoreMetKeys {
+ CoreFilemgrMetKeys {
private boolean namespaceAware = false;
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/FinalFileLocationExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/FinalFileLocationExtractor.java
index db66eb17c..7375bba82 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/FinalFileLocationExtractor.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/FinalFileLocationExtractor.java
@@ -21,7 +21,7 @@
import java.io.File;
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.metadata.extractors.AbstractFilemgrMetExtractor;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
@@ -40,7 +40,7 @@
*
*/
public class FinalFileLocationExtractor extends AbstractFilemgrMetExtractor
- implements CoreMetKeys {
+ implements CoreFilemgrMetKeys {
private boolean replaceLocation;
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java
index 675de8355..16c43b07e 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/MimeTypeExtractor.java
@@ -25,7 +25,7 @@
import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
//OODT static imports
-import static org.apache.oodt.cas.filemgr.metadata.CoreMetKeys.*;
+import static org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys.*;
/**
* @author mattmann
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
index 9361ead29..0ed54453f 100755
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
@@ -27,7 +27,7 @@
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductPage;
import org.apache.oodt.cas.filemgr.structs.ProductType;
@@ -216,17 +216,17 @@ public void indexMetFile(File file, boolean delete)
SerializableMetadata metadata = new SerializableMetadata("UTF-8", false);
metadata.loadMetadataFromXmlStream(new FileInputStream(file));
metadata.addMetadata("id", metadata.getMetadata("CAS."
- + CoreMetKeys.PRODUCT_ID));
+ + CoreFilemgrMetKeys.PRODUCT_ID));
metadata.addMetadata(config.getProperty(ACCESS_KEY), config
.getProperty(ACCESS_URL)
- + metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID));
+ + metadata.getMetadata("CAS." + CoreFilemgrMetKeys.PRODUCT_ID));
if (delete) {
server
- .deleteById(metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID));
+ .deleteById(metadata.getMetadata("CAS." + CoreFilemgrMetKeys.PRODUCT_ID));
}
server.add(this.getSolrDocument(metadata));
LOG.info("Indexed product: "
- + metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID));
+ + metadata.getMetadata("CAS." + CoreFilemgrMetKeys.PRODUCT_ID));
} catch (InstantiationException e) {
LOG.severe("Could not instantiate metadata object: " + e.getMessage());
} catch (FileNotFoundException e) {
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
index 766acd06f..6b9c6b9d0 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
@@ -20,7 +20,7 @@
//JDK imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductPage;
import org.apache.oodt.cas.filemgr.structs.ProductType;
@@ -364,9 +364,9 @@ public void testAddMetadata() {
try {
Metadata retMet = myCat.getMetadata(testProduct);
assertNotNull(retMet);
- assertTrue(retMet.containsKey(CoreMetKeys.PRODUCT_STRUCTURE));
+ assertTrue(retMet.containsKey(CoreFilemgrMetKeys.PRODUCT_STRUCTURE));
assertEquals(Product.STRUCTURE_FLAT, retMet
- .getMetadata(CoreMetKeys.PRODUCT_STRUCTURE));
+ .getMetadata(CoreFilemgrMetKeys.PRODUCT_STRUCTURE));
} catch (CatalogException e) {
fail(e.getMessage());
}
@@ -441,24 +441,24 @@ public void testQuery() throws Exception {
Metadata prodMet = new Metadata();
URL ingestUrl = this.getClass().getResource(
"/ingest");
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test-file-1.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-1.txt");
prodMet.addMetadata("CAS.ProductName", "TestFile1");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
prodMet.addMetadata("NominalDate", "2008-01-20");
prodMet.addMetadata("DataVersion", "3.6");
myCat.addMetadata(prodMet, testProduct);
// ingest second file
testProduct.setProductId("24");
- prodMet.replaceMetadata(CoreMetKeys.FILENAME, "test-file-2.txt");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-2.txt");
prodMet.replaceMetadata("CAS.ProductName", "TestFile2");
myCat.addMetadata(prodMet, testProduct);
// ingest thrid file
testProduct.setProductId("25");
- prodMet.replaceMetadata(CoreMetKeys.FILENAME, "test-file-2.txt");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-2.txt");
prodMet.replaceMetadata("CAS.ProductName", "TestFile3");
prodMet.replaceMetadata("DataVersion", "4.6");
myCat.addMetadata(prodMet, testProduct);
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
index cecf8036b..9eab4009f 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
@@ -18,7 +18,7 @@
package org.apache.oodt.cas.filemgr.catalog;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.BooleanQueryCriteria;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductPage;
@@ -195,14 +195,14 @@ public void testGetMetadata() throws CatalogException {
myCat.addProduct(product);
myCat.addProductReferences(product);
Metadata m = new Metadata();
- m.addMetadata(CoreMetKeys.FILE_LOCATION, Lists.newArrayList("/loc/1", "/loc/2"));
+ m.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, Lists.newArrayList("/loc/1", "/loc/2"));
myCat.addMetadata(m, product);
Metadata rndTripMet = myCat.getMetadata(product);
assertNotNull(rndTripMet);
- assertEquals(2, rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).size());
- assertTrue(rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).contains("/loc/1"));
- assertTrue(rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).contains("/loc/2"));
+ assertEquals(2, rndTripMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).size());
+ assertTrue(rndTripMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).contains("/loc/1"));
+ assertTrue(rndTripMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).contains("/loc/2"));
}
public void testGetReducedMetadata() throws CatalogException {
@@ -210,15 +210,15 @@ public void testGetReducedMetadata() throws CatalogException {
myCat.addProduct(product);
myCat.addProductReferences(product);
Metadata m = new Metadata();
- m.addMetadata(CoreMetKeys.FILE_LOCATION, Lists.newArrayList("/loc/1", "/loc/2"));
+ m.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, Lists.newArrayList("/loc/1", "/loc/2"));
myCat.addMetadata(m, product);
Metadata rndTripMet = myCat.getReducedMetadata(product,
- Lists.newArrayList(CoreMetKeys.FILE_LOCATION));
+ Lists.newArrayList(CoreFilemgrMetKeys.FILE_LOCATION));
assertNotNull(rndTripMet);
- assertEquals(2, rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).size());
- assertTrue(rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).contains("/loc/1"));
- assertTrue(rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).contains("/loc/2"));
+ assertEquals(2, rndTripMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).size());
+ assertTrue(rndTripMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).contains("/loc/1"));
+ assertTrue(rndTripMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).contains("/loc/2"));
}
public void testGetReducedMetadataNull() throws CatalogException {
@@ -228,11 +228,11 @@ public void testGetReducedMetadataNull() throws CatalogException {
myCat.addMetadata(new Metadata(), p);
// should not throw NPE here
- Metadata rndTripMet = myCat.getReducedMetadata(p, Lists.newArrayList(CoreMetKeys.FILENAME));
+ Metadata rndTripMet = myCat.getReducedMetadata(p, Lists.newArrayList(CoreFilemgrMetKeys.FILENAME));
assertNotNull(rndTripMet);
// should return null if met key has no value
- assertNull(rndTripMet.getAllMetadata(CoreMetKeys.FILENAME));
+ assertNull(rndTripMet.getAllMetadata(CoreFilemgrMetKeys.FILENAME));
}
public void testRemoveProduct() {
@@ -891,9 +891,9 @@ public void testAddMetadata() {
try {
Metadata retMet = myCat.getMetadata(testProduct);
assertNotNull(retMet);
- assertTrue(retMet.containsKey(CoreMetKeys.PRODUCT_STRUCTURE));
+ assertTrue(retMet.containsKey(CoreFilemgrMetKeys.PRODUCT_STRUCTURE));
assertEquals(Product.STRUCTURE_FLAT, retMet
- .getMetadata(CoreMetKeys.PRODUCT_STRUCTURE));
+ .getMetadata(CoreFilemgrMetKeys.PRODUCT_STRUCTURE));
} catch (CatalogException e) {
fail(e.getMessage());
}
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestDumpMetadataCliAction.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestDumpMetadataCliAction.java
index fd735e497..1297f290c 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestDumpMetadataCliAction.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestDumpMetadataCliAction.java
@@ -17,7 +17,7 @@
package org.apache.oodt.cas.filemgr.cli.action;
//OODT static imports
-import static org.apache.oodt.cas.filemgr.metadata.CoreMetKeys.FILENAME;
+import static org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys.FILENAME;
//JDK imports
import java.io.File;
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
index a072ccad9..569cf0aa9 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestCachedIngester.java
@@ -20,7 +20,7 @@
//JDK imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.exceptions.CacheException;
import org.apache.oodt.cas.filemgr.system.FileManagerClient;
@@ -120,7 +120,7 @@ public void testIngest() {
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
@@ -198,7 +198,7 @@ private void ingestTestFile() {
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
index 2c88ff714..b0f664df0 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestLocalCache.java
@@ -20,7 +20,7 @@
//JDK imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.system.FileManagerClient;
import org.apache.oodt.cas.filemgr.system.FileManagerServer;
@@ -195,7 +195,7 @@ private void doIngest() {
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
index d696968f7..6b134a116 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestRmiCache.java
@@ -20,7 +20,7 @@
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.system.FileManagerClient;
import org.apache.oodt.cas.filemgr.system.FileManagerServer;
@@ -213,7 +213,7 @@ private void doIngest() {
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
index 62fc3da89..fdd5ce2c5 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/ingest/TestStdIngester.java
@@ -24,7 +24,7 @@
import java.net.URL;
import java.util.Properties;
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.system.FileManagerClient;
import org.apache.oodt.cas.filemgr.system.FileManagerServer;
@@ -75,7 +75,7 @@ public void testIngest() {
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/TestCoreMetExtractor.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/TestCoreMetExtractor.java
index 612ea7a4b..9f8a9576b 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/TestCoreMetExtractor.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/TestCoreMetExtractor.java
@@ -24,7 +24,7 @@
import java.util.Vector;
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.Reference;
@@ -42,7 +42,7 @@
* Test suite for the {@link CoreMetExtractor}.
* </p>.
*/
-public class TestCoreMetExtractor extends TestCase implements CoreMetKeys {
+public class TestCoreMetExtractor extends TestCase implements CoreFilemgrMetKeys {
private CoreMetExtractor extractor = new CoreMetExtractor();
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestFinalFileLocationExtractor.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestFinalFileLocationExtractor.java
index 6777918d2..b1cc25e68 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestFinalFileLocationExtractor.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestFinalFileLocationExtractor.java
@@ -21,7 +21,7 @@
import java.util.Properties;
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.metadata.Metadata;
@@ -51,7 +51,7 @@ public void testExtract() {
Properties config = new Properties();
config.setProperty("replace", "false");
Metadata met = new Metadata();
- met.addMetadata(CoreMetKeys.FILE_LOCATION, "/tmp");
+ met.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, "/tmp");
FinalFileLocationExtractor extractor = new FinalFileLocationExtractor();
extractor.configure(config);
Metadata extractMet = new Metadata();
@@ -63,14 +63,14 @@ public void testExtract() {
}
assertNotNull(extractMet);
- assertTrue(extractMet.containsKey(CoreMetKeys.FILE_LOCATION));
- assertEquals(2, extractMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).size());
- assertEquals("/tmp", extractMet.getMetadata(CoreMetKeys.FILE_LOCATION));
+ assertTrue(extractMet.containsKey(CoreFilemgrMetKeys.FILE_LOCATION));
+ assertEquals(2, extractMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).size());
+ assertEquals("/tmp", extractMet.getMetadata(CoreFilemgrMetKeys.FILE_LOCATION));
assertEquals("expected final location: [" + expectedFinalLocation
+ "] is not equal to generated location: ["
- + extractMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).get(1) + "]",
+ + extractMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).get(1) + "]",
expectedFinalLocation,
- extractMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).get(1));
+ extractMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).get(1));
// ensure that the data store ref is blank
assertEquals("", p.getProductReferences().get(0).getDataStoreReference());
@@ -86,10 +86,10 @@ public void testExtract() {
}
assertNotNull(extractMet);
- assertTrue(extractMet.containsKey(CoreMetKeys.FILE_LOCATION));
- assertEquals(1, extractMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).size());
+ assertTrue(extractMet.containsKey(CoreFilemgrMetKeys.FILE_LOCATION));
+ assertEquals(1, extractMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).size());
assertEquals(expectedFinalLocation,
- extractMet.getMetadata(CoreMetKeys.FILE_LOCATION));
+ extractMet.getMetadata(CoreFilemgrMetKeys.FILE_LOCATION));
// ensure that the data store ref is blank
assertEquals("", p.getProductReferences().get(0).getDataStoreReference());
@@ -116,7 +116,7 @@ public void testExtractHierarchical() {
Properties config = new Properties();
config.setProperty("replace", "false");
Metadata met = new Metadata();
- met.addMetadata(CoreMetKeys.FILE_LOCATION, "/tmp");
+ met.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, "/tmp");
FinalFileLocationExtractor extractor = new FinalFileLocationExtractor();
extractor.configure(config);
Metadata extractMet = new Metadata();
@@ -128,14 +128,14 @@ public void testExtractHierarchical() {
}
assertNotNull(extractMet);
- assertTrue(extractMet.containsKey(CoreMetKeys.FILE_LOCATION));
- assertEquals(2, extractMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).size());
- assertEquals("/tmp", extractMet.getMetadata(CoreMetKeys.FILE_LOCATION));
+ assertTrue(extractMet.containsKey(CoreFilemgrMetKeys.FILE_LOCATION));
+ assertEquals(2, extractMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).size());
+ assertEquals("/tmp", extractMet.getMetadata(CoreFilemgrMetKeys.FILE_LOCATION));
assertEquals("expected final location: [" + expectedFinalLocation
+ "] is not equal to generated location: ["
- + extractMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).get(1) + "]",
+ + extractMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).get(1) + "]",
expectedFinalLocation,
- extractMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).get(1));
+ extractMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).get(1));
// ensure that the data store ref is blank
assertEquals("", p.getProductReferences().get(0).getDataStoreReference());
@@ -151,10 +151,10 @@ public void testExtractHierarchical() {
}
assertNotNull(extractMet);
- assertTrue(extractMet.containsKey(CoreMetKeys.FILE_LOCATION));
- assertEquals(1, extractMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).size());
+ assertTrue(extractMet.containsKey(CoreFilemgrMetKeys.FILE_LOCATION));
+ assertEquals(1, extractMet.getAllMetadata(CoreFilemgrMetKeys.FILE_LOCATION).size());
assertEquals(expectedFinalLocation,
- extractMet.getMetadata(CoreMetKeys.FILE_LOCATION));
+ extractMet.getMetadata(CoreFilemgrMetKeys.FILE_LOCATION));
// ensure that the data store ref is blank
assertEquals("", p.getProductReferences().get(0).getDataStoreReference());
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java
index 8b4ef91e4..363438509 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/metadata/extractors/examples/TestMimeTypeExtractor.java
@@ -22,7 +22,7 @@
import java.net.URL;
import java.util.Properties;
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.metadata.Metadata;
@@ -38,7 +38,7 @@
* @since OODT-58
*
*/
-public class TestMimeTypeExtractor extends TestCase implements CoreMetKeys {
+public class TestMimeTypeExtractor extends TestCase implements CoreFilemgrMetKeys {
private Properties initialProperties = new Properties(System.getProperties());
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/query/TestQueryResult.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/query/TestQueryResult.java
index 13c61318f..e1b13c235 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/query/TestQueryResult.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/query/TestQueryResult.java
@@ -16,7 +16,7 @@
*/
package org.apache.oodt.cas.filemgr.structs.query;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
@@ -34,7 +34,7 @@ protected void setUp() throws Exception {
Product p = new Product();
p.setProductId("TestProductId");
Metadata m = new Metadata();
- m.addMetadata(CoreMetKeys.FILENAME, "datafile.dat");
+ m.addMetadata(CoreFilemgrMetKeys.FILENAME, "datafile.dat");
m.addMetadata("Owners", Arrays.asList("Bob", "Billy"));
qr = new QueryResult(p, m);
}
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/query/TestQueryResultComparator.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/query/TestQueryResultComparator.java
index 5b46777dc..462a1d065 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/query/TestQueryResultComparator.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/query/TestQueryResultComparator.java
@@ -16,7 +16,7 @@
*/
package org.apache.oodt.cas.filemgr.structs.query;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
@@ -40,17 +40,17 @@ protected void setUp() throws Exception {
Product p = new Product();
p.setProductId("TestProductID");
Metadata m = new Metadata();
- m.addMetadata(CoreMetKeys.FILENAME, "datafile.dat");
+ m.addMetadata(CoreFilemgrMetKeys.FILENAME, "datafile.dat");
m.addMetadata("Owners", Arrays.asList("Chad", "Cam"));
qr1 = new QueryResult(p, m);
Metadata m2 = new Metadata();
- m2.addMetadata(CoreMetKeys.FILENAME, "textfile.dat");
+ m2.addMetadata(CoreFilemgrMetKeys.FILENAME, "textfile.dat");
m2.addMetadata("Owners", Arrays.asList("Bob", "Billy"));
qr2 = new QueryResult(p, m2);
Metadata filename = new Metadata();
- filename.addMetadata(CoreMetKeys.FILENAME, "foo.txt");
+ filename.addMetadata(CoreFilemgrMetKeys.FILENAME, "foo.txt");
qrfilename = new QueryResult(p, filename);
Metadata owners = new Metadata();
@@ -64,7 +64,7 @@ protected void setUp() throws Exception {
public void testCompare() {
List<QueryResult> list = Arrays.asList(qr1, qrowners, qrnull2, qr2, qrnull, qrfilename);
QueryResultComparator c = new QueryResultComparator();
- c.setSortByMetKey(CoreMetKeys.FILENAME);
+ c.setSortByMetKey(CoreFilemgrMetKeys.FILENAME);
Collections.sort(list, c);
assertEquals(qr1, list.get(0));
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/AbstractFileManagerServerTest.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/AbstractFileManagerServerTest.java
index 486532bac..e26e2c10e 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/AbstractFileManagerServerTest.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/AbstractFileManagerServerTest.java
@@ -19,7 +19,7 @@
import junit.framework.TestCase;
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.SerializableMetadata;
@@ -155,9 +155,9 @@ private void ingestTestFile() {
prodMet = new SerializableMetadata(new FileInputStream(new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(refUrl.getFile()), prodMet);
} catch (Exception e) {
fail(e.getMessage());
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestAvroFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestAvroFileManagerClient.java
index 30796ff5b..8c9e00ab6 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestAvroFileManagerClient.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestAvroFileManagerClient.java
@@ -18,7 +18,7 @@
package org.apache.oodt.cas.filemgr.system;
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.query.ComplexQuery;
@@ -50,9 +50,9 @@ public void testGetReducedMetadata() {
List<String> vectorElemList = new Vector<>();
List<String> linkedListElemList = new LinkedList<>();
- arrayListElems.add(CoreMetKeys.FILENAME);
- vectorElemList.add(CoreMetKeys.FILENAME);
- linkedListElemList.add(CoreMetKeys.FILENAME);
+ arrayListElems.add(CoreFilemgrMetKeys.FILENAME);
+ vectorElemList.add(CoreFilemgrMetKeys.FILENAME);
+ linkedListElemList.add(CoreFilemgrMetKeys.FILENAME);
try {
FileManagerClient fmc = new AvroFileManagerClient(new URL("http://localhost:" + FM_PORT));
@@ -71,17 +71,17 @@ public void testGetReducedMetadata() {
reducedMet = fmc.getReducedMetadata(product, arrayListElems);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getMap().keySet().size(), 1);
reducedMet = fmc.getReducedMetadata(product, vectorElemList);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getMap().keySet().size(), 1);
reducedMet = fmc.getReducedMetadata(product, linkedListElemList);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getMap().keySet().size(), 1);
} catch (Exception e) {
fail(e.getMessage());
@@ -93,11 +93,11 @@ public void testIngest() throws Exception {
URL refUrl = this.getClass().getResource("/ingest/test.txt");
Metadata prodMet = new Metadata();
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
StdIngester ingester = new StdIngester(transferServiceFacClass);
String productId = ingester.ingest(
@@ -122,10 +122,10 @@ public void testRemoveFile() throws Exception {
try {
Metadata prodMet = new Metadata();
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test-delete.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test-delete.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
StdIngester ingester = new StdIngester(transferServiceFacClass);
String productId = ingester.ingest(
@@ -155,7 +155,7 @@ public void testMetadataPersistence() throws Exception {
StdIngester ingester = new StdIngester(transferServiceFacClass);
prodMet = new SerializableMetadata(new FileInputStream(metUrl.getFile()));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
String productId = ingester.ingest(
new URL("http://localhost:" + FM_PORT),
new File(refUrl.getFile()), prodMet);
@@ -175,27 +175,27 @@ public void testComplexQuery() throws Exception {
//ingest first file
Metadata prodMet = new Metadata();
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test-file-1.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile1");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-1.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile1");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(refUrl1.getFile()), prodMet);
//ingest second file
- prodMet.replaceMetadata(CoreMetKeys.FILENAME, "test-file-2.txt");
- prodMet.replaceMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile2");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-2.txt");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile2");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(refUrl2.getFile()), prodMet);
//perform complex query
ComplexQuery complexQuery = new ComplexQuery();
List<String> reducedMetadata = new Vector<String>();
- reducedMetadata.add(CoreMetKeys.FILENAME);
+ reducedMetadata.add(CoreFilemgrMetKeys.FILENAME);
complexQuery.setReducedMetadata(reducedMetadata);
List<String> productTypeNames = new Vector<String>();
productTypeNames.add("GenericFile");
complexQuery.setReducedProductTypeNames(productTypeNames);
- complexQuery.setSortByMetKey(CoreMetKeys.FILENAME);
- complexQuery.setToStringResultFormat("$" + CoreMetKeys.FILENAME);
+ complexQuery.setSortByMetKey(CoreFilemgrMetKeys.FILENAME);
+ complexQuery.setToStringResultFormat("$" + CoreFilemgrMetKeys.FILENAME);
complexQuery.addCriterion(SqlParser.parseSqlWhereClause("Filename != 'test.txt'"));
FileManagerClient fmc = new AvroFileManagerClient(new URL("http://localhost:" + FM_PORT));
List<QueryResult> queryResults = fmc.complexQuery(complexQuery);
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManager.java
index 256f0190e..552472559 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManager.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManager.java
@@ -26,7 +26,7 @@
import java.util.Properties;
//OODT imports
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.metadata.ProductMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
@@ -221,9 +221,9 @@ private void ingestTestFile() {
prodMet = new SerializableMetadata(new FileInputStream(
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(refUrl.getFile()), prodMet);
} catch (Exception e) {
e.printStackTrace();
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java
index bf60141eb..e6c590030 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestRpcFileManagerClient.java
@@ -20,7 +20,7 @@
//OODT imports
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.query.ComplexQuery;
@@ -79,9 +79,9 @@ public void testGetReducedMetadata() {
List vectorElemList = new Vector();
List linkedListElemList = new LinkedList();
- arrayListElems.add(CoreMetKeys.FILENAME);
- vectorElemList.add(CoreMetKeys.FILENAME);
- linkedListElemList.add(CoreMetKeys.FILENAME);
+ arrayListElems.add(CoreFilemgrMetKeys.FILENAME);
+ vectorElemList.add(CoreFilemgrMetKeys.FILENAME);
+ linkedListElemList.add(CoreFilemgrMetKeys.FILENAME);
try {
FileManagerClient fmc = RpcCommunicationFactory.createClient(new URL(
@@ -101,17 +101,17 @@ public void testGetReducedMetadata() {
reducedMet = fmc.getReducedMetadata(product, arrayListElems);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getHashTable().keySet().size(), 1);
reducedMet = fmc.getReducedMetadata(product, vectorElemList);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getHashTable().keySet().size(), 1);
reducedMet = fmc.getReducedMetadata(product, linkedListElemList);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getHashTable().keySet().size(), 1);
} catch (Exception e) {
@@ -129,11 +129,11 @@ public void testIngest() throws Exception {
URL refUrl = this.getClass().getResource("/ingest/test.txt");
Metadata prodMet = new Metadata();
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
StdIngester ingester = new StdIngester(transferServiceFacClass);
String productId = ingester.ingest(
@@ -160,7 +160,7 @@ public void testMetadataPersistence() throws Exception {
prodMet = new SerializableMetadata(new FileInputStream(
metUrl.getFile()));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
String productId = ingester.ingest(
new URL("http://localhost:" + FM_PORT),
@@ -182,30 +182,30 @@ public void testComplexQuery() throws Exception {
//ingest first file
Metadata prodMet = new Metadata();
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test-file-1.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile1");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-1.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile1");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl1.getFile()), prodMet);
//ingest second file
- prodMet.replaceMetadata(CoreMetKeys.FILENAME, "test-file-2.txt");
- prodMet.replaceMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile2");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-2.txt");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile2");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl2.getFile()), prodMet);
//perform complex query
ComplexQuery complexQuery = new ComplexQuery();
List<String> reducedMetadata = new Vector<String>();
- reducedMetadata.add(CoreMetKeys.FILENAME);
+ reducedMetadata.add(CoreFilemgrMetKeys.FILENAME);
complexQuery.setReducedMetadata(reducedMetadata);
List<String> productTypeNames = new Vector<String>();
productTypeNames.add("GenericFile");
complexQuery.setReducedProductTypeNames(productTypeNames);
- complexQuery.setSortByMetKey(CoreMetKeys.FILENAME);
- complexQuery.setToStringResultFormat("$" + CoreMetKeys.FILENAME);
+ complexQuery.setSortByMetKey(CoreFilemgrMetKeys.FILENAME);
+ complexQuery.setToStringResultFormat("$" + CoreFilemgrMetKeys.FILENAME);
complexQuery.addCriterion(SqlParser.parseSqlWhereClause("Filename != 'test.txt'"));
FileManagerClient fmc = RpcCommunicationFactory.createClient(new URL(
"http://localhost:" + FM_PORT));
@@ -270,10 +270,10 @@ private void ingestTestFile() {
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
} catch (Exception e) {
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
index c368d489d..4ef6a2fff 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/TestXmlRpcFileManagerClient.java
@@ -21,7 +21,7 @@
//OODT imports
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.query.ComplexQuery;
@@ -64,9 +64,9 @@ public void testGetReducedMetadata() {
List<String> vectorElemList = new Vector<>();
List<String> linkedListElemList = new LinkedList<>();
- arrayListElems.add(CoreMetKeys.FILENAME);
- vectorElemList.add(CoreMetKeys.FILENAME);
- linkedListElemList.add(CoreMetKeys.FILENAME);
+ arrayListElems.add(CoreFilemgrMetKeys.FILENAME);
+ vectorElemList.add(CoreFilemgrMetKeys.FILENAME);
+ linkedListElemList.add(CoreFilemgrMetKeys.FILENAME);
try {
FileManagerClient fmc = new XmlRpcFileManagerClient(new URL("http://localhost:" + FM_PORT));
@@ -85,17 +85,17 @@ public void testGetReducedMetadata() {
reducedMet = fmc.getReducedMetadata(product, arrayListElems);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getMap().keySet().size(), 1);
reducedMet = fmc.getReducedMetadata(product, vectorElemList);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getMap().keySet().size(), 1);
reducedMet = fmc.getReducedMetadata(product, linkedListElemList);
assertNotNull(reducedMet);
- assertTrue(reducedMet.containsKey(CoreMetKeys.FILENAME));
+ assertTrue(reducedMet.containsKey(CoreFilemgrMetKeys.FILENAME));
assertEquals(reducedMet.getMap().keySet().size(), 1);
} catch (Exception e) {
fail(e.getMessage());
@@ -107,11 +107,11 @@ public void testIngest() throws Exception {
URL refUrl = this.getClass().getResource("/ingest/test.txt");
Metadata prodMet = new Metadata();
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
StdIngester ingester = new StdIngester(transferServiceFacClass);
String productId = ingester.ingest(
@@ -131,10 +131,10 @@ public void testRemoveFile() throws Exception {
try {
Metadata prodMet = new Metadata();
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test-delete.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test-delete.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
StdIngester ingester = new StdIngester(transferServiceFacClass);
String productId = ingester.ingest(
@@ -164,7 +164,7 @@ public void testMetadataPersistence() throws Exception {
StdIngester ingester = new StdIngester(transferServiceFacClass);
prodMet = new SerializableMetadata(new FileInputStream(metUrl.getFile()));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
String productId = ingester.ingest(
new URL("http://localhost:" + FM_PORT),
new File(refUrl.getFile()), prodMet);
@@ -184,27 +184,27 @@ public void testComplexQuery() throws Exception {
//ingest first file
Metadata prodMet = new Metadata();
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test-file-1.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile1");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-1.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile1");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(refUrl1.getFile()), prodMet);
//ingest second file
- prodMet.replaceMetadata(CoreMetKeys.FILENAME, "test-file-2.txt");
- prodMet.replaceMetadata(CoreMetKeys.PRODUCT_NAME, "TestFile2");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.FILENAME, "test-file-2.txt");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestFile2");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(refUrl2.getFile()), prodMet);
//perform complex query
ComplexQuery complexQuery = new ComplexQuery();
List<String> reducedMetadata = new Vector<String>();
- reducedMetadata.add(CoreMetKeys.FILENAME);
+ reducedMetadata.add(CoreFilemgrMetKeys.FILENAME);
complexQuery.setReducedMetadata(reducedMetadata);
List<String> productTypeNames = new Vector<String>();
productTypeNames.add("GenericFile");
complexQuery.setReducedProductTypeNames(productTypeNames);
- complexQuery.setSortByMetKey(CoreMetKeys.FILENAME);
- complexQuery.setToStringResultFormat("$" + CoreMetKeys.FILENAME);
+ complexQuery.setSortByMetKey(CoreFilemgrMetKeys.FILENAME);
+ complexQuery.setToStringResultFormat("$" + CoreFilemgrMetKeys.FILENAME);
complexQuery.addCriterion(SqlParser.parseSqlWhereClause("Filename != 'test.txt'"));
FileManagerClient fmc = new XmlRpcFileManagerClient(new URL("http://localhost:" + FM_PORT));
List<QueryResult> queryResults = fmc.complexQuery(complexQuery);
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/distributed/TestDistributedXmlRpcFileManager.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/distributed/TestDistributedXmlRpcFileManager.java
index d9bf2a220..2a974e372 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/distributed/TestDistributedXmlRpcFileManager.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/system/distributed/TestDistributedXmlRpcFileManager.java
@@ -18,7 +18,7 @@
package org.apache.oodt.cas.filemgr.system.distributed;
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.metadata.ProductMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
@@ -191,9 +191,9 @@ private void ingestFile() {
Metadata prodMet = new SerializableMetadata(new FileInputStream(new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
- prodMet.addMetadata(CoreMetKeys.FILENAME, "test.txt");
- prodMet.addMetadata(CoreMetKeys.PRODUCT_TYPE, "GenericFile");
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(ingestUrl.getFile()).getCanonicalPath());
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILENAME, "test.txt");
+ prodMet.addMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "GenericFile");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(refUrl.getFile()), prodMet);
} catch (Exception e) {
e.printStackTrace();
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
index 320c3a185..adf64a2c9 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestExpImpCatalog.java
@@ -21,7 +21,7 @@
//OODT imports
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.system.FileManagerClient;
import org.apache.oodt.cas.filemgr.system.FileManagerServer;
@@ -166,7 +166,7 @@ public void testExpImp() {
assertNotNull(prod);
Metadata met = fmClient.getMetadata(prod);
assertNotNull(met);
- assertTrue(met.containsKey(CoreMetKeys.PRODUCT_STRUCTURE));
+ assertTrue(met.containsKey(CoreFilemgrMetKeys.PRODUCT_STRUCTURE));
prod.setProductReferences(fmClient.getProductReferences(prod));
assertNotNull(prod.getProductReferences());
assertEquals(1, prod.getProductReferences().size());
@@ -238,13 +238,13 @@ private void ingestTestFiles() {
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
- prodMet.replaceMetadata(CoreMetKeys.PRODUCT_NAME, "TestTypeFile");
- prodMet.replaceMetadata(CoreMetKeys.PRODUCT_TYPE, "TestType");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.PRODUCT_NAME, "TestTypeFile");
+ prodMet.replaceMetadata(CoreFilemgrMetKeys.PRODUCT_TYPE, "TestType");
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
} catch (Exception e) {
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
index 0c6a45dce..1d0456189 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/tools/TestMetadataBasedProductMover.java
@@ -20,7 +20,7 @@
//OODT imports
import org.apache.oodt.cas.filemgr.ingest.StdIngester;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.system.FileManagerServer;
import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory;
import org.apache.oodt.cas.metadata.Metadata;
@@ -90,7 +90,7 @@ private void ingestTestFile() {
new File(metUrl.getFile())));
// now add the right file location
- prodMet.addMetadata(CoreMetKeys.FILE_LOCATION, new File(
+ prodMet.addMetadata(CoreFilemgrMetKeys.FILE_LOCATION, new File(
ingestUrl.getFile()).getCanonicalPath());
ingester.ingest(new URL("http://localhost:" + FM_PORT), new File(
refUrl.getFile()), prodMet);
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
index dcba44c0a..8cd3e24d3 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/validation/TestXMLValidationLayer.java
@@ -22,7 +22,7 @@
import org.apache.commons.io.FileUtils;
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 static org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys.*;
import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
//JDK imports
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
index efdca891d..a9be99c86 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestAcquisitionDateVersioner.java
@@ -19,7 +19,7 @@
//JDK imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.metadata.Metadata;
@@ -70,7 +70,7 @@ public void testVersionerWithNoStartDateTimeAndNoAcqDate() {
Reference r = new Reference("file:///tmp/dir1/file1.txt", null, 4L);
p.getProductReferences().add(r);
Metadata met = new Metadata();
- met.addMetadata(CoreMetKeys.FILENAME, "file1.txt");
+ met.addMetadata(CoreFilemgrMetKeys.FILENAME, "file1.txt");
SimpleDateFormat acqDateFormatter = new SimpleDateFormat(
AcquisitionDateVersioner.ACQ_DATE_FORMAT);
acqDateFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -97,7 +97,7 @@ public void testVersionerWithNoStartDateTimeAndAcqDate() {
Reference r = new Reference("file:///tmp/dir1/file1.txt", null, 4L);
p.getProductReferences().add(r);
Metadata met = new Metadata();
- met.addMetadata(CoreMetKeys.FILENAME, "file1.txt");
+ met.addMetadata(CoreFilemgrMetKeys.FILENAME, "file1.txt");
met.addMetadata("AcquisitionDate", "090910");
String expectedPath = "file:/home/files/"
+ met.getMetadata("AcquisitionDate") + "/file1.txt";
@@ -121,7 +121,7 @@ public void testVersionerWithStartDateTime() {
Reference r = new Reference("file:///tmp/dir1/file1.txt", null, 4L);
p.getProductReferences().add(r);
Metadata met = new Metadata();
- met.addMetadata(CoreMetKeys.FILENAME, "file1.txt");
+ met.addMetadata(CoreFilemgrMetKeys.FILENAME, "file1.txt");
met.addMetadata("StartDateTime", "2006-09-10T00:00:01.000Z");
String expectedPath = "file:/home/files/060910/file1.txt";
try {
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
index 21849d549..bcdce697e 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDirectoryBasedProductVersioner.java
@@ -19,7 +19,7 @@
//JDK imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.metadata.Metadata;
@@ -70,7 +70,7 @@ public void testVersioner() {
p.getProductReferences().add(r);
p.getProductReferences().add(r2);
Metadata met = new Metadata();
- met.addMetadata(CoreMetKeys.FILENAME, "dir1");
+ met.addMetadata(CoreFilemgrMetKeys.FILENAME, "dir1");
try {
versioner.createDataStoreReferences(p, met);
} catch (Exception e) {
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java b/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java
index 59d8f3f8f..91e0f6ac6 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/query/PCSQuery.java
@@ -19,7 +19,7 @@
//OODT imports
import org.apache.oodt.pcs.metadata.PCSMetadata;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Query;
/**
@@ -31,7 +31,7 @@
* @version $Revision$
*
*/
-public interface PCSQuery extends PCSMetadata, CoreMetKeys {
+public interface PCSQuery extends PCSMetadata, CoreFilemgrMetKeys {
/**
* Builds a filemgr compliant {@link Query} object from a concrete instance of
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
index c9d338a35..1e81db31c 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSHealthMonitor.java
@@ -34,7 +34,7 @@
import org.apache.avro.ipc.specific.SpecificRequestor;
import org.apache.oodt.cas.resource.system.extern.AvroRpcBatchStub;
import org.apache.oodt.cas.crawl.daemon.CrawlDaemonController;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.resource.structs.ResourceNode;
@@ -72,7 +72,7 @@
* @author mattmann
* @version $Revision$
*/
-public final class PCSHealthMonitor implements CoreMetKeys,
+public final class PCSHealthMonitor implements CoreFilemgrMetKeys,
PCSHealthMonitorMetKeys {
public static final double DOUBLE = 1000.0;
public static final double DOUBLE1 = 1000.0;
diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
index 315de3fad..16c5a1511 100644
--- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
+++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSLongLister.java
@@ -22,7 +22,7 @@
import org.apache.oodt.pcs.metadata.PCSMetadata;
import org.apache.oodt.pcs.query.InputFilesQuery;
import org.apache.oodt.pcs.util.FileManagerUtils;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
@@ -45,7 +45,7 @@
* @version $Revision$
*
*/
-public class PCSLongLister implements PCSMetadata, CoreMetKeys {
+public class PCSLongLister implements PCSMetadata, CoreFilemgrMetKeys {
private FileManagerUtils fm;
diff --git a/pcs/services/src/main/java/org/apache/oodt/pcs/services/HealthResource.java b/pcs/services/src/main/java/org/apache/oodt/pcs/services/HealthResource.java
index 80eadfb83..89f4b90d4 100644
--- a/pcs/services/src/main/java/org/apache/oodt/pcs/services/HealthResource.java
+++ b/pcs/services/src/main/java/org/apache/oodt/pcs/services/HealthResource.java
@@ -36,7 +36,7 @@
import net.sf.json.JSONObject;
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.pcs.health.CrawlerHealth;
@@ -227,8 +227,8 @@ private void encodeLatestFile(List<Object> latestFilesOutput, Product p)
Map<String, Object> fileOutput = new ConcurrentHashMap<String, Object>();
fileOutput.put("filepath", fm.getFilePath(p));
fileOutput.put("receivedTime", prodMet.getMetadata("CAS."
- + CoreMetKeys.PRODUCT_RECEVIED_TIME) != null ? prodMet
- .getMetadata("CAS." + CoreMetKeys.PRODUCT_RECEVIED_TIME) : "UNKNOWN");
+ + CoreFilemgrMetKeys.PRODUCT_RECEVIED_TIME) != null ? prodMet
+ .getMetadata("CAS." + CoreFilemgrMetKeys.PRODUCT_RECEVIED_TIME) : "UNKNOWN");
latestFilesOutput.add(fileOutput);
}
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
index edfe6927c..7ca3ddfc3 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
@@ -48,7 +48,7 @@
import org.apache.oodt.cas.pge.writers.PcsMetFileWriter;
import org.apache.oodt.cas.pge.writers.SciPgeConfigFileWriter;
import org.apache.oodt.cas.workflow.exceptions.WorkflowException;
-import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.metadata.CoreWorkflowMetKeys;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
@@ -264,9 +264,9 @@ protected WorkflowManagerClient getWorkflowManagerClient() throws MalformedURLEx
}
protected String getWorkflowInstanceId() {
- String instanceId = pgeMetadata.getMetadata(CoreMetKeys.WORKFLOW_INST_ID);
+ String instanceId = pgeMetadata.getMetadata(CoreWorkflowMetKeys.WORKFLOW_INST_ID);
logger.debug("Workflow instanceId is [{}]", instanceId);
- Validate.notNull(instanceId, "Must specify " + CoreMetKeys.WORKFLOW_INST_ID);
+ Validate.notNull(instanceId, "Must specify " + CoreWorkflowMetKeys.WORKFLOW_INST_ID);
return instanceId;
}
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java b/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java
index 4a214817d..b1e3c073c 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/writers/PcsMetFileWriter.java
@@ -19,7 +19,7 @@
package org.apache.oodt.cas.pge.writers;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.exceptions.CasMetadataException;
import org.apache.oodt.cas.metadata.exceptions.MetExtractionException;
@@ -52,13 +52,13 @@ public Metadata getMetadataForFile(File sciPgeCreatedDataFile,
FileNotFoundException, CasMetadataException, ParseException {
Metadata inputMetadata = pgeMetadata.asMetadata();
- inputMetadata.replaceMetadata(CoreMetKeys.FILENAME,
+ inputMetadata.replaceMetadata(CoreFilemgrMetKeys.FILENAME,
sciPgeCreatedDataFile.getName());
- inputMetadata.replaceMetadata(CoreMetKeys.FILE_LOCATION,
+ inputMetadata.replaceMetadata(CoreFilemgrMetKeys.FILE_LOCATION,
sciPgeCreatedDataFile.getParentFile().getAbsolutePath());
inputMetadata.replaceMetadata(FILE_SIZE, Long.toString(new File(
- inputMetadata.getMetadata(CoreMetKeys.FILE_LOCATION),
- inputMetadata.getMetadata(CoreMetKeys.FILENAME)).length()));
+ inputMetadata.getMetadata(CoreFilemgrMetKeys.FILE_LOCATION),
+ inputMetadata.getMetadata(CoreFilemgrMetKeys.FILENAME)).length()));
return this.getSciPgeSpecificMetadata(
sciPgeCreatedDataFile, inputMetadata, customArgs);
diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
index 23788493b..8799c2b8c 100644
--- a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
+++ b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
@@ -36,7 +36,7 @@
import org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys;
import org.apache.oodt.cas.pge.metadata.PgeTaskStatus;
import org.apache.oodt.cas.pge.writers.MockDynamicConfigFileWriter;
-import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.metadata.CoreWorkflowMetKeys;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
import org.apache.oodt.cas.workflow.system.AvroRpcWorkflowManagerClient;
import org.apache.oodt.cas.workflow.system.WorkflowManagerClient;
@@ -283,7 +283,7 @@ public void testCreateWorkflowManagerClient() throws Exception {
public void testGetWorkflowInstanceId() throws Exception {
String workflowInstId = "12345";
PGETaskInstance pgeTask = createTestInstance();
- pgeTask.pgeMetadata.replaceMetadata(CoreMetKeys.WORKFLOW_INST_ID,
+ pgeTask.pgeMetadata.replaceMetadata(CoreWorkflowMetKeys.WORKFLOW_INST_ID,
workflowInstId);
assertEquals(workflowInstId, pgeTask.getWorkflowInstanceId());
}
diff --git a/pge/velocity.log.1 b/pge/velocity.log.1
deleted file mode 100755
index e6d898c21..000000000
--- a/pge/velocity.log.1
+++ /dev/null
@@ -1,961 +0,0 @@
-2015-10-30 10:24:10,803 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:24:10,804 - Initializing Velocity, Calling init()...
-2015-10-30 10:24:10,804 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:24:10,804 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:24:10,804 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:24:10,804 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:24:10,804 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:24:10,804 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:24:10,807 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:24:10,808 - Do unicode file recognition: false
-2015-10-30 10:24:10,808 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:24:10,813 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:24:10,814 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:24:10,815 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:24:10,815 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:24:10,816 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:24:10,816 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:24:10,817 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:24:10,818 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:24:10,819 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:24:10,819 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:24:10,838 - Created '20' parsers.
-2015-10-30 10:24:10,843 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:24:10,843 - Velocimacro : Default library not found.
-2015-10-30 10:24:10,843 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:24:10,843 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:24:10,843 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:24:10,843 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:24:10,853 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:27:35,702 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:27:35,702 - Initializing Velocity, Calling init()...
-2015-10-30 10:27:35,702 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:27:35,702 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:27:35,702 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:27:35,702 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:27:35,702 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:27:35,702 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:27:35,706 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:27:35,707 - Do unicode file recognition: false
-2015-10-30 10:27:35,707 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:27:35,711 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:27:35,712 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:27:35,713 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:27:35,714 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:27:35,714 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:27:35,715 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:27:35,715 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:27:35,716 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:27:35,717 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:27:35,718 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:27:35,736 - Created '20' parsers.
-2015-10-30 10:27:35,741 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:27:35,742 - Velocimacro : Default library not found.
-2015-10-30 10:27:35,742 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:27:35,742 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:27:35,742 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:27:35,742 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:27:35,752 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:29:07,713 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:29:07,713 - Initializing Velocity, Calling init()...
-2015-10-30 10:29:07,713 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:29:07,713 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:29:07,714 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:29:07,714 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:29:07,714 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:29:07,714 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:29:07,717 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:29:07,718 - Do unicode file recognition: false
-2015-10-30 10:29:07,718 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:29:07,723 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:29:07,725 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:29:07,726 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:29:07,727 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:29:07,728 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:29:07,728 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:29:07,730 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:29:07,731 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:29:07,732 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:29:07,734 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:29:07,753 - Created '20' parsers.
-2015-10-30 10:29:07,758 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:29:07,758 - Velocimacro : Default library not found.
-2015-10-30 10:29:07,758 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:29:07,758 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:29:07,758 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:29:07,758 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:29:07,769 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:31:34,415 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:31:34,415 - Initializing Velocity, Calling init()...
-2015-10-30 10:31:34,415 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:31:34,415 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:31:34,415 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:31:34,415 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:31:34,415 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:31:34,416 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:31:34,420 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:31:34,421 - Do unicode file recognition: false
-2015-10-30 10:31:34,421 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:31:34,426 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:31:34,427 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:31:34,428 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:31:34,429 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:31:34,429 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:31:34,430 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:31:34,431 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:31:34,432 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:31:34,433 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:31:34,434 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:31:34,452 - Created '20' parsers.
-2015-10-30 10:31:34,457 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:31:34,457 - Velocimacro : Default library not found.
-2015-10-30 10:31:34,457 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:31:34,457 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:31:34,457 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:31:34,457 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:31:34,468 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:32:48,942 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:32:48,943 - Initializing Velocity, Calling init()...
-2015-10-30 10:32:48,943 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:32:48,943 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:32:48,943 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:32:48,943 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:32:48,943 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:32:48,943 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:32:48,948 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:32:48,950 - Do unicode file recognition: false
-2015-10-30 10:32:48,950 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:32:48,956 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:32:48,958 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:32:48,959 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:32:48,960 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:32:48,961 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:32:48,961 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:32:48,963 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:32:48,964 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:32:48,965 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:32:48,966 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:32:48,985 - Created '20' parsers.
-2015-10-30 10:32:48,989 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:32:48,990 - Velocimacro : Default library not found.
-2015-10-30 10:32:48,990 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:32:48,990 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:32:48,990 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:32:48,990 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:32:49,000 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:34:29,021 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:34:29,022 - Initializing Velocity, Calling init()...
-2015-10-30 10:34:29,022 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:34:29,022 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:34:29,022 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:34:29,022 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:34:29,022 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:34:29,022 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:34:29,027 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:34:29,028 - Do unicode file recognition: false
-2015-10-30 10:34:29,028 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:34:29,033 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:34:29,035 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:34:29,036 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:34:29,036 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:34:29,037 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:34:29,037 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:34:29,038 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:34:29,039 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:34:29,040 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:34:29,041 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:34:29,059 - Created '20' parsers.
-2015-10-30 10:34:29,064 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:34:29,065 - Velocimacro : Default library not found.
-2015-10-30 10:34:29,065 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:34:29,065 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:34:29,065 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:34:29,065 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:34:29,076 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:35:20,652 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:35:20,653 - Initializing Velocity, Calling init()...
-2015-10-30 10:35:20,653 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:35:20,653 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:35:20,653 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:35:20,653 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:35:20,653 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:35:20,653 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:35:20,658 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:35:20,660 - Do unicode file recognition: false
-2015-10-30 10:35:20,660 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:35:20,665 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:35:20,666 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:35:20,667 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:35:20,668 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:35:20,669 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:35:20,669 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:35:20,670 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:35:20,671 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:35:20,672 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:35:20,672 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:35:20,696 - Created '20' parsers.
-2015-10-30 10:35:20,702 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:35:20,702 - Velocimacro : Default library not found.
-2015-10-30 10:35:20,703 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:35:20,703 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:35:20,703 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:35:20,703 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:35:20,721 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:36:43,887 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:36:43,887 - Initializing Velocity, Calling init()...
-2015-10-30 10:36:43,887 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:36:43,887 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:36:43,887 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:36:43,887 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:36:43,887 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:36:43,888 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:36:43,892 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:36:43,892 - Do unicode file recognition: false
-2015-10-30 10:36:43,893 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:36:43,897 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:36:43,898 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:36:43,899 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:36:43,899 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:36:43,900 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:36:43,901 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:36:43,901 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:36:43,902 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:36:43,903 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:36:43,904 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:36:43,923 - Created '20' parsers.
-2015-10-30 10:36:43,930 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:36:43,930 - Velocimacro : Default library not found.
-2015-10-30 10:36:43,931 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:36:43,931 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:36:43,931 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:36:43,931 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:36:43,944 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:37:45,837 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:37:45,837 - Initializing Velocity, Calling init()...
-2015-10-30 10:37:45,838 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:37:45,838 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:37:45,838 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:37:45,838 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:37:45,838 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:37:45,838 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:37:45,841 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:37:45,842 - Do unicode file recognition: false
-2015-10-30 10:37:45,842 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:37:45,846 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:37:45,847 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:37:45,848 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:37:45,848 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:37:45,849 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:37:45,849 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:37:45,850 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:37:45,851 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:37:45,852 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:37:45,853 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:37:45,869 - Created '20' parsers.
-2015-10-30 10:37:45,874 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:37:45,874 - Velocimacro : Default library not found.
-2015-10-30 10:37:45,874 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:37:45,874 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:37:45,874 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:37:45,874 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:37:45,885 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:38:26,108 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:38:26,108 - Initializing Velocity, Calling init()...
-2015-10-30 10:38:26,108 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:38:26,108 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:38:26,108 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:38:26,108 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:38:26,108 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:38:26,108 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:38:26,112 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:38:26,112 - Do unicode file recognition: false
-2015-10-30 10:38:26,113 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:38:26,117 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:38:26,118 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:38:26,119 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:38:26,119 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:38:26,120 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:38:26,120 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:38:26,121 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:38:26,122 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:38:26,123 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:38:26,124 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:38:26,145 - Created '20' parsers.
-2015-10-30 10:38:26,150 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:38:26,150 - Velocimacro : Default library not found.
-2015-10-30 10:38:26,150 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:38:26,150 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:38:26,150 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:38:26,150 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:38:26,161 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:39:32,053 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:39:32,053 - Initializing Velocity, Calling init()...
-2015-10-30 10:39:32,054 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:39:32,054 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:39:32,054 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:39:32,054 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:39:32,054 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:39:32,054 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:39:32,057 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:39:32,058 - Do unicode file recognition: false
-2015-10-30 10:39:32,058 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:39:32,062 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:39:32,063 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:39:32,064 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:39:32,065 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:39:32,065 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:39:32,066 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:39:32,066 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:39:32,067 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:39:32,068 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:39:32,069 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:39:32,086 - Created '20' parsers.
-2015-10-30 10:39:32,091 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:39:32,091 - Velocimacro : Default library not found.
-2015-10-30 10:39:32,091 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:39:32,091 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:39:32,091 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:39:32,091 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:39:32,102 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:45:14,904 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:45:14,904 - Initializing Velocity, Calling init()...
-2015-10-30 10:45:14,904 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:45:14,904 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:45:14,904 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:45:14,904 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:45:14,904 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:45:14,904 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:45:14,908 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:45:14,908 - Do unicode file recognition: false
-2015-10-30 10:45:14,908 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:45:14,913 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:45:14,914 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:45:14,914 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:45:14,915 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:45:14,915 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:45:14,916 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:45:14,917 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:45:14,917 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:45:14,918 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:45:14,919 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:45:14,936 - Created '20' parsers.
-2015-10-30 10:45:14,941 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:45:14,941 - Velocimacro : Default library not found.
-2015-10-30 10:45:14,941 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:45:14,941 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:45:14,941 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:45:14,941 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:45:14,952 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:46:13,040 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:46:13,041 - Initializing Velocity, Calling init()...
-2015-10-30 10:46:13,041 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:46:13,041 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:46:13,041 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:46:13,041 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:46:13,041 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:46:13,041 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:46:13,044 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:46:13,045 - Do unicode file recognition: false
-2015-10-30 10:46:13,045 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:46:13,049 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:46:13,050 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:46:13,051 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:46:13,052 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:46:13,052 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:46:13,052 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:46:13,053 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:46:13,054 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:46:13,055 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:46:13,056 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:46:13,074 - Created '20' parsers.
-2015-10-30 10:46:13,079 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:46:13,079 - Velocimacro : Default library not found.
-2015-10-30 10:46:13,079 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:46:13,079 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:46:13,079 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:46:13,079 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:46:13,091 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:46:57,011 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:46:57,011 - Initializing Velocity, Calling init()...
-2015-10-30 10:46:57,011 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:46:57,011 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:46:57,012 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:46:57,012 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:46:57,012 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:46:57,012 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:46:57,015 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:46:57,016 - Do unicode file recognition: false
-2015-10-30 10:46:57,016 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:46:57,020 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:46:57,021 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:46:57,022 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:46:57,022 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:46:57,023 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:46:57,023 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:46:57,024 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:46:57,025 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:46:57,026 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:46:57,026 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:46:57,044 - Created '20' parsers.
-2015-10-30 10:46:57,049 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:46:57,049 - Velocimacro : Default library not found.
-2015-10-30 10:46:57,049 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:46:57,049 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:46:57,049 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:46:57,049 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:46:57,060 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:50:57,087 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:50:57,087 - Initializing Velocity, Calling init()...
-2015-10-30 10:50:57,087 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:50:57,087 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:50:57,087 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:50:57,087 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:50:57,087 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:50:57,087 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:50:57,091 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:50:57,092 - Do unicode file recognition: false
-2015-10-30 10:50:57,092 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:50:57,096 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:50:57,097 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:50:57,098 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:50:57,099 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:50:57,099 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:50:57,100 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:50:57,101 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:50:57,102 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:50:57,102 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:50:57,103 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:50:57,121 - Created '20' parsers.
-2015-10-30 10:50:57,127 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:50:57,128 - Velocimacro : Default library not found.
-2015-10-30 10:50:57,128 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:50:57,128 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:50:57,128 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:50:57,128 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:50:57,145 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:51:55,067 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:51:55,067 - Initializing Velocity, Calling init()...
-2015-10-30 10:51:55,067 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:51:55,067 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:51:55,067 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:51:55,067 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:51:55,067 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:51:55,067 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:51:55,071 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:51:55,072 - Do unicode file recognition: false
-2015-10-30 10:51:55,072 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:51:55,076 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:51:55,077 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:51:55,078 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:51:55,078 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:51:55,079 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:51:55,079 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:51:55,080 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:51:55,081 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:51:55,082 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:51:55,082 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:51:55,099 - Created '20' parsers.
-2015-10-30 10:51:55,104 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:51:55,104 - Velocimacro : Default library not found.
-2015-10-30 10:51:55,104 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:51:55,104 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:51:55,104 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:51:55,104 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:51:55,115 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:53:24,906 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:53:24,907 - Initializing Velocity, Calling init()...
-2015-10-30 10:53:24,907 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:53:24,907 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:53:24,907 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:53:24,907 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:53:24,907 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:53:24,907 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:53:24,910 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:53:24,911 - Do unicode file recognition: false
-2015-10-30 10:53:24,911 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:53:24,914 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:53:24,915 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:53:24,916 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:53:24,917 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:53:24,917 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:53:24,917 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:53:24,918 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:53:24,919 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:53:24,920 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:53:24,921 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:53:24,938 - Created '20' parsers.
-2015-10-30 10:53:24,943 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:53:24,943 - Velocimacro : Default library not found.
-2015-10-30 10:53:24,943 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:53:24,943 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:53:24,943 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:53:24,943 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:53:24,953 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:54:22,160 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:54:22,160 - Initializing Velocity, Calling init()...
-2015-10-30 10:54:22,160 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:54:22,160 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:54:22,160 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:54:22,160 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:54:22,160 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:54:22,160 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:54:22,164 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:54:22,165 - Do unicode file recognition: false
-2015-10-30 10:54:22,165 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:54:22,169 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:54:22,170 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:54:22,171 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:54:22,172 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:54:22,173 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:54:22,173 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:54:22,174 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:54:22,175 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:54:22,176 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:54:22,177 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:54:22,195 - Created '20' parsers.
-2015-10-30 10:54:22,200 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:54:22,200 - Velocimacro : Default library not found.
-2015-10-30 10:54:22,200 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:54:22,200 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:54:22,200 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:54:22,200 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:54:22,211 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:59:05,887 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 10:59:05,887 - Initializing Velocity, Calling init()...
-2015-10-30 10:59:05,888 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 10:59:05,888 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 10:59:05,888 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 10:59:05,888 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 10:59:05,888 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:59:05,888 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 10:59:05,891 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 10:59:05,892 - Do unicode file recognition: false
-2015-10-30 10:59:05,892 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 10:59:05,896 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 10:59:05,897 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 10:59:05,898 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 10:59:05,899 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 10:59:05,899 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 10:59:05,900 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 10:59:05,901 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 10:59:05,901 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 10:59:05,902 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 10:59:05,903 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 10:59:05,920 - Created '20' parsers.
-2015-10-30 10:59:05,925 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 10:59:05,925 - Velocimacro : Default library not found.
-2015-10-30 10:59:05,925 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 10:59:05,925 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 10:59:05,925 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 10:59:05,925 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 10:59:05,936 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:07:29,007 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:07:29,008 - Initializing Velocity, Calling init()...
-2015-10-30 11:07:29,008 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:07:29,008 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:07:29,008 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:07:29,008 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:07:29,008 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:07:29,008 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:07:29,012 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:07:29,013 - Do unicode file recognition: false
-2015-10-30 11:07:29,013 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:07:29,018 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:07:29,019 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:07:29,020 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:07:29,020 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:07:29,021 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:07:29,021 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:07:29,022 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:07:29,023 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:07:29,025 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:07:29,025 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:07:29,044 - Created '20' parsers.
-2015-10-30 11:07:29,050 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:07:29,050 - Velocimacro : Default library not found.
-2015-10-30 11:07:29,050 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:07:29,050 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:07:29,050 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:07:29,050 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:07:29,061 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:13:28,457 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:13:28,458 - Initializing Velocity, Calling init()...
-2015-10-30 11:13:28,458 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:13:28,458 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:13:28,458 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:13:28,458 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:13:28,458 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:13:28,458 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:13:28,462 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:13:28,463 - Do unicode file recognition: false
-2015-10-30 11:13:28,463 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:13:28,468 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:13:28,469 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:13:28,470 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:13:28,472 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:13:28,473 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:13:28,474 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:13:28,476 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:13:28,477 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:13:28,479 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:13:28,480 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:13:28,503 - Created '20' parsers.
-2015-10-30 11:13:28,508 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:13:28,509 - Velocimacro : Default library not found.
-2015-10-30 11:13:28,509 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:13:28,509 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:13:28,509 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:13:28,509 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:13:28,521 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:14:02,043 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:14:02,043 - Initializing Velocity, Calling init()...
-2015-10-30 11:14:02,043 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:14:02,043 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:14:02,043 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:14:02,043 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:14:02,044 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:14:02,044 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:14:02,050 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:14:02,051 - Do unicode file recognition: false
-2015-10-30 11:14:02,051 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:14:02,056 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:14:02,058 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:14:02,058 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:14:02,059 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:14:02,059 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:14:02,060 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:14:02,061 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:14:02,062 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:14:02,063 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:14:02,063 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:14:02,081 - Created '20' parsers.
-2015-10-30 11:14:02,086 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:14:02,086 - Velocimacro : Default library not found.
-2015-10-30 11:14:02,086 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:14:02,086 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:14:02,086 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:14:02,086 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:14:02,097 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:16:59,239 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:16:59,240 - Initializing Velocity, Calling init()...
-2015-10-30 11:16:59,240 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:16:59,240 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:16:59,240 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:16:59,240 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:16:59,240 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:16:59,240 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:16:59,244 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:16:59,245 - Do unicode file recognition: false
-2015-10-30 11:16:59,245 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:16:59,249 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:16:59,250 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:16:59,251 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:16:59,251 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:16:59,252 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:16:59,252 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:16:59,253 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:16:59,254 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:16:59,255 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:16:59,255 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:16:59,274 - Created '20' parsers.
-2015-10-30 11:16:59,281 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:16:59,281 - Velocimacro : Default library not found.
-2015-10-30 11:16:59,281 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:16:59,281 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:16:59,281 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:16:59,281 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:16:59,293 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:17:49,714 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:17:49,714 - Initializing Velocity, Calling init()...
-2015-10-30 11:17:49,715 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:17:49,715 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:17:49,715 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:17:49,715 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:17:49,715 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:17:49,715 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:17:49,718 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:17:49,719 - Do unicode file recognition: false
-2015-10-30 11:17:49,719 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:17:49,723 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:17:49,724 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:17:49,725 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:17:49,726 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:17:49,726 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:17:49,727 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:17:49,727 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:17:49,728 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:17:49,729 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:17:49,730 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:17:49,748 - Created '20' parsers.
-2015-10-30 11:17:49,752 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:17:49,752 - Velocimacro : Default library not found.
-2015-10-30 11:17:49,752 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:17:49,752 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:17:49,753 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:17:49,753 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:17:49,764 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:18:42,100 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:18:42,100 - Initializing Velocity, Calling init()...
-2015-10-30 11:18:42,100 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:18:42,100 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:18:42,100 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:18:42,100 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:18:42,100 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:18:42,100 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:18:42,103 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:18:42,104 - Do unicode file recognition: false
-2015-10-30 11:18:42,104 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:18:42,108 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:18:42,109 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:18:42,110 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:18:42,110 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:18:42,111 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:18:42,111 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:18:42,112 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:18:42,113 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:18:42,114 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:18:42,115 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:18:42,132 - Created '20' parsers.
-2015-10-30 11:18:42,137 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:18:42,137 - Velocimacro : Default library not found.
-2015-10-30 11:18:42,137 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:18:42,137 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:18:42,137 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:18:42,137 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:18:42,148 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:19:20,915 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:19:20,915 - Initializing Velocity, Calling init()...
-2015-10-30 11:19:20,915 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:19:20,915 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:19:20,915 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:19:20,915 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:19:20,915 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:19:20,915 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:19:20,919 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:19:20,920 - Do unicode file recognition: false
-2015-10-30 11:19:20,920 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:19:20,925 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:19:20,927 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:19:20,928 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:19:20,929 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:19:20,930 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:19:20,930 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:19:20,931 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:19:20,932 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:19:20,934 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:19:20,935 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:19:20,954 - Created '20' parsers.
-2015-10-30 11:19:20,958 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:19:20,958 - Velocimacro : Default library not found.
-2015-10-30 11:19:20,958 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:19:20,958 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:19:20,958 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:19:20,958 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:19:20,970 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:21:23,757 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:21:23,757 - Initializing Velocity, Calling init()...
-2015-10-30 11:21:23,757 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:21:23,757 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:21:23,757 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:21:23,757 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:21:23,757 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:21:23,757 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:21:23,761 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:21:23,762 - Do unicode file recognition: false
-2015-10-30 11:21:23,762 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:21:23,766 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:21:23,767 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:21:23,768 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:21:23,769 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:21:23,769 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:21:23,770 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:21:23,771 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:21:23,771 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:21:23,772 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:21:23,773 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:21:23,796 - Created '20' parsers.
-2015-10-30 11:21:23,802 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:21:23,803 - Velocimacro : Default library not found.
-2015-10-30 11:21:23,803 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:21:23,803 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:21:23,803 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:21:23,803 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:21:23,826 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:22:16,150 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:22:16,151 - Initializing Velocity, Calling init()...
-2015-10-30 11:22:16,151 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:22:16,151 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:22:16,151 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:22:16,151 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:22:16,151 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:22:16,151 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:22:16,154 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:22:16,155 - Do unicode file recognition: false
-2015-10-30 11:22:16,155 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:22:16,159 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:22:16,160 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:22:16,161 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:22:16,161 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:22:16,162 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:22:16,162 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:22:16,163 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:22:16,164 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:22:16,165 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:22:16,165 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:22:16,182 - Created '20' parsers.
-2015-10-30 11:22:16,187 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:22:16,187 - Velocimacro : Default library not found.
-2015-10-30 11:22:16,187 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:22:16,187 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:22:16,187 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:22:16,187 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:22:16,198 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:27:52,521 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:27:52,521 - Initializing Velocity, Calling init()...
-2015-10-30 11:27:52,521 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:27:52,521 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:27:52,521 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:27:52,521 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:27:52,521 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:27:52,521 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:27:52,526 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:27:52,527 - Do unicode file recognition: false
-2015-10-30 11:27:52,527 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:27:52,533 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:27:52,534 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:27:52,535 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:27:52,536 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:27:52,538 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:27:52,539 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:27:52,540 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:27:52,541 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:27:52,542 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:27:52,542 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:27:52,559 - Created '20' parsers.
-2015-10-30 11:27:52,563 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:27:52,563 - Velocimacro : Default library not found.
-2015-10-30 11:27:52,563 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:27:52,563 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:27:52,563 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:27:52,563 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:27:52,575 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:33:38,683 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 11:33:38,684 - Initializing Velocity, Calling init()...
-2015-10-30 11:33:38,684 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 11:33:38,684 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 11:33:38,684 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 11:33:38,684 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 11:33:38,684 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:33:38,684 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 11:33:38,687 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 11:33:38,688 - Do unicode file recognition: false
-2015-10-30 11:33:38,688 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 11:33:38,692 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 11:33:38,694 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 11:33:38,694 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 11:33:38,695 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 11:33:38,695 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 11:33:38,696 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 11:33:38,696 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 11:33:38,697 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 11:33:38,698 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 11:33:38,699 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 11:33:38,716 - Created '20' parsers.
-2015-10-30 11:33:38,721 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 11:33:38,721 - Velocimacro : Default library not found.
-2015-10-30 11:33:38,721 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 11:33:38,721 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 11:33:38,721 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 11:33:38,721 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 11:33:38,733 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 13:21:52,525 - Log4JLogChute initialized using file 'velocity.log'
-2015-10-30 13:21:52,526 - Initializing Velocity, Calling init()...
-2015-10-30 13:21:52,526 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-10-30 13:21:52,526 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-10-30 13:21:52,526 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-10-30 13:21:52,526 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-10-30 13:21:52,526 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 13:21:52,526 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-10-30 13:21:52,534 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-10-30 13:21:52,535 - Do unicode file recognition: false
-2015-10-30 13:21:52,535 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-10-30 13:21:52,540 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-10-30 13:21:52,542 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-10-30 13:21:52,543 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-10-30 13:21:52,544 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-10-30 13:21:52,545 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-10-30 13:21:52,546 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-10-30 13:21:52,547 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-10-30 13:21:52,548 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-10-30 13:21:52,549 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-10-30 13:21:52,550 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-10-30 13:21:52,575 - Created '20' parsers.
-2015-10-30 13:21:52,587 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-10-30 13:21:52,587 - Velocimacro : Default library not found.
-2015-10-30 13:21:52,587 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-10-30 13:21:52,587 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-10-30 13:21:52,587 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-10-30 13:21:52,587 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-10-30 13:21:52,601 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-11-01 00:42:41,142 - Log4JLogChute initialized using file 'velocity.log'
-2015-11-01 00:42:41,144 - Initializing Velocity, Calling init()...
-2015-11-01 00:42:41,144 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-11-01 00:42:41,144 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-11-01 00:42:41,144 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-11-01 00:42:41,144 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-11-01 00:42:41,144 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-11-01 00:42:41,144 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-11-01 00:42:41,149 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-11-01 00:42:41,150 - Do unicode file recognition: false
-2015-11-01 00:42:41,150 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-11-01 00:42:41,155 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-11-01 00:42:41,156 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-11-01 00:42:41,158 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-11-01 00:42:41,158 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-11-01 00:42:41,159 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-11-01 00:42:41,160 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-11-01 00:42:41,161 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-11-01 00:42:41,161 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-11-01 00:42:41,162 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-11-01 00:42:41,163 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-11-01 00:42:41,183 - Created '20' parsers.
-2015-11-01 00:42:41,189 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-11-01 00:42:41,189 - Velocimacro : Default library not found.
-2015-11-01 00:42:41,189 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-11-01 00:42:41,189 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-11-01 00:42:41,189 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-11-01 00:42:41,189 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-11-01 00:42:41,203 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-11-04 12:27:56,110 - Log4JLogChute initialized using file 'velocity.log'
-2015-11-04 12:27:56,112 - Initializing Velocity, Calling init()...
-2015-11-04 12:27:56,112 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2015-11-04 12:27:56,112 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
-2015-11-04 12:27:56,112 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
-2015-11-04 12:27:56,112 - Target log system for org.apache.velocity.runtime.log.AvalonLogChute is not available (java.lang.NoClassDefFoundError: org/apache/log/format/Formatter). Falling back to next log system...
-2015-11-04 12:27:56,112 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-11-04 12:27:56,113 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
-2015-11-04 12:27:56,124 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2015-11-04 12:27:56,126 - Do unicode file recognition: false
-2015-11-04 12:27:56,126 - FileResourceLoader : adding path '/home/bugg/Projects/oodt/pge/target/test-classes'
-2015-11-04 12:27:56,133 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl) with class java.util.Collections$SynchronizedMap cache map.
-2015-11-04 12:27:56,135 - Loaded System Directive: org.apache.velocity.runtime.directive.Stop
-2015-11-04 12:27:56,137 - Loaded System Directive: org.apache.velocity.runtime.directive.Define
-2015-11-04 12:27:56,138 - Loaded System Directive: org.apache.velocity.runtime.directive.Break
-2015-11-04 12:27:56,139 - Loaded System Directive: org.apache.velocity.runtime.directive.Evaluate
-2015-11-04 12:27:56,140 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
-2015-11-04 12:27:56,142 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
-2015-11-04 12:27:56,143 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
-2015-11-04 12:27:56,145 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
-2015-11-04 12:27:56,146 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
-2015-11-04 12:27:56,171 - Created '20' parsers.
-2015-11-04 12:27:56,185 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
-2015-11-04 12:27:56,185 - Velocimacro : Default library not found.
-2015-11-04 12:27:56,185 - Velocimacro : allowInline = true : VMs can be defined inline in templates
-2015-11-04 12:27:56,185 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
-2015-11-04 12:27:56,185 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
-2015-11-04 12:27:56,185 - Velocimacro : autoload off : VM system will not automatically reload global library macros
-2015-11-04 12:27:56,203 - ResourceManager : found /test-config.vm with loader org.apache.velocity.runtime.resource.loader.FileResourceLoader
-2016-01-08 22:34:38,971 - Log4JLogChute initialized using file 'velocity.log'
-2016-01-08 22:34:38,973 - Initializing Velocity, Calling init()...
-2016-01-08 22:34:38,973 - Starting Apache Velocity v1.7 (compiled: 2010-11-19 12:14:37)
-2016-01-08 22:34:38,973 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FileManagerConn.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FileManagerConn.java
index eefd0c63d..d93fa486f 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FileManagerConn.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FileManagerConn.java
@@ -17,7 +17,7 @@
package org.apache.oodt.cas.webcomponents.filemgr;
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Element;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
@@ -57,7 +57,7 @@ public FileManagerConn(String fmUrlStr) {
public String getProdReceivedTime(Product p) {
Metadata met = getMetadata(p);
String prodReceivedTime = met
- .getMetadata("CAS." + CoreMetKeys.PRODUCT_RECEVIED_TIME);
+ .getMetadata("CAS." + CoreFilemgrMetKeys.PRODUCT_RECEVIED_TIME);
return prodReceivedTime != null && !prodReceivedTime.equals("")
? prodReceivedTime : "UNKNOWN";
}
diff --git a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.java b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.java
index bde27f7ee..8d8ab4fa5 100644
--- a/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.java
+++ b/webapp/components/src/main/java/org/apache/oodt/pcs/webcomponents/health/HealthMonitor.java
@@ -21,7 +21,7 @@
import java.util.List;
//OODT imports
-import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
+import org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.pcs.health.CrawlerHealth;
@@ -191,7 +191,7 @@ public void onClick() {
link.add(new Label("file_path", filePath));
item.add(link);
item.add(new Label("file_ingest_datetime", prodMet.getMetadata("CAS."
- + CoreMetKeys.PRODUCT_RECEVIED_TIME)));
+ + CoreFilemgrMetKeys.PRODUCT_RECEVIED_TIME)));
}
});
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
index d930d8f2d..faa8efe04 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
@@ -44,7 +44,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import static org.apache.oodt.cas.filemgr.metadata.CoreMetKeys.PRODUCT_ID;
+import static org.apache.oodt.cas.filemgr.metadata.CoreFilemgrMetKeys.PRODUCT_ID;
import static org.apache.oodt.cas.product.CASProductHandlerMetKeys.CAS_PROFILE_ID;
import static org.apache.oodt.cas.product.CASProductHandlerMetKeys.FILE_HEADER;
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
index 0779a08e4..eec657afa 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
@@ -23,7 +23,7 @@
import org.apache.oodt.cas.resource.system.ResourceManagerClient;
import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.metadata.CoreWorkflowMetKeys;
import org.apache.oodt.cas.workflow.structs.TaskJobInput;
import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
import org.apache.oodt.cas.workflow.structs.WorkflowConditionInstance;
@@ -62,7 +62,7 @@
*
*/
-public class IterativeWorkflowProcessorThread implements WorkflowStatus, CoreMetKeys, Runnable {
+public class IterativeWorkflowProcessorThread implements WorkflowStatus, CoreWorkflowMetKeys, Runnable {
private static final Logger logger = LoggerFactory.getLogger(IterativeWorkflowProcessorThread.class);
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java
index 7ef7c94f0..c2ce6a2a7 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java
@@ -23,7 +23,7 @@
import org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient;
import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
-import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.metadata.CoreWorkflowMetKeys;
import org.apache.oodt.cas.workflow.structs.TaskJobInput;
import org.apache.oodt.cas.workflow.structs.WorkflowStatus;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
@@ -42,7 +42,7 @@
* @version $Revision$
*
*/
-public class ResourceRunner extends AbstractEngineRunnerBase implements CoreMetKeys,
+public class ResourceRunner extends AbstractEngineRunnerBase implements CoreWorkflowMetKeys,
WorkflowStatus {
private static final Logger LOG = Logger.getLogger(ResourceRunner.class
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
index 0bc286e4c..0283b70b9 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java
@@ -22,7 +22,7 @@
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.metadata.CoreWorkflowMetKeys;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
@@ -57,7 +57,7 @@ public void run(Metadata metadata, WorkflowTaskConfiguration config)
throws WorkflowTaskInstanceException {
try (WorkflowManagerClient wm = RpcCommunicationFactory
- .createClient(new URL(metadata.getMetadata(CoreMetKeys.WORKFLOW_MANAGER_URL)))) {
+ .createClient(new URL(metadata.getMetadata(CoreWorkflowMetKeys.WORKFLOW_MANAGER_URL)))) {
wm.sendEvent(config.getProperty("eventName"), metadata);
} catch (Exception e) {
throw new WorkflowTaskInstanceException(e.getMessage());
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreWorkflowMetKeys.java
similarity index 97%
rename from workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java
rename to workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreWorkflowMetKeys.java
index 0c96b6dd8..2e6ce080e 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreMetKeys.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/metadata/CoreWorkflowMetKeys.java
@@ -26,7 +26,7 @@
* Core metadata key names for the Workflow Manager
* </p>.
*/
-public interface CoreMetKeys {
+public interface CoreWorkflowMetKeys {
String TASK_ID = "TaskId";
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/RollbackableWorkflowTaskInstance.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/RollbackableWorkflowTaskInstance.java
index d2b392956..11df6b041 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/RollbackableWorkflowTaskInstance.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/RollbackableWorkflowTaskInstance.java
@@ -9,7 +9,7 @@
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.metadata.CoreWorkflowMetKeys;
import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
import org.apache.oodt.cas.workflow.system.WorkflowManagerClient;
import org.apache.oodt.cas.workflow.system.rpc.RpcCommunicationFactory;
@@ -37,14 +37,14 @@ public void run(Metadata metadata, WorkflowTaskConfiguration config) throws Work
}
private String getWorkflowInstanceId(Metadata metadata) {
- return metadata.getMetadata(CoreMetKeys.WORKFLOW_INST_ID);
+ return metadata.getMetadata(CoreWorkflowMetKeys.WORKFLOW_INST_ID);
}
private WorkflowManagerClient createWorkflowMangerClient(Metadata metadata) {
URL url;
try {
- url = new URL(metadata.getMetadata(CoreMetKeys.WORKFLOW_MANAGER_URL));
+ url = new URL(metadata.getMetadata(CoreWorkflowMetKeys.WORKFLOW_MANAGER_URL));
return RpcCommunicationFactory.createClient(url);
} catch (MalformedURLException e) {
e.printStackTrace();
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
index 168bb5382..abc1dc169 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJob.java
@@ -36,7 +36,7 @@
import org.apache.oodt.cas.resource.structs.JobInput;
import org.apache.oodt.cas.resource.structs.JobInstance;
import org.apache.oodt.cas.resource.structs.exceptions.JobInputException;
-import org.apache.oodt.cas.workflow.metadata.CoreMetKeys;
+import org.apache.oodt.cas.workflow.metadata.CoreWorkflowMetKeys;
import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException;
import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
@@ -48,7 +48,7 @@
* A Resource Manager {@link Job} that runs an underlying {@link WorkflowTask}.
* </p>.
*/
-public class TaskJob implements JobInstance, WorkflowStatus, CoreMetKeys{
+public class TaskJob implements JobInstance, WorkflowStatus, CoreWorkflowMetKeys{
/* our log stream */
private static Logger LOG = Logger.getLogger(TaskJob.class.getName());
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
> Rename CoreMetKeys.java in filemgr and workflow to CoreFilemgrMetKeys.java and CoreWorkflowMetKeys.java respectively
> --------------------------------------------------------------------------------------------------------------------
>
> Key: OODT-1002
> URL: https://issues.apache.org/jira/browse/OODT-1002
> Project: OODT
> Issue Type: Task
> Components: file manager, workflow manager
> Affects Versions: 1.2.4
> Reporter: Lewis John McGibbney
> Assignee: Lewis John McGibbney
> Priority: Blocker
> Fix For: 1.9
>
>
> Primary context for this thread can be found [here|https://lists.apache.org/thread.html/deb7cc02e41afbc70e76583cc42623ee359a871c5e58271a14bf3234@%3Cdev.oodt.apache.org%3E].
> There is a clear ClassLoading issue for the CoreMetKeys.java file present in filemgr and workflow. I propose to rename the files to CoreFilemgrMetKeys.java and CoreWorkflowMetKeys.java respectively. There are however still a few issues in the following classes
> ./tomcat/webapps/fmprod/WEB-INF/classes/org/apache/oodt/cas/product/CASProductHandler.class
> ./tomcat/webapps/opsui/WEB-INF/classes/org/apache/oodt/cas/product/CASProductHandler.class
> ./tomcat/webapps/pcs/WEB-INF/classes/org/apache/oodt/pcs/services/HealthResource.class
> I have a PR to address this. Coming up.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)