Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A32A72004F1 for ; Wed, 9 Aug 2017 19:09:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A1CDB1699F9; Wed, 9 Aug 2017 17:09:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 88ABE1699F2 for ; Wed, 9 Aug 2017 19:09:43 +0200 (CEST) Received: (qmail 19183 invoked by uid 500); 9 Aug 2017 17:09:42 -0000 Mailing-List: contact commits-help@oodt.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@oodt.apache.org Delivered-To: mailing list commits@oodt.apache.org Received: (qmail 19153 invoked by uid 99); 9 Aug 2017 17:09:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2017 17:09:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D749EE95C7; Wed, 9 Aug 2017 17:09:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mattmann@apache.org To: commits@oodt.apache.org Date: Wed, 09 Aug 2017 17:09:41 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/8] oodt git commit: Added maven-resource-plugin for example resource copying and CLI improvements archived-at: Wed, 09 Aug 2017 17:09:45 -0000 Repository: oodt Updated Branches: refs/heads/feature/zookeeper-config 8b02792ae -> 1d70bd559 http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/filemgr/oodt/elements.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/filemgr/oodt/elements.xml b/config/src/main/resources/examples/filemgr/oodt/elements.xml deleted file mode 100755 index d56c44b..0000000 --- a/config/src/main/resources/examples/filemgr/oodt/elements.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - -Identifier - - -A Product's unique identifier within the CAS namespace. - - - -Title - -A Product's name within the CAS namespace. - - - - - -The ISO 8601 formatted time that the Product was received. - - - - -The names of the files that represent this product. - - - - - -The locations of the files that represent this product. - - - - - -Type of product, as specified by, e.g., a data bible. - - - - - -Whether or not a product is Flat (e.g., a set of independent -files), or hierarchical, e.g., a dir structure. - - - - -The IETF mime type of this product. - - - -The version of the data product - - - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/filemgr/oodt/product-type-element-map.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/filemgr/oodt/product-type-element-map.xml b/config/src/main/resources/examples/filemgr/oodt/product-type-element-map.xml deleted file mode 100755 index 418c0d9..0000000 --- a/config/src/main/resources/examples/filemgr/oodt/product-type-element-map.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/filemgr/oodt/product-types.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/filemgr/oodt/product-types.xml b/config/src/main/resources/examples/filemgr/oodt/product-types.xml deleted file mode 100755 index 2d40847..0000000 --- a/config/src/main/resources/examples/filemgr/oodt/product-types.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - The default product type for any kind of file. - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/resmgr/cmd-line-actions.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/resmgr/cmd-line-actions.xml b/config/src/main/resources/examples/resmgr/cmd-line-actions.xml deleted file mode 100755 index 04919e9..0000000 --- a/config/src/main/resources/examples/resmgr/cmd-line-actions.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/resmgr/cmd-line-options.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/resmgr/cmd-line-options.xml b/config/src/main/resources/examples/resmgr/cmd-line-options.xml deleted file mode 100755 index a7a1fde..0000000 --- a/config/src/main/resources/examples/resmgr/cmd-line-options.xml +++ /dev/null @@ -1,601 +0,0 @@ - - - - - - - - - - - - - - - - org.apache.oodt.cas.resource.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - getNodeById - - - - - - - - - - - - - - - - - - getNodes - - - - - - - - - - - - - - - - - - getQueues - - - - - - - - - - - - - - - - - - addNode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - removeNode - - - - - - - - - - - - - - - - - - setNodeCapacity - - - - - - - - - - - - - - - - - - getExecNode - - - - - - - - - - - - - - - - - - addQueue - - - - - - - - - - - - - - - - - - removeQueue - - - - - - - - - - - - - - - - - - addNodeToQueue - - - - - - - - - - - - - - - - - - getNodesInQueue - - - - - - - - - - - - - - - - - - getQueuesWithNode - - - - - - - - - - - - - - - - - - removeNodeFromQueue - - - - - - - - - - - - - - - - - - getNodeLoad - - - - - - - - - - - - - - - - - - submitJob - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - getJobInfo - - - - - - - - - - - - - - - - - - kill - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/resmgr/jobs/exJob.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/resmgr/jobs/exJob.xml b/config/src/main/resources/examples/resmgr/jobs/exJob.xml deleted file mode 100755 index bbe0def..0000000 --- a/config/src/main/resources/examples/resmgr/jobs/exJob.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - quick - 1 - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/resmgr/jobs/exLongJob.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/resmgr/jobs/exLongJob.xml b/config/src/main/resources/examples/resmgr/jobs/exLongJob.xml deleted file mode 100755 index 3cbeb29..0000000 --- a/config/src/main/resources/examples/resmgr/jobs/exLongJob.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - quick - 1 - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/resmgr/logging.properties ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/resmgr/logging.properties b/config/src/main/resources/examples/resmgr/logging.properties deleted file mode 100755 index 8785c8b..0000000 --- a/config/src/main/resources/examples/resmgr/logging.properties +++ /dev/null @@ -1,67 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE.txt file distributed with -# this work for additional information regarding copyright ownership. The ASF -# licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -# Specify the handlers to create in the root logger -# (all loggers are children of the root logger) -# The following creates two handlers -handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler - -# Set the default logging level for the root logger -.level = ALL - -# Set the default logging level for new ConsoleHandler instances -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.FileHandler.level = ALL - -# Set the default formatter for new ConsoleHandler instances -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - -# default file output is in user's home directory. -java.util.logging.FileHandler.pattern = ../logs/cas_resource%g.log -java.util.logging.FileHandler.limit = 50000 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.append = true -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter - -# Set the default logging level for the subsystems - -# batchmgr subsystem -org.apache.oodt.cas.resource.batchmgr.level = INFO - -# monitor subsystem -org.apache.oodt.cas.resource.monitor.level = INFO - -# jobqueue subsystem -org.apache.oodt.cas.resource.jobqueue.level = INFO - -# scheduler subsystem -org.apache.oodt.cas.resource.scheduler.level = INFO - -# system subsystem -org.apache.oodt.cas.resource.system.level = FINE - -# control the underlying commons-httpclient transport layer for xmlrpc -org.apache.commons.httpclient.level = INFO -httpclient.wire.header.level = INFO -httpclient.wire.level = INFO - -# spring framework logging -org.springframework.beans.level = SEVERE -org.springframework.core.level = SEVERE -org.springframework.level = SEVERE -org.springframework.beans.factory.level = SEVERE -org.springframework.beans.factory.config.level = SEVERE -org.springframework.beans.factory.config.PropertyPlaceholderConfigurer.level = SEVERE http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/resmgr/node-to-queue-mapping.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/resmgr/node-to-queue-mapping.xml b/config/src/main/resources/examples/resmgr/node-to-queue-mapping.xml deleted file mode 100755 index 73b0eba..0000000 --- a/config/src/main/resources/examples/resmgr/node-to-queue-mapping.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/resmgr/nodes.xml ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/resmgr/nodes.xml b/config/src/main/resources/examples/resmgr/nodes.xml deleted file mode 100755 index d3d415d..0000000 --- a/config/src/main/resources/examples/resmgr/nodes.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/main/resources/examples/resmgr/resource.properties ---------------------------------------------------------------------- diff --git a/config/src/main/resources/examples/resmgr/resource.properties b/config/src/main/resources/examples/resmgr/resource.properties deleted file mode 100755 index 5520c7b..0000000 --- a/config/src/main/resources/examples/resmgr/resource.properties +++ /dev/null @@ -1,61 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE.txt file distributed with -# this work for additional information regarding copyright ownership. The ASF -# licenses this file to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# -# Properties required to configure the Resource Manager - -# resource batchmgr factory -resource.batchmgr.factory = org.apache.oodt.cas.resource.batchmgr.XmlRpcBatchMgrFactory - -# resource monitor factory -resource.monitor.factory = org.apache.oodt.cas.resource.monitor.AssignmentMonitorFactory - -# resource scheduler factory -resource.scheduler.factory = org.apache.oodt.cas.resource.scheduler.LRUSchedulerFactory - -# resource jobqueue factory -resource.jobqueue.factory = org.apache.oodt.cas.resource.jobqueue.JobStackJobQueueFactory - -# resource job repository factory -resource.jobrepo.factory = org.apache.oodt.cas.resource.jobrepo.MemoryJobRepositoryFactory - -# node repository factory -org.apache.oodt.cas.resource.nodes.repo.factory = org.apache.oodt.cas.resource.noderepo.XmlNodeRepositoryFactory - -# queue repository factory -org.apache.oodt.cas.resource.queues.repo.factory = org.apache.oodt.cas.resource.queuerepo.XmlQueueRepositoryFactory - -# JobStack JobQueue config properties -org.apache.oodt.cas.resource.jobqueue.jobstack.maxstacksize=1000 - -# XML LRUScheduler config properties -org.apache.oodt.cas.resource.scheduler.wait.seconds=20 - -# XML-RPC configuration props -org.apache.oodt.cas.resource.system.xmlrpc.requestTimeout.minutes=20 -org.apache.oodt.cas.resource.system.xmlrpc.connectionTimeout.minutes=60 - -# XStream JobRepo configuration props -org.apache.oodt.cas.resource.jobrepo.xstream.working.dir=[HOME]/job-repo -org.apache.oodt.cas.resource.jobrepo.xstream.max.history=4000 - -# XML Node Repository config properties -org.apache.oodt.cas.resource.nodes.dirs=file://[RESMGR_HOME]/policy - -# XML Queue Repository config properties -org.apache.oodt.cas.resource.nodetoqueues.dirs=file://[RESMGR_HOME]/policy - - - http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/test/java/org/apache/oodt/config/distributed/AbstractDistributedConfigurationTest.java ---------------------------------------------------------------------- diff --git a/config/src/test/java/org/apache/oodt/config/distributed/AbstractDistributedConfigurationTest.java b/config/src/test/java/org/apache/oodt/config/distributed/AbstractDistributedConfigurationTest.java index 4694dfa..27174ba 100644 --- a/config/src/test/java/org/apache/oodt/config/distributed/AbstractDistributedConfigurationTest.java +++ b/config/src/test/java/org/apache/oodt/config/distributed/AbstractDistributedConfigurationTest.java @@ -27,6 +27,8 @@ import static org.apache.oodt.config.Constants.Properties.ZK_CONNECT_STRING; public abstract class AbstractDistributedConfigurationTest { + protected static final String CONFIG_PUBLISHER_XML = "config-publisher.xml"; + protected static TestingServer zookeeper; protected static CuratorFramework client; http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java ---------------------------------------------------------------------- diff --git a/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java b/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java index 71ce713..d96767b 100644 --- a/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java +++ b/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java @@ -38,7 +38,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import static org.apache.oodt.config.Constants.CONFIG_PUBLISHER_XML; import static org.apache.oodt.config.Constants.SEPARATOR; import static org.junit.Assert.fail; @@ -58,6 +57,7 @@ public class DistributedConfigurationManagerTest extends AbstractDistributedConf ConfigPublisher.main(new String[]{ "-connectString", zookeeper.getConnectString(), + "-config", CONFIG_PUBLISHER_XML, "-a", "publish" }); @@ -140,6 +140,7 @@ public class DistributedConfigurationManagerTest extends AbstractDistributedConf ConfigPublisher.main(new String[]{ "-connectString", zookeeper.getConnectString(), + "-config", CONFIG_PUBLISHER_XML, "-a", "clear" }); http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisherTest.java ---------------------------------------------------------------------- diff --git a/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisherTest.java b/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisherTest.java index 5a529ed..24a43e3 100644 --- a/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisherTest.java +++ b/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationPublisherTest.java @@ -29,8 +29,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.apache.oodt.config.Constants.CONFIG_PUBLISHER_XML; - /** * Testing the functionality of {@link DistributedConfigurationPublisher} and its CLI * @@ -43,6 +41,7 @@ public class DistributedConfigurationPublisherTest extends AbstractDistributedCo // Publishing configuration through CLI and verifying whether they were stored correctly ConfigPublisher.main(new String[]{ "-connectString", zookeeper.getConnectString(), + "-config", CONFIG_PUBLISHER_XML, "-a", "publish" }); @@ -83,6 +82,7 @@ public class DistributedConfigurationPublisherTest extends AbstractDistributedCo // Clearing configuration through CLI and checking whether the configuration has actually been gone ConfigPublisher.main(new String[]{ "-connectString", zookeeper.getConnectString(), + "-config", CONFIG_PUBLISHER_XML, "-a", "clear" }); http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/test/resources/config-publisher.xml ---------------------------------------------------------------------- diff --git a/config/src/test/resources/config-publisher.xml b/config/src/test/resources/config-publisher.xml new file mode 100644 index 0000000..5720dab --- /dev/null +++ b/config/src/test/resources/config-publisher.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/oodt/blob/d2f2d49d/config/src/test/resources/etc/config-publisher.xml ---------------------------------------------------------------------- diff --git a/config/src/test/resources/etc/config-publisher.xml b/config/src/test/resources/etc/config-publisher.xml deleted file mode 100644 index ecae033..0000000 --- a/config/src/test/resources/etc/config-publisher.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file