You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/06 12:39:12 UTC
[02/15] oodt git commit: Merge update trunk to dep update branch
Merge update trunk to dep update branch
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705287 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/0daa5db5
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/0daa5db5
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/0daa5db5
Branch: refs/heads/master
Commit: 0daa5db559db085b7345231db9cfac3fc2ecca7a
Parents: 5839183 53e3477
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 12:55:12 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 12:55:12 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 47 +-
agility/setup.py | 2 +-
app/fmbrowser/pom.xml | 2 +-
app/weditor/pom.xml | 4 +-
.../lib/pear/Core/ApplicationRequest.class.php | 8 +-
catalog/pom.xml | 2 +-
cli/pom.xml | 2 +-
commons/pom.xml | 2 +-
.../oodt/commons/io/DirectorySelectorTest.java | 17 +
.../org/apache/oodt/commons/util/XMLTest.java | 4 +-
commons/src/test/resources/test.xml | 16 +
core/pom.xml | 17 +-
crawler/pom.xml | 2 +-
curator/pom.xml | 225 -
curator/services/pom.xml | 166 +
.../curation/metadata/CuratorConfMetKeys.java | 52 +
.../cas/curation/service/CurationService.java | 154 +
.../curation/service/CurationServiceConfig.java | 212 +
.../cas/curation/service/DirectoryResource.java | 139 +
.../cas/curation/service/IngestionResource.java | 352 ++
.../cas/curation/service/MetadataResource.java | 972 ++++
.../cas/curation/service/PolicyResource.java | 310 ++
.../cas/curation/service/SystemResource.java | 69 +
.../cas/curation/structs/ExtractorConfig.java | 54 +
.../cas/curation/structs/IngestionTask.java | 168 +
.../curation/structs/IngestionTaskStatus.java | 36 +
.../curation/util/CurationXmlStructFactory.java | 114 +
.../oodt/cas/curation/util/DateUtils.java | 59 +
.../curation/util/ExtractorConfigReader.java | 52 +
.../curation/util/ExtractorConfigWriter.java | 51 +
.../src/main/webapp/META-INF/context.xml | 43 +
.../services/src/main/webapp/WEB-INF/web.xml | 52 +
.../apache/oodt/cas/curation/CurationApp.java | 22 -
.../org/apache/oodt/cas/curation/HomePage.css | 645 ---
.../org/apache/oodt/cas/curation/HomePage.html | 149 -
.../org/apache/oodt/cas/curation/HomePage.java | 7 -
.../org/apache/oodt/cas/curation/HomePage.js | 639 ---
.../cas/curation/config/CuratorConfMetKeys.java | 56 -
.../org/apache/oodt/cas/curation/curation.png | Bin 10161 -> 0 bytes
.../oodt/cas/curation/fileTree/application.png | Bin 465 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/code.png | Bin 604 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/css.png | Bin 619 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/db.png | Bin 580 -> 0 bytes
.../oodt/cas/curation/fileTree/directory.png | Bin 538 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/doc.png | Bin 652 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/file.png | Bin 295 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/film.png | Bin 654 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/flash.png | Bin 583 -> 0 bytes
.../oodt/cas/curation/fileTree/folder_open.png | Bin 584 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/html.png | Bin 735 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/java.png | Bin 634 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/linux.png | Bin 669 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/music.png | Bin 386 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/pdf.png | Bin 592 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/php.png | Bin 539 -> 0 bytes
.../oodt/cas/curation/fileTree/picture.png | Bin 607 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/ppt.png | Bin 589 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/psd.png | Bin 857 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/ruby.png | Bin 627 -> 0 bytes
.../oodt/cas/curation/fileTree/script.png | Bin 860 -> 0 bytes
.../oodt/cas/curation/fileTree/spinner.gif | Bin 2531 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/txt.png | Bin 343 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/xls.png | Bin 664 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/zip.png | Bin 387 -> 0 bytes
.../org/apache/oodt/cas/curation/green_dot.png | Bin 195 -> 0 bytes
.../java/org/apache/oodt/cas/curation/help.gif | Bin 1583 -> 0 bytes
.../oodt/cas/curation/icon-new-dataset.png | Bin 2061 -> 0 bytes
.../cas/curation/icon-new-dataset_smaller.png | Bin 1446 -> 0 bytes
.../oodt/cas/curation/icon-new-product.png | Bin 1591 -> 0 bytes
.../cas/curation/icon-new-product_smaller.png | Bin 1345 -> 0 bytes
.../org/apache/oodt/cas/curation/important.gif | Bin 1493 -> 0 bytes
.../java/org/apache/oodt/cas/curation/info.gif | Bin 1488 -> 0 bytes
.../org/apache/oodt/cas/curation/ingestion.png | Bin 6687 -> 0 bytes
.../apache/oodt/cas/curation/jquery-1.3.2.js | 4376 ------------------
.../cas/curation/jquery-ui-1.7.2.full.min.js | 298 --
.../apache/oodt/cas/curation/jquery.alerts.css | 77 -
.../cas/curation/jquery.periodicalupdater.js | 105 -
.../org/apache/oodt/cas/curation/pencil.png | Bin 451 -> 0 bytes
.../org/apache/oodt/cas/curation/red_dot.png | Bin 219 -> 0 bytes
.../cas/curation/service/CurationService.java | 171 -
.../curation/service/CurationServiceConfig.java | 227 -
.../cas/curation/service/DirectoryResource.java | 138 -
.../cas/curation/service/IngestionResource.java | 352 --
.../cas/curation/service/MetadataResource.java | 972 ----
.../cas/curation/service/PolicyResource.java | 310 --
.../cas/curation/service/SystemResource.java | 69 -
.../cas/curation/structs/ExtractorConfig.java | 54 -
.../cas/curation/structs/IngestionTask.java | 168 -
.../curation/structs/IngestionTaskStatus.java | 36 -
.../java/org/apache/oodt/cas/curation/title.gif | Bin 318 -> 0 bytes
.../curation/util/CurationXmlStructFactory.java | 114 -
.../oodt/cas/curation/util/DateUtils.java | 59 -
.../curation/util/ExtractorConfigReader.java | 52 -
.../curation/util/ExtractorConfigWriter.java | 51 -
.../apache/oodt/cas/curation/util/SSOUtils.java | 60 -
curator/src/main/webapp/META-INF/context.xml | 53 -
curator/src/main/webapp/WEB-INF/web.xml | 62 -
curator/src/main/webapp/error.jsp | 22 -
curator/src/main/webapp/home.jsp | 160 -
curator/src/main/webapp/index.jsp | 20 -
curator/src/main/webapp/login.jsp | 69 -
curator/src/main/webapp/logout.jsp | 25 -
curator/src/main/webapp/sso_login.jsp | 34 -
curator/src/main/webapp/tools/logout.jsp | 24 -
curator/src/main/webapp/tools/requireLogin.jsp | 27 -
.../webapp/views/common/cas-curator-footer.jsp | 26 -
.../webapp/views/common/cas-curator-header.jsp | 119 -
.../main/webapp/views/common/login-status.jsp | 32 -
.../site/resources/images/basic_extractor.jpg | Bin 53280 -> 0 bytes
.../src/site/resources/images/basic_filemgr.jpg | Bin 72096 -> 0 bytes
.../src/site/resources/images/basic_ingest.jpg | Bin 48213 -> 0 bytes
.../src/site/resources/images/basic_login.jpg | Bin 26935 -> 0 bytes
.../src/site/resources/images/basic_page.jpg | Bin 26115 -> 0 bytes
.../src/site/resources/images/basic_staging.jpg | Bin 27100 -> 0 bytes
.../src/site/resources/images/cas-curator.jpg | Bin 27536 -> 0 bytes
.../src/site/resources/images/cas-curator.psd | Bin 1003720 -> 0 bytes
.../src/site/resources/media/Bach-SuiteNo2.mp3 | Bin 4781080 -> 0 bytes
curator/src/site/site.xml | 32 -
curator/src/site/xdoc/api/index.xml | 105 -
curator/src/site/xdoc/development/maven.xml | 175 -
curator/src/site/xdoc/user/advanced.xml | 56 -
curator/src/site/xdoc/user/basic.xml | 690 ---
curator/webapp/pom.xml | 170 +
.../apache/oodt/cas/curation/CurationApp.java | 147 +
.../oodt/cas/curation/CurationSession.java | 70 +
.../org/apache/oodt/cas/curation/HomePage.css | 242 +
.../org/apache/oodt/cas/curation/HomePage.html | 195 +
.../org/apache/oodt/cas/curation/HomePage.java | 90 +
.../apache/oodt/cas/curation/HomePage_edrn.html | 219 +
.../oodt/cas/curation/HomePage_wicket.css | 242 +
.../org/apache/oodt/cas/curation/bg-body.gif | Bin 0 -> 827 bytes
.../oodt/cas/curation/blackfade-syncd.jpg | Bin 0 -> 445 bytes
.../oodt/cas/curation/edrn-informatics.css | 421 ++
.../cas/curation/edrn-informatics_wicket.css | 421 ++
.../org/apache/oodt/cas/curation/edrn-logo.png | Bin 0 -> 8484 bytes
.../org/apache/oodt/cas/curation/footer_hhs.gif | Bin 0 -> 1232 bytes
.../org/apache/oodt/cas/curation/footer_nih.gif | Bin 0 -> 819 bytes
.../apache/oodt/cas/curation/footer_usagov.gif | Bin 0 -> 1049 bytes
.../java/org/apache/oodt/cas/curation/l-cdg.gif | Bin 0 -> 491 bytes
.../java/org/apache/oodt/cas/curation/l-dcp.gif | Bin 0 -> 2430 bytes
.../java/org/apache/oodt/cas/curation/l-nci.gif | Bin 0 -> 2309 bytes
.../java/org/apache/oodt/cas/curation/l-nih.gif | Bin 0 -> 778 bytes
.../oodt/cas/curation/login/LoginPage.css | 72 +
.../oodt/cas/curation/login/LoginPage.html | 95 +
.../oodt/cas/curation/login/LoginPage.java | 112 +
.../cas/curation/workbench/WorkbenchPage.html | 24 +
.../cas/curation/workbench/WorkbenchPage.java | 46 +
.../webapp/src/main/webapp/META-INF/context.xml | 60 +
curator/webapp/src/main/webapp/WEB-INF/web.xml | 72 +
.../site/resources/images/basic_extractor.jpg | Bin 0 -> 53280 bytes
.../src/site/resources/images/basic_filemgr.jpg | Bin 0 -> 72096 bytes
.../src/site/resources/images/basic_ingest.jpg | Bin 0 -> 48213 bytes
.../src/site/resources/images/basic_login.jpg | Bin 0 -> 26935 bytes
.../src/site/resources/images/basic_page.jpg | Bin 0 -> 26115 bytes
.../src/site/resources/images/basic_staging.jpg | Bin 0 -> 27100 bytes
.../src/site/resources/images/cas-curator.jpg | Bin 0 -> 27536 bytes
.../src/site/resources/images/cas-curator.psd | Bin 0 -> 1003720 bytes
.../src/site/resources/media/Bach-SuiteNo2.mp3 | Bin 0 -> 4781080 bytes
curator/webapp/src/site/site.xml | 32 +
curator/webapp/src/site/xdoc/api/index.xml | 105 +
.../webapp/src/site/xdoc/development/maven.xml | 175 +
curator/webapp/src/site/xdoc/user/advanced.xml | 56 +
curator/webapp/src/site/xdoc/user/basic.xml | 690 +++
filemgr/pom.xml | 2 +-
.../cli/action/AddProductTypeCliAction.java | 10 +-
.../oodt/cas/filemgr/util/XmlStructFactory.java | 11 +-
filemgr/src/main/resources/cmd-line-options.xml | 25 +
.../cas/filemgr/cli/TestFileManagerCli.java | 3 +-
.../cli/action/TestAddProductTypeCliAction.java | 9 +
.../repository/TestXMLRepositoryManager.java | 4 +-
filemgr/src/test/resources/cmd-line-options.xml | 25 +
grid/pom.xml | 9 +-
.../apache/oodt/grid/ProductQueryServlet.java | 13 +-
metadata/pom.xml | 2 +-
mvn/archetypes/opsui/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/webapp/META-INF/context.xml | 26 +
mvn/archetypes/pom.xml | 2 +-
mvn/archetypes/radix/pom.xml | 2 +-
.../solr/src/main/assembly/assembly.xml | 16 +
.../radix/src/main/resources/bin/radix | 2 +-
mvn/plugins/cas-install/pom.xml | 2 +-
opendapps/pom.xml | 2 +-
.../OpendapProfileElementExtractor.java | 3 +
pcs/core/pom.xml | 2 +-
pcs/input/pom.xml | 2 +-
pcs/opsui/pom.xml | 34 +-
.../curation/workbench/Workbench.js | 639 +++
.../org/apache/oodt/pcs/opsui/BasePage.html | 5 +
.../org/apache/oodt/pcs/opsui/BasePage.java | 8 +-
.../apache/oodt/pcs/opsui/BasePage_classic.html | 7 +
.../oodt/pcs/opsui/BasePage_cleanwhite.html | 5 +
.../org/apache/oodt/pcs/opsui/HomePage.html | 5 +
.../org/apache/oodt/pcs/opsui/HomePage.java | 11 +-
.../org/apache/oodt/pcs/opsui/OpsuiApp.java | 28 +
.../apache/oodt/pcs/opsui/WorkbenchPage.html | 19 +
.../apache/oodt/pcs/opsui/WorkbenchPage.java | 30 +
pcs/opsui/src/main/webapp/META-INF/context.xml | 33 +-
pcs/opsui/src/main/webapp/WEB-INF/web.xml | 34 +-
pcs/services/pom.xml | 2 +-
pge/pom.xml | 2 +-
pom.xml | 6 +-
product/pom.xml | 2 +-
profile/pom.xml | 9 +-
.../oodt/profile/EnumeratedProfileElement.java | 16 +-
.../java/org/apache/oodt/profile/Profile.java | 30 +-
.../org/apache/oodt/profile/ProfileElement.java | 30 +-
.../oodt/profile/RangedProfileElement.java | 4 +-
.../apache/oodt/profile/ResourceAttributes.java | 109 +-
.../oodt/profile/UnspecifiedProfileElement.java | 4 +-
.../java/org/apache/oodt/profile/Utility.java | 32 +-
.../resources/org/apache/oodt/profile/test.xml | 16 +
profile/src/test/resources/test.xml | 16 +
protocol/api/pom.xml | 2 +-
protocol/ftp/pom.xml | 2 +-
protocol/http/pom.xml | 2 +-
protocol/imaps/pom.xml | 2 +-
protocol/sftp/pom.xml | 2 +-
pushpull/pom.xml | 2 +-
resource/pom.xml | 2 +-
resource/src/main/bin/resmgr | 1 +
.../oodt/cas/resource/batchmgr/Batchmgr.java | 7 +
.../cas/resource/batchmgr/XmlRpcBatchMgr.java | 21 +
.../cli/action/GetExecReportCliAction.java | 46 +
.../cli/action/GetNodeReportCliAction.java | 45 +
.../cli/action/GetQueuedJobsCliAction.java | 55 +
.../cas/resource/mux/QueueMuxBatchManager.java | 7 +
.../cas/resource/scheduler/LRUScheduler.java | 9 +-
.../resource/system/XmlRpcResourceManager.java | 90 +
.../system/XmlRpcResourceManagerClient.java | 45 +-
.../resource/util/ResourceNodeComparator.java | 36 +
.../cas/resource/util/XmlRpcStructFactory.java | 26 +
.../src/main/resources/cmd-line-actions.xml | 12 +
.../src/main/resources/cmd-line-options.xml | 66 +-
.../resource/mux/mocks/MockBatchManager.java | 8 +
sso/pom.xml | 2 +-
webapp/components/pom.xml | 23 +-
.../curation/workbench/Workbench.css | 405 ++
.../curation/workbench/Workbench.html | 153 +
.../curation/workbench/Workbench.java | 60 +
.../curation/workbench/Workbench.js | 639 +++
.../curation/workbench/Workbench_wicket.css | 403 ++
.../curation/workbench/application.png | Bin 0 -> 465 bytes
.../webcomponents/curation/workbench/code.png | Bin 0 -> 604 bytes
.../webcomponents/curation/workbench/css.png | Bin 0 -> 619 bytes
.../cas/webcomponents/curation/workbench/db.png | Bin 0 -> 580 bytes
.../curation/workbench/directory.png | Bin 0 -> 538 bytes
.../webcomponents/curation/workbench/doc.png | Bin 0 -> 652 bytes
.../webcomponents/curation/workbench/file.png | Bin 0 -> 295 bytes
.../webcomponents/curation/workbench/film.png | Bin 0 -> 654 bytes
.../webcomponents/curation/workbench/flash.png | Bin 0 -> 583 bytes
.../curation/workbench/folder_open.png | Bin 0 -> 584 bytes
.../webcomponents/curation/workbench/help.gif | Bin 0 -> 1583 bytes
.../webcomponents/curation/workbench/html.png | Bin 0 -> 735 bytes
.../curation/workbench/important.gif | Bin 0 -> 1493 bytes
.../webcomponents/curation/workbench/info.gif | Bin 0 -> 1488 bytes
.../webcomponents/curation/workbench/java.png | Bin 0 -> 634 bytes
.../curation/workbench/jquery-1.3.2.js | 4376 ++++++++++++++++++
.../workbench/jquery-ui-1.7.2.full.min.js | 298 ++
.../curation/workbench/jquery.alerts.css | 77 +
.../curation/workbench/jquery.alerts.js | 315 ++
.../curation/workbench/jquery.alerts_wicket.css | 77 +
.../workbench/jquery.periodicalupdater.js | 105 +
.../webcomponents/curation/workbench/linux.png | Bin 0 -> 669 bytes
.../webcomponents/curation/workbench/music.png | Bin 0 -> 386 bytes
.../webcomponents/curation/workbench/pdf.png | Bin 0 -> 592 bytes
.../webcomponents/curation/workbench/php.png | Bin 0 -> 539 bytes
.../curation/workbench/picture.png | Bin 0 -> 607 bytes
.../webcomponents/curation/workbench/ppt.png | Bin 0 -> 589 bytes
.../webcomponents/curation/workbench/psd.png | Bin 0 -> 857 bytes
.../webcomponents/curation/workbench/ruby.png | Bin 0 -> 627 bytes
.../webcomponents/curation/workbench/script.png | Bin 0 -> 860 bytes
.../curation/workbench/spinner.gif | Bin 0 -> 2531 bytes
.../webcomponents/curation/workbench/title.gif | Bin 0 -> 318 bytes
.../webcomponents/curation/workbench/txt.png | Bin 0 -> 343 bytes
.../webcomponents/curation/workbench/xls.png | Bin 0 -> 664 bytes
.../webcomponents/curation/workbench/zip.png | Bin 0 -> 387 bytes
webapp/fmbrowser/pom.xml | 6 +-
webapp/fmprod/pom.xml | 2 +-
webapp/wmonitor/pom.xml | 6 +-
workflow/pom.xml | 2 +-
workflow/src/main/bin/wmgr | 1 +
xmlps/pom.xml | 4 +-
.../apache/oodt/xmlps/profile/DBMSExecutor.java | 1 +
xmlquery/pom.xml | 2 +-
.../oodt/product/HttpRedirectException.java | 40 +
.../java/org/apache/oodt/xmlquery/XMLQuery.java | 1 +
287 files changed, 15524 insertions(+), 11373 deletions(-)
----------------------------------------------------------------------