Modified: oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml URL: http://svn.apache.org/viewvc/oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml?rev=1617057&r1=1617056&r2=1617057&view=diff ============================================================================== --- oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml (original) +++ oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml Sun Aug 10 07:33:37 2014 @@ -41,7 +41,45 @@ TODO(bfoster): Make this a working examp <output> <!-- one or more of these --> + <!-- if a dir path is specified WITHOUT specifying an associated + set of files tags, along with the regExp and metFileWriterClass + and args required to produce metadata CAS-PGE will REQUIRE that + you provide (as part of the tasks.xml definition for this task: + + PGETask/Ingest/MimeExtractorRepo - Path to AutoDetectProductCrawler's + MimeExtractorRepo XML config + + And an AutoDetectProductCrawler will be created in lieu of the + StdProductCrawler. In addition you will not see the extracted + metadata produced as .met files in the job working directory for + these CAS-PGE jobs as the extracted metadata won't be serialized. + --> <dir path="path-to-an-output-dir" createBeforeExe="true-or-false" /> + + <dir path="path-to-an-output-dir" createBeforeExe="true-or-false"> + <!-- back compatability re-introduced in OODT-667 + by specifying one or more files you cause CAS-PGE to generate a StdProductCrawler, + to crawl generated metadata files derived from calling the metFileWriterClass implementation + on files matching Java RegEx or file name (exact match) in path-to-an-output-dir. Met files are serialized and stored in the job + directory where the CAS-PGE job ran, and are then ingested into the file manager along + with the origin data file. + + --> + <files regExp="java-regex" + name="file-name" + metFileWriterClass="org.apache.oodt.cas.pge.writers.PcsMetFileWriter.subclass" + args="zero-or-more-args-comma-segregated"> + + <!-- + A convention for renaming the files as they are processed on output. + By default uses the PathUtilsNamingConvention. + --> + <renamingConv namingExpr="/[SomePathUtils]/[Metadata]" envReplace="true"> + <metadata key="some-key" val="some-val"/> + <metadata key="some-other-key" val="zero-or-more-vals-comma-segregated"/> + </renamingConv> + </files> + </dir> </output>
Modified: oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/metadata/TestPgeMetadata.java URL: http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/metadata/TestPgeMetadata.java?rev=1617057&r1=1617056&r2=1617057&view=diff ============================================================================== --- oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/metadata/TestPgeMetadata.java (original) +++ oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/metadata/TestPgeMetadata.java Sun Aug 10 07:33:37 2014 @@ -50,7 +50,7 @@ public class TestPgeMetadata extends Tes pgeMet.replaceMetadata(pgeMet2, "test"); assertEquals("staticValue1", pgeMet.getMetadata("key1")); - assertEquals("dynValue2", pgeMet.getMetadata("key2")); + assertEquals("staticValue2", pgeMet.getMetadata("key2")); assertEquals("staticValue2", pgeMet.getMetadata("key2", PgeMetadata.Type.STATIC)); assertEquals("staticValue3", pgeMet.getMetadata("key3")); Modified: oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java URL: http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java?rev=1617057&r1=1617056&r2=1617057&view=diff ============================================================================== --- oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java (original) +++ oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileStager.java Sun Aug 10 07:33:37 2014 @@ -39,7 +39,6 @@ import org.apache.oodt.cas.pge.metadata. import org.apache.oodt.cas.pge.metadata.PgeTaskMetKeys; //EasyMock imports -import org.easymock.EasyMock; import org.easymock.IArgumentMatcher; //Google imports @@ -155,4 +154,5 @@ public class TestFileStager extends Test return null; } } + } Modified: oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/MockDynamicConfigFileWriter.java URL: http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/MockDynamicConfigFileWriter.java?rev=1617057&r1=1617056&r2=1617057&view=diff ============================================================================== --- oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/MockDynamicConfigFileWriter.java (original) +++ oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/writers/MockDynamicConfigFileWriter.java Sun Aug 10 07:33:37 2014 @@ -32,7 +32,7 @@ import org.apache.oodt.cas.metadata.Meta * * @author bfoster (Brian Foster) */ -public class MockDynamicConfigFileWriter implements DynamicConfigFileWriter { +public class MockDynamicConfigFileWriter extends DynamicConfigFileWriter { @Override public File generateFile(String filePath, Metadata metadata, Logger logger, Modified: oodt/trunk/workflow/src/main/bin/wmgr URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/bin/wmgr?rev=1617057&r1=1617056&r2=1617057&view=diff ============================================================================== --- oodt/trunk/workflow/src/main/bin/wmgr (original) +++ oodt/trunk/workflow/src/main/bin/wmgr Sun Aug 10 07:33:37 2014 @@ -51,6 +51,8 @@ case "$1" in $JAVA_HOME/bin/java -Djava.ext.dirs=${CAS_WORKFLOW_HOME}/lib \ -Djava.util.logging.config.file=${CAS_WORKFLOW_HOME}/etc/logging.properties \ -Dorg.apache.oodt.cas.workflow.properties=${CAS_WORKFLOW_PROPS} \ + -Dorg.apache.oodt.cas.pge.task.metkeys.legacyMode="true" \ + -Dorg.apache.oodt.cas.pge.task.status.legacyMode="true" \ org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManager --portNum $SERVER_PORT & echo $! >${RUN_HOME}/cas.workflow.pid echo "OK"
