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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE 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. ---> -<cas:elements xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"> -<element id="urn:oodt:ProductId" name="CAS.ProductId"> -<dcElement>Identifier</dcElement> - <!-- -You can optionally specify a 'trim' tag to identify whether -or not you want newlines trimmed from the element description. To -turn off trimming (now done by default), include the following with your -description definition: trim="false" ---> -<description> -A Product's unique identifier within the CAS namespace. -</description> -</element> -<element id="urn:oodt:ProductName" name="CAS.ProductName"> -<dcElement>Title</dcElement> -<description> -A Product's name within the CAS namespace. -</description> -</element> -<element id="urn:oodt:ProductReceivedTime" -name="CAS.ProductReceivedTime"> -<dcElement /> -<description> -The ISO 8601 formatted time that the Product was received. -</description> -</element> -<element id="urn:oodt:Filename" name="Filename"> -<description> -The names of the files that represent this product. -</description> -<dcElement /> -</element> -<element id="urn:oodt:FileLocation" name="FileLocation"> -<description> -The locations of the files that represent this product. -</description> -<dcElement /> -</element> -<element id="urn:oodt:ProductType" name="ProductType"> -<description> -Type of product, as specified by, e.g., a data bible. -</description> -<dcElement /> -</element> -<element id="urn:oodt:ProductStructure" name="ProductStructure"> -<description> -Whether or not a product is Flat (e.g., a set of independent -files), or hierarchical, e.g., a dir structure. -</description> -<dcElement /> -</element> -<element id="urn:oodt:MimeType" name="MimeType"> -<description>The IETF mime type of this product.</description> -<dcElement /> -</element> -<element id="urn:test:DataVersion" name="DataVersion"> -<description>The version of the data product</description> -<dcElement /> -</element> -</cas:elements> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE 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. ---> -<cas:producttypemap xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"> - <!-- can set the "parent" attribute on types below to allow inheritance -of elements between the types ---> - <type id="urn:oodt:GenericFile"> - <element id="urn:oodt:ProductReceivedTime"/> - <element id="urn:oodt:ProductName"/> - <element id="urn:oodt:ProductId"/> - <element id="urn:oodt:ProductType"/> - <element id="urn:oodt:ProductStructure"/> - <element id="urn:oodt:Filename"/> - <element id="urn:oodt:FileLocation"/> - <element id="urn:oodt:MimeType"/> - <element id="urn:test:DataVersion"/> - </type> -</cas:producttypemap> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE 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. ---> -<cas:producttypes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"> - <type id="urn:oodt:GenericFile" name="GenericFile"> - <repository path="file://[OODT_HOME]/data/archive"/> - <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/> - <!-- -You can optionally specify a 'trim' tag to identify whether -or not you want newlines trimmed from the product type description. To -turn off trimming (now done by default), include the following attribute with your -description definition: trim="false" ---> - <description>The default product type for any kind of file.</description> - <metExtractors> - <extractor - class="org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor"> - <configuration> - <!-- you can optionally include the envReplace tag to turn on/off environment var replacement --> - <property name="nsAware" value="true" /> - <property name="elementNs" value="CAS" /> - <property name="elements" - value="ProductReceivedTime,ProductName,ProductId" /> - </configuration> - </extractor> - <extractor class="org.apache.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor" /> - <extractor class="org.apache.oodt.cas.filemgr.metadata.extractors.examples.FinalFileLocationExtractor"> - <configuration> - <!-- this property specifies whether you want the FILE_LOCATION field -computed by this extractor to replace any other FILE_LOCATION met -attribute. ---> - <property name="replace" value="true"/> - </configuration> - </extractor> - </metExtractors> - <metadata/> - </type> -</cas:producttypes> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE 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. - - Author: bfoster (Brian Foster) ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - - <bean id="addNode" - class="org.apache.oodt.cas.resource.cli.action.AddNodeCliAction"> - <property name="description" value="Adds a ResourceNode" /> - </bean> - <bean id="addNodeToQueue" - class="org.apache.oodt.cas.resource.cli.action.AddNodeToQueueCliAction"> - <property name="description" value="Adds a ResourceNode to a Queue" /> - </bean> - <bean id="addQueue" - class="org.apache.oodt.cas.resource.cli.action.AddQueueCliAction"> - <property name="description" value="Adds a queue" /> - </bean> - <bean id="getExecNode" - class="org.apache.oodt.cas.resource.cli.action.GetExecNodeCliAction"> - <property name="description" value="Get execution node for a job" /> - </bean> - <bean id="getJobInfo" - class="org.apache.oodt.cas.resource.cli.action.GetJobInfoCliAction"> - <property name="description" value="Gets information about a job" /> - </bean> - <bean id="getNodeById" - class="org.apache.oodt.cas.resource.cli.action.GetNodeByIdCliAction"> - <property name="description" value="Gets information about a node" /> - </bean> - <bean id="getNodeLoad" - class="org.apache.oodt.cas.resource.cli.action.GetNodeLoadCliAction"> - <property name="description" value="Gets the current job load of a node" /> - </bean> - <bean id="getNodes" - class="org.apache.oodt.cas.resource.cli.action.GetNodesCliAction"> - <property name="description" value="Gets a list of managed nodes" /> - </bean> - <bean id="getNodesInQueue" - class="org.apache.oodt.cas.resource.cli.action.GetNodesInQueueCliAction"> - <property name="description" - value="Gets list of nodes which belong to given queue" /> - </bean> - <bean id="getQueues" - class="org.apache.oodt.cas.resource.cli.action.GetQueuesCliAction"> - <property name="description" value="Gets list of queues" /> - </bean> - <bean id="getQueuesWithNode" - class="org.apache.oodt.cas.resource.cli.action.GetQueuesWithNodeCliAction"> - <property name="description" value="Gets list of queues which contain given node" /> - </bean> - <bean id="kill" class="org.apache.oodt.cas.resource.cli.action.KillCliAction"> - <property name="description" value="Kills a job" /> - </bean> - <bean id="removeNode" - class="org.apache.oodt.cas.resource.cli.action.RemoveNodeCliAction"> - <property name="description" value="Removes given node from managed nodes" /> - </bean> - <bean id="removeNodeFromQueue" - class="org.apache.oodt.cas.resource.cli.action.RemoveNodeFromQueueCliAction"> - <property name="description" value="Removes given node from given queue" /> - </bean> - <bean id="removeQueue" - class="org.apache.oodt.cas.resource.cli.action.RemoveQueueCliAction"> - <property name="description" value="Removes a queue" /> - </bean> - <bean id="setNodeCapacity" - class="org.apache.oodt.cas.resource.cli.action.SetNodeCapacityCliAction"> - <property name="description" value="Changes a nodes capacity" /> - </bean> - <bean id="submitJob" - class="org.apache.oodt.cas.resource.cli.action.SubmitJobCliAction"> - <property name="description" value="Submits a job for execution" /> - </bean> -</beans> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE 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. - - Author: bfoster (Brian Foster) ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - - <bean id="url" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="u" /> - <property name="longOption" value="url" /> - <property name="description" value="Resource Manager URL" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="url" /> - <property name="required" value="true" /> - <property name="handler"> - <bean - class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.resource.url</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="operation" class="org.apache.oodt.cas.cli.option.GroupCmdLineOption"> - <property name="shortOption" value="op" /> - <property name="longOption" value="operation" /> - <property name="description" - value="Declare that you wish to present an operation" /> - <property name="hasArgs" value="false" /> - <property name="required" value="true" /> - <property name="subOptions"> - <list> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getNodeById" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getNodes" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getQueues" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="addNode" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="removeNode" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="setNodeCapacity" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getExecNode" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="addQueue" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="removeQueue" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="addNodeToQueue" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getNodesInQueue" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getQueuesWithNode" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="removeNodeFromQueue" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getNodeLoad" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="submitJob" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="getJobInfo" p:required="false" /> - <bean class="org.apache.oodt.cas.cli.option.GroupSubOption" - p:option-ref="kill" p:required="false" /> - </list> - </property> - </bean> - - <!-- GetNodeById Options --> - <bean id="getNodeById" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="nbyid" /> - <property name="longOption" value="getNodeById" /> - <property name="description" value="Triggers getNodeById Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>getNodeById</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getNodeById" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- GetNodes Options --> - <bean id="getNodes" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="nodes" /> - <property name="longOption" value="getNodes" /> - <property name="description" value="Triggers getNodes Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>getNodes</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getNodes" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- GetQueues Options --> - <bean id="getQueues" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="queues" /> - <property name="longOption" value="getQueues" /> - <property name="description" value="Triggers getQueues Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>getQueues</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getQueues" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- AddNode Options --> - <bean id="addNode" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="an" /> - <property name="longOption" value="addNode" /> - <property name="description" value="Triggers addNode Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>addNode</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addNode" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <bean id="ipAddr" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="addr" /> - <property name="longOption" value="ipAddr" /> - <property name="description" value="Node IP Address" /> - <property name="type" value="java.net.URL" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="ip-addr" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addNode" p:relation="REQUIRED" /> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler"> - <property name="applyToActions"> - <list> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="addNode" p:methodName="setNodeUrl" /> - </list> - </property> - </bean> - </property> - </bean> - - <!-- RemoveNode Options --> - <bean id="removeNode" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="rn" /> - <property name="longOption" value="removeNode" /> - <property name="description" value="Triggers removeNode Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>removeNode</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="removeNode" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- SetNodeCapacity Options --> - <bean id="setNodeCapacity" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="sncap" /> - <property name="longOption" value="setNodeCapacity" /> - <property name="description" value="Triggers setNodeCapacity Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>setNodeCapacity</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="setNodeCapacity" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- SetNodeCapacity Options --> - <bean id="getExecNode" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="exeNode" /> - <property name="longOption" value="getExecNode" /> - <property name="description" value="Triggers getExecNode Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>getExecNode</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getExecNode" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- AddQueue Options --> - <bean id="addQueue" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="aq" /> - <property name="longOption" value="addQueue" /> - <property name="description" value="Triggers addQueue Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>addQueue</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addQueue" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- RemoveQueue Options --> - <bean id="removeQueue" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="rq" /> - <property name="longOption" value="removeQueue" /> - <property name="description" value="Triggers removeQueue Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>removeQueue</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="removeQueue" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- AddNodeToQueue Options --> - <bean id="addNodeToQueue" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="antq" /> - <property name="longOption" value="addNodeToQueue" /> - <property name="description" value="Triggers addNodeToQueue Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>addNodeToQueue</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addNodeToQueue" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- GetNodesInQueue Options --> - <bean id="getNodesInQueue" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="ninq" /> - <property name="longOption" value="getNodesInQueue" /> - <property name="description" value="Triggers getNodesInQueue Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>getNodesInQueue</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getNodesInQueue" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- GetQueuesWithNode Options --> - <bean id="getQueuesWithNode" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="qwn" /> - <property name="longOption" value="getQueuesWithNode" /> - <property name="description" value="Triggers getQueuesWithNode Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>getQueuesWithNode</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getQueuesWithNode" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- RemoveNodeFromQueue Options --> - <bean id="removeNodeFromQueue" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="rnfq" /> - <property name="longOption" value="removeNodeFromQueue" /> - <property name="description" value="Triggers removeNodeFromQueue Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>removeNodeFromQueue</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="removeNodeFromQueue" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- GetNodeLoad Options --> - <bean id="getNodeLoad" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="load" /> - <property name="longOption" value="getNodeLoad" /> - <property name="description" value="Triggers getNodeLoad Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>getNodeLoad</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getNodeLoad" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- SubmitJob Options --> - <bean id="submitJob" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="submit" /> - <property name="longOption" value="submitJob" /> - <property name="description" value="Triggers submitJob Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>submitJob</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="submitJob" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <bean id="def" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="d" /> - <property name="longOption" value="def" /> - <property name="description" value="Job Definition File" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="xml-file" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="submitJob" p:relation="REQUIRED" /> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler"> - <property name="applyToActions"> - <list> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="submitJob" p:methodName="setJobDefinitionFile" /> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="nodeUrl" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="nu" /> - <property name="longOption" value="nodeUrl" /> - <property name="description" value="Node URL" /> - <property name="type" value="java.net.URL" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="url" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="submitJob" p:relation="OPTIONAL" /> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler"> - <property name="applyToActions"> - <list> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="submitJob" p:methodName="setUrl" /> - </list> - </property> - </bean> - </property> - </bean> - - <!-- GetJobInfo Options --> - <bean id="getJobInfo" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="info" /> - <property name="longOption" value="getJobInfo" /> - <property name="description" value="Triggers getJobInfo Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>getJobInfo</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getJobInfo" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- Kill Options --> - <bean id="kill" class="org.apache.oodt.cas.cli.option.ActionCmdLineOption" - p:isSubOption="true"> - <property name="shortOption" value="k" /> - <property name="longOption" value="kill" /> - <property name="description" value="Triggers kill Action" /> - <property name="hasArgs" value="false" /> - <property name="staticArgs"> - <list> - <value>kill</value> - </list> - </property> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="kill" p:relation="REQUIRED" /> - </list> - </property> - </bean> - - <!-- Options used for multiple Actions --> - <bean id="nodeId" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="nid" /> - <property name="longOption" value="nodeId" /> - <property name="description" value="Node ID" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="node-id" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getNodeById" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addNode" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="removeNode" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="setNodeCapacity" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addNodeToQueue" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getQueuesWithNode" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="removeNodeFromQueue" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getNodeLoad" p:relation="REQUIRED" /> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" /> - </property> - </bean> - - <bean id="capacity" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="cap" /> - <property name="longOption" value="capacity" /> - <property name="description" value="Node Capacity" /> - <property name="type" value="int" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="capacity" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addNode" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="setNodeCapacity" p:relation="REQUIRED" /> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" /> - </property> - </bean> - - <bean id="queueName" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="qn" /> - <property name="longOption" value="queueName" /> - <property name="description" value="Queue name" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="queue-name" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addQueue" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="removeQueue" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="addNodeToQueue" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getNodesInQueue" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="removeNodeFromQueue" p:relation="REQUIRED" /> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" /> - </property> - </bean> - - <bean id="jobId" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="jid" /> - <property name="longOption" value="jobId" /> - <property name="description" value="Job ID" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="job-id" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getJobInfo" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="getExecNode" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="kill" p:relation="REQUIRED" /> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler" /> - </property> - </bean> -</beans> 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 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE 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. ---> -<cas:job xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas" id="abcd" - name="TestJob"> - <instanceClass - name="org.apache.oodt.cas.resource.examples.HelloWorldJob" /> - <inputClass - name="org.apache.oodt.cas.resource.structs.NameValueJobInput"> - <properties> - <property name="user.name" value="Homer!" /> - </properties> - </inputClass> - <queue>quick</queue> - <load>1</load> -</cas:job> 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 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE 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. ---> -<cas:job xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas" id="abcd" - name="TestJob"> - <instanceClass - name="org.apache.oodt.cas.resource.examples.LongJob" /> - <inputClass - name="org.apache.oodt.cas.resource.structs.NameValueJobInput"> - <properties> - <property name="wait" value="60" /> - </properties> - </inputClass> - <queue>quick</queue> - <load>1</load> -</cas:job> 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 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- -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. ---> -<cas:node-to-queue-mapping xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"> - <node id="localhost"> - <queues> - <queue name="high"/> - <queue name="quick"/> - <queue name="long"/> - </queues> - </node> -</cas:node-to-queue-mapping> 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 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- -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. ---> -<cas:resourcenodes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"> - <node nodeId="localhost" ip="http://localhost:2001" capacity="8"/> - <!-- EnvReplace Example - <node nodeId="somehost" ip="http://somehost:[BATCH_STUB_PORT]" capacity="8" envReplace="true"/> - --> -</cas:resourcenodes> 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 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE 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. + --> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> + + <bean id="filemgr-config-publisher" class="org.apache.oodt.config.distributed.DistributedConfigurationPublisher"> + <constructor-arg value="FILE_MANAGER"/> + <property name="propertiesFiles"> + <map key-type="java.lang.String" value-type="java.lang.String"> + <entry key="target/resources/examples/filemgr/filemgr.properties" value="/etc/filemgr.properties"/> + <entry key="target/resources/examples/filemgr/logging.properties" value="/etc/logging.properties"/> + </map> + </property> + <property name="configFiles"> + <map key-type="java.lang.String" value-type="java.lang.String"> + <!-- Examples - Core--> + <entry key="target/resources/examples/filemgr/core/elements.xml" value="/policy/core/elements.xml"/> + <entry key="target/resources/examples/filemgr/core/product-types.xml" value="/policy/core/product-types.xml"/> + <entry key="target/resources/examples/filemgr/core/product-type-element-map.xml" value="/policy/core/product-type-element-map.xml"/> + + <!-- Examples - Geo--> + <entry key="target/resources/examples/filemgr/geo/elements.xml" value="/policy/geo/elements.xml"/> + <entry key="target/resources/examples/filemgr/geo/product-types.xml" value="/policy/geo/product-types.xml"/> + <entry key="target/resources/examples/filemgr/geo/product-type-element-map.xml" value="/policy/geo/product-type-element-map.xml"/> + + <!-- Examples - Trace--> + <entry key="target/resources/examples/filemgr/trace/elements.xml" value="/policy/trace/elements.xml"/> + <entry key="target/resources/examples/filemgr/trace/product-types.xml" value="/policy/trace/product-types.xml"/> + <entry key="target/resources/examples/filemgr/trace/product-type-element-map.xml" value="/policy/trace/product-type-element-map.xml"/> + </map> + </property> + </bean> + + <bean id="resmgr-config-publisher" class="org.apache.oodt.config.distributed.DistributedConfigurationPublisher"> + <constructor-arg value="RESOURCE_MANAGER"/> + <property name="propertiesFiles"> + <map key-type="java.lang.String" value-type="java.lang.String"> + <entry key="target/resources/examples/resmgr/resource.properties" value="/etc/resource.properties"/> + <entry key="target/resources/examples/resmgr/logging.properties" value="/etc/logging.properties"/> + </map> + </property> + <property name="configFiles"> + <map key-type="java.lang.String" value-type="java.lang.String"> + <entry key="target/resources/examples/resmgr/node-to-queue-mapping.xml" value="/policy/node-to-queue-mapping.xml"/> + <entry key="target/resources/examples/resmgr/nodes.xml" value="/policy/nodes.xml"/> + <entry key="target/resources/examples/resmgr/queue-to-backend-mapping.xml" value="/policy/queue-to-backend-mapping.xml"/> + + <entry key="target/resources/examples/resmgr/jobs/exJob.xml" value="/policy/jobs/exJob.xml"/> + <entry key="target/resources/examples/resmgr/jobs/exLongJob.xml" value="/policy/jobs/exLongJob.xml"/> + <entry key="target/resources/examples/resmgr/jobs/exPalindrome.xml" value="/policy/jobs/exPalindrome.xml"/> + <entry key="target/resources/examples/resmgr/jobs/exSparkJob.xml" value="/policy/jobs/exSparkJob.xml"/> + <entry key="target/resources/examples/resmgr/jobs/exSparkPalindrome.xml" value="/policy/jobs/exSparkPalindrome.xml"/> + <entry key="target/resources/examples/resmgr/jobs/exStreamingPalindrome.xml" value="/policy/jobs/exStreamingPalindrome.xml"/> + </map> + </property> + </bean> + +</beans> \ 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 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE 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. - --> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - - <bean id="filemgr-config-publisher" class="org.apache.oodt.config.distributed.DistributedConfigurationPublisher"> - <constructor-arg value="FILE_MANAGER"/> - <property name="propertiesFiles"> - <map key-type="java.lang.String" value-type="java.lang.String"> - <entry key="src/main/resources/examples/filemgr/filemgr.properties" value="/etc/filemgr.properties"/> - </map> - </property> - <property name="configFiles"> - <map key-type="java.lang.String" value-type="java.lang.String"> - <entry key="src/main/resources/examples/filemgr/mime-types.xml" value="/etc/mime-types.xml"/> - <entry key="src/main/resources/examples/filemgr/cmd-line-actions.xml" value="/policy/cmd-line-actions.xml"/> - <entry key="src/main/resources/examples/filemgr/cmd-line-options.xml" value="/policy/cmd-line-options.xml"/> - <entry key="src/main/resources/examples/filemgr/oodt/elements.xml" value="/policy/oodt/elements.xml"/> - <entry key="src/main/resources/examples/filemgr/oodt/product-types.xml" value="/policy/oodt/product-types.xml"/> - <entry key="src/main/resources/examples/filemgr/oodt/product-type-element-map.xml" value="/policy/oodt/product-type-element-map.xml"/> - </map> - </property> - </bean> - - <bean id="resmgr-config-publisher" class="org.apache.oodt.config.distributed.DistributedConfigurationPublisher"> - <constructor-arg value="RESOURCE_MANAGER"/> - <property name="propertiesFiles"> - <map key-type="java.lang.String" value-type="java.lang.String"> - <entry key="src/main/resources/examples/resmgr/resource.properties" value="/etc/resource.properties"/> - <entry key="src/main/resources/examples/resmgr/logging.properties" value="/etc/logging.properties"/> - </map> - </property> - <property name="configFiles"> - <map key-type="java.lang.String" value-type="java.lang.String"> - <entry key="src/main/resources/examples/resmgr/cmd-line-actions.xml" value="/policy/cmd-line-actions.xml"/> - <entry key="src/main/resources/examples/resmgr/cmd-line-options.xml" value="/policy/cmd-line-options.xml"/> - <entry key="src/main/resources/examples/resmgr/nodes.xml" value="/policy/nodes.xml"/> - <entry key="src/main/resources/examples/resmgr/node-to-queue-mapping.xml" value="/policy/node-to-queue-mapping.xml"/> - <entry key="src/main/resources/examples/resmgr/jobs/exJob.xml" value="/policy/jobs/exJob.xml"/> - <entry key="src/main/resources/examples/resmgr/jobs/exLongJob.xml" value="/policy/jobs/exLongJob.xml"/> - </map> - </property> - </bean> - -</beans> \ No newline at end of file