Merge branch 'master' into feature/zookeeper-config

Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/a8092af5
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/a8092af5
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/a8092af5

Branch: refs/heads/feature/zookeeper-config
Commit: a8092af5484d066a4dda623395bf21612d696d62
Parents: ec5b201 99b086b
Author: Imesha Sudasingha <imesha.sudasin...@gmail.com>
Authored: Mon Jul 10 19:54:28 2017 +0530
Committer: Imesha Sudasingha <imesha.sudasin...@gmail.com>
Committed: Mon Jul 10 19:54:28 2017 +0530

----------------------------------------------------------------------
 README.md                                       |   26 +-
 config/pom.xml                                  |   83 +
 config/src/main/assembly/assembly.xml           |   56 +
 .../oodt/config/ConfigurationManager.java       |   38 +
 .../config/ConfigurationManagerFactory.java     |   62 +
 .../java/org/apache/oodt/config/Constants.java  |  101 +
 .../DistributedConfigurationManager.java        |  192 +
 .../oodt/config/distributed/ZNodePaths.java     |   88 +
 .../config/distributed/cli/CmdLineOptions.java  |   57 +
 .../cli/DistributedConfigurationPublisher.java  |  330 ++
 .../config/distributed/utils/CuratorUtils.java  |  192 +
 .../StandaloneConfigurationManager.java         |   55 +
 .../src/main/resources/etc/config-publisher.xml |   42 +
 config/src/main/resources/etc/log4j.xml         |   40 +
 .../examples/filemgr/cmd-line-actions.xml       |  123 +
 .../examples/filemgr/cmd-line-options.xml       | 1175 +++++
 .../examples/filemgr/filemgr.properties         |  114 +
 .../resources/examples/filemgr/mime-types.xml   | 4119 ++++++++++++++++++
 .../examples/filemgr/oodt/elements.xml          |   77 +
 .../filemgr/oodt/product-type-element-map.xml   |   33 +
 .../examples/filemgr/oodt/product-types.xml     |   53 +
 .../examples/resmgr/cmd-line-actions.xml        |   92 +
 .../examples/resmgr/cmd-line-options.xml        |  601 +++
 .../resources/examples/resmgr/jobs/exJob.xml    |   30 +
 .../examples/resmgr/jobs/exLongJob.xml          |   30 +
 .../examples/resmgr/logging.properties          |   67 +
 .../examples/resmgr/node-to-queue-mapping.xml   |   26 +
 .../main/resources/examples/resmgr/nodes.xml    |   23 +
 .../examples/resmgr/resource.properties         |   61 +
 .../AbstractDistributedConfigurationTest.java   |   49 +
 .../DistributedConfigurationManagerTest.java    |  125 +
 .../DistributedConfigurationPublisherTest.java  |  112 +
 .../oodt/config/distributed/TestServer.java     |   45 +
 .../src/test/resources/etc/config-publisher.xml |   61 +
 core/pom.xml                                    |   25 +
 filemgr/pom.xml                                 |    4 +
 filemgr/src/main/assembly/assembly.xml          |   49 +-
 filemgr/src/main/bin/filemgr                    |   26 +-
 .../cas/filemgr/system/XmlRpcFileManager.java   |   68 +-
 filemgr/src/main/resources/log4j.xml            |   40 +
 pom.xml                                         |    1 +
 41 files changed, 8502 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oodt/blob/a8092af5/README.md
----------------------------------------------------------------------
diff --cc README.md
index 46e7fd5,76c6d49..2337b92
--- a/README.md
+++ b/README.md
@@@ -144,10 -137,9 +137,9 @@@ dev-subscribe@oodt...).  To unsubscribe
  <LIST>-unsubscr...@oodt.apache.org.  For more instructions, send a
  message to <LIST>-h...@oodt.apache.org.
  
- Issue Tracker
- =============
+ ## Issue Tracker
  
  If you encounter errors in OODT or want to suggest an improvement or a new
 -feature, please visit the OODT issue tracker at
 +feature, please visit the OODT issue tracker 
  https://issues.apache.org/jira/browse/OODT.  There you can also find the
  latest information on known issues and recent bug fixes and enhancements.

Reply via email to