http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java deleted file mode 100644 index 61bf00b..0000000 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/util/SpringUtils.java +++ /dev/null @@ -1,54 +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. - */ -package org.apache.oodt.cas.catalog.util; - -import org.apache.oodt.cas.catalog.exception.CatalogException; -import org.apache.oodt.cas.catalog.system.Catalog; -import org.springframework.context.support.FileSystemXmlApplicationContext; - -import java.util.HashSet; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - - -/** - * @author bfoster - * @version $Revision$ - * - */ -public class SpringUtils { - - private static Logger LOG = Logger.getLogger(SpringUtils.class.getName()); - - public static HashSet<Catalog> loadCatalogs(String catalogBeanRepo) throws CatalogException { - FileSystemXmlApplicationContext appContext = new FileSystemXmlApplicationContext(catalogBeanRepo); - Map<String, Catalog> catalogsMap = appContext.getBeansOfType(Catalog.class); - HashSet<Catalog> catalogs = new HashSet<Catalog>(); - for (Map.Entry<String, Catalog> key : catalogsMap.entrySet()) { - Catalog curCatalog = key.getValue(); - LOG.log(Level.INFO, "Loading catalog configuration for Catalog: '" + curCatalog + "'"); - if (catalogs.contains(curCatalog)) { - throw new CatalogException("Catalog URN : '" + curCatalog + "' conflicts with another Catalog's URN. " - + "**NOTE: URNs are created based on the following rule: urn:<namespace>:<id or name (if set)>"); - } - catalogs.add(curCatalog); - } - return catalogs; - } - -}
http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/REMOVE.log ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/REMOVE.log b/catalog/src/main/resources/REMOVE.log deleted file mode 100644 index 4f706a1..0000000 --- a/catalog/src/main/resources/REMOVE.log +++ /dev/null @@ -1,19 +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. -########################################################################### - -You can remove this file. It was only included to ensure that the log directory for this -distribution was created on assembly. http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/logging.properties ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/logging.properties b/catalog/src/main/resources/logging.properties deleted file mode 100644 index 678a422..0000000 --- a/catalog/src/main/resources/logging.properties +++ /dev/null @@ -1,56 +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. -########################################################################### - -# 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_catalog%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 - -# control the underlying commons-httpclient transport layer for xmlrpc -org.apache.commons.httpclient.level = INFO -httpclient.wire.header.level = INFO -httpclient.wire.level = INFO - -# airs dom loggin -sun.rmi.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 -org.apache.oodt.cas.crawl.util.CasPropertyPlaceholderConfigurer.level = SEVERE -sun.net.level = SEVERE http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/oracle/create-transaction-id-map-table.sql ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/oracle/create-transaction-id-map-table.sql b/catalog/src/main/resources/oracle/create-transaction-id-map-table.sql deleted file mode 100644 index b5f0181..0000000 --- a/catalog/src/main/resources/oracle/create-transaction-id-map-table.sql +++ /dev/null @@ -1,29 +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. - -CREATE TABLE CatalogServiceMapper ( - CAT_SERV_TRANS_ID VARCHAR2(255) NOT NULL , - CAT_SERV_TRANS_FACTORY VARCHAR2(255) NOT NULL , - CAT_TRANS_ID VARCHAR2(255) NOT NULL , - CAT_TRANS_FACTORY VARCHAR2(255) NOT NULL , - CAT_TRANS_DATE VARCHAR2(255) NOT NULL , - CATALOG_ID VARCHAR2(255) NOT NULL -); - -CREATE INDEX CatalogServiceMapper_CSTId_idx ON CatalogServiceMapper(CAT_SERV_TRANS_ID); -CREATE INDEX CatalogServiceMapper_CTId_idx ON CatalogServiceMapper(CAT_TRANS_ID); -CREATE INDEX CatalogServiceMapper_CatId_idx ON CatalogServiceMapper(CATALOG_ID); - -EXIT; http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/oracle/create-transaction-index-table.sql ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/oracle/create-transaction-index-table.sql b/catalog/src/main/resources/oracle/create-transaction-index-table.sql deleted file mode 100644 index d89271d..0000000 --- a/catalog/src/main/resources/oracle/create-transaction-index-table.sql +++ /dev/null @@ -1,31 +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. - -CREATE TABLE transactions -( - transaction_id varchar2(256) NOT NULL, - transaction_date varchar2(256) NOT NULL -); - -CREATE TABLE transaction_terms -( - transaction_id varchar2(256) NOT NULL, - bucket_name varchar2(256) NOT NULL, - term_name varchar2(256) NOT NULL, - term_value varchar2(1000) NOT NULL -); - -CREATE INDEX transactions_transid_idx ON transactions(transaction_id); -CREATE INDEX transaction_terms_transid_idx ON transaction_terms(transaction_id); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/catserv-beans.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/catserv-beans.xml b/catalog/src/main/resources/policy/catserv-beans.xml deleted file mode 100644 index da9a6e0..0000000 --- a/catalog/src/main/resources/policy/catserv-beans.xml +++ /dev/null @@ -1,71 +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. ---> -<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.5.xsd";> - - <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor" /> - - <!-- Catalog Services --> - <bean id="CatalogServiceLocalFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.system.impl.CatalogServiceLocalFactory"> - <property name="transactionIdFactory" value="org.apache.oodt.cas.catalog.struct.impl.transaction.UuidTransactionIdFactory" /> - <property name="catalogRepositoryFactory" ref="SerializedCatalogRepositoryFactory" /> - <property name="ingestMapperFactory" ref="InMemoryIngestMapperFactory" /> - <property name="pluginStorageDir" value="${pcs.support.home}/cas-catalog/plugin-jars/" /> - <property name="restrictQueryPermissions" value="false" /> - <property name="restrictIngestPermissions" value="false" /> - <property name="oneCatalogFailsAllFail" value="true" /> - <property name="simplifyQueries" value="true" /> - <property name="disableIntersectingCrossCatalogQueries" value="false" /> - <property name="crossCatalogResultSortingThreshold" value="200" /> - </bean> - - <!-- Communication Channels --> - <bean id="XmlRpcServerFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelServerFactory"> - <property name="port" value="${catalog.port}" /> - <property name="catalogServiceFactory" ref="CatalogServiceLocalFactory" /> - </bean> - - <!-- Catalog Repositories --> - <bean id="SpringCatalogRepositoryFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.repository.SpringCatalogRepositoryFactory"> - <property name="catalogBeanRepo" value="${catalog.home}/policy/filemgr-catalog-beans.xml" /> - </bean> - <bean id="WorkflowManagerRepositoryFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.repository.SpringCatalogRepositoryFactory"> - <property name="catalogBeanRepo" value="${catalog.home}/policy/workflow-manager-beans.xml" /> - </bean> - <bean id="SerializedCatalogRepositoryFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.repository.SerializedCatalogRepositoryFactory"> - <property name="storageDir" value="${pcs.support.home}/cas-catalog/catalog-repo" /> - </bean> - - <!-- Mapper Indexes --> - <bean id="DataSourceIngestMapperFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.mapping.DataSourceIngestMapperFactory"> - <property name="jdbcUrl" value="jdbc:oracle:thin:@dew.jpl.nasa.gov:1521:npptest" /> - <property name="user" value="sa" /> - <property name="pass" value="" /> - <property name="driver" value="oracle.jdbc.driver.OracleDriver" /> - </bean> - <bean id="InMemoryIngestMapperFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.mapping.InMemoryIngestMapperFactory"> - <property name="jdbcUrl" value="jdbc:hsqldb:file:${pcs.support.home}/hsqldb;shutdown=true" /> - <property name="user" value="sa" /> - <property name="pass" value="" /> - <property name="driver" value="org.hsqldb.jdbcDriver" /> - <property name="tablesFile" value="${catalog.home}/policy/in-memory-ingest-mapper.sql" /> - </bean> - <bean id="MemoryBasedIngestMapperFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.mapping.MemoryBasedIngestMapperFactory" /> - -</beans> http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/catserv-client-action-beans.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/catserv-client-action-beans.xml b/catalog/src/main/resources/policy/catserv-client-action-beans.xml deleted file mode 100644 index bd767d5..0000000 --- a/catalog/src/main/resources/policy/catserv-client-action-beans.xml +++ /dev/null @@ -1,51 +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. ---> -<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.5.xsd";> - - <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/> - - <bean id="shutdown" class="org.apache.oodt.cas.catalog.server.action.ShutdownServerAction"> - <property name="description" value="Shuts down the server for which the given client connects"/> - </bean> - <bean id="query_all" class="org.apache.oodt.cas.catalog.server.action.QueryServerAction"> - <property name="description" value="Performs a un-paged query to the server which the given client connects"/> - </bean> - <bean id="reduced_query_all" class="org.apache.oodt.cas.catalog.server.action.ReducedQueryServerAction"> - <property name="description" value="Performs a un-paged query to the server which the given client connects"/> - </bean> - <bean id="query_paged" class="org.apache.oodt.cas.catalog.server.action.PagedQueryServerAction"> - <property name="description" value="Performs a paged query to the server which the given client connects"/> - </bean> - <bean id="reduced_query_paged" class="org.apache.oodt.cas.catalog.server.action.ReducedPagedQueryServerAction"> - <property name="description" value="Performs a paged query to the server which the given client connects"/> - </bean> - <bean id="load_catalogs" class="org.apache.oodt.cas.catalog.server.action.LoadCatalogsServerAction"> - <property name="description" value="Loads the catalogs from the given spring xml file into the server for which the given client connects"/> - </bean> - <bean id="load_catalog_repo" class="org.apache.oodt.cas.catalog.server.action.LoadCatalogRepositoryServerAction"> - <property name="description" value="Loads the catalogs from the given repository from the given spring xml file into the server for which the given client connects"/> - </bean> - <bean id="get_catalog_ids" class="org.apache.oodt.cas.catalog.server.action.GetSupportedCatalogIds"> - <property name="description" value="Gets a list of supported catalog ids from the server which the given client connects"/> - </bean> - -</beans> - http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/catserv-client-cmd-line-beans.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/catserv-client-cmd-line-beans.xml b/catalog/src/main/resources/policy/catserv-client-cmd-line-beans.xml deleted file mode 100644 index a07f191..0000000 --- a/catalog/src/main/resources/policy/catserv-client-cmd-line-beans.xml +++ /dev/null @@ -1,302 +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. ---> -<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.5.xsd";> - - <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/> - - <!-- CAS-Catalog Cmd-Line-Options --> - <bean id="action" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="a"/> - <property name="longOption" value="action"/> - <property name="description" value="The CatalogService Action Bean to run"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="bean id"/> - <property name="required" value="true"/> - </bean> - - <bean id="clientFactoryBeanId" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="cfb"/> - <property name="longOption" value="clientFactoryBeanId"/> - <property name="description" value="CatalogServiceClientFactory Bean Id"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="bean id"/> - <property name="required" value="true"/> - </bean> - - <bean id="query" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="q"/> - <property name="longOption" value="query"/> - <property name="description" value="CatalogService String Query"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="query"/> - <property name="requiredOptions"> - <list> - <bean class="org.apache.oodt.commons.option.required.RequiredOption"> - <property name="optionLongName" value="action"/> - <property name="requireAllValues" value="false"/> - <property name="optionValues"> - <list> - <value>query_all</value> - <value>reduced_query_all</value> - <value>query_paged</value> - <value>reduced_query_paged</value> - </list> - </property> - </bean> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler"> - <property name="applyToBeans"> - <list> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="query_all"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="reduced_query_all"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="query_paged"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="reduced_query_paged"/> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="pageSize" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="ps"/> - <property name="longOption" value="pageSize"/> - <property name="description" value="Paged Query PageSize"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="integer"/> - <property name="type" value="int"/> - <property name="requiredOptions"> - <list> - <bean class="org.apache.oodt.commons.option.required.RequiredOption"> - <property name="optionLongName" value="action"/> - <property name="requireAllValues" value="false"/> - <property name="optionValues"> - <list> - <value>query_paged</value> - <value>reduced_query_paged</value> - </list> - </property> - </bean> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler"> - <property name="applyToBeans"> - <list> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="query_paged"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="reduced_query_paged"/> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="pageNum" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="pn"/> - <property name="longOption" value="pageNum"/> - <property name="description" value="Paged Query PageNum"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="integer"/> - <property name="type" value="int"/> - <property name="requiredOptions"> - <list> - <bean class="org.apache.oodt.commons.option.required.RequiredOption"> - <property name="optionLongName" value="action"/> - <property name="requireAllValues" value="false"/> - <property name="optionValues"> - <list> - <value>query_paged</value> - <value>reduced_query_paged</value> - </list> - </property> - </bean> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler"> - <property name="applyToBeans"> - <list> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="query_paged"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="reduced_query_paged"/> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="reducedTerms" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="rt"/> - <property name="longOption" value="reducedTerms"/> - <property name="description" value="Term filter for query results"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="list"/> - <property name="type" value="java.util.List"/> - <property name="requiredOptions"> - <list> - <bean class="org.apache.oodt.commons.option.required.RequiredOption"> - <property name="optionLongName" value="action"/> - <property name="requireAllValues" value="false"/> - <property name="optionValues"> - <list> - <value>reduced_query_all</value> - <value>reduced_query_paged</value> - </list> - </property> - </bean> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler"> - <property name="applyToBeans"> - <list> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="reduced_query_all"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" - p:bean-ref="reduced_query_paged"/> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="beanId" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="bid"/> - <property name="longOption" value="beanId"/> - <property name="description" value="Spring Bean Id"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="bean id"/> - <property name="requiredOptions"> - <list> - <bean class="org.apache.oodt.commons.option.required.RequiredOption"> - <property name="optionLongName" value="action"/> - <property name="requireAllValues" value="false"/> - <property name="optionValues"> - <list> - <value>load_catalog_repo</value> - </list> - </property> - </bean> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler"> - <property name="applyToBeans"> - <list> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="load_catalog_repo"/> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="catalogIds" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="cid"/> - <property name="longOption" value="catalogIds"/> - <property name="description" value="List of Catalog IDs to query"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="catalog ids"/> - <property name="type" value="java.util.List"/> - <property name="handler"> - <bean class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler"> - <property name="applyToBeans"> - <list> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="query_all"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="reduced_query_all"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="query_paged"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="reduced_query_paged"/> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="beanRepo" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="br"/> - <property name="longOption" value="beanRepo"/> - <property name="description" value="Spring Bean XML File"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="file path"/> - <property name="requiredOptions"> - <list> - <bean class="org.apache.oodt.commons.option.required.RequiredOption"> - <property name="optionLongName" value="action"/> - <property name="requireAllValues" value="false"/> - <property name="optionValues"> - <list> - <value>load_catalogs</value> - <value>load_catalog_repo</value> - </list> - </property> - </bean> - </list> - </property> - <property name="handler"> - <bean class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler"> - <property name="applyToBeans"> - <list> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="load_catalogs"/> - <bean class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="load_catalog_repo"/> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="printSupportedActions" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="psa"/> - <property name="longOption" value="printSupportedActions"/> - <property name="description" value="Prints a list and description of all supported CatalogServiceServerActions"/> - <property name="hasArgs" value="false"/> - <property name="required" value="false"/> - <property name="performAndQuit" value="true"/> - <property name="handler"> - <bean class="org.apache.oodt.cas.catalog.server.option.PrintSupportedActionsHandler"> - <property name="beanRepo" value="/${catalog.home}/policy/catserv-client-config.xml"/> - </bean> - </property> - </bean> - - <bean id="printSupportedClients" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="psc"/> - <property name="longOption" value="printSupportedClients"/> - <property name="description" value="Prints a list and description of all supported CatalogServiceClientFactories"/> - <property name="hasArgs" value="false"/> - <property name="required" value="false"/> - <property name="performAndQuit" value="true"/> - <property name="handler"> - <bean class="org.apache.oodt.cas.catalog.server.option.PrintSupportedClientsHandler"> - <property name="beanRepo" value="/${catalog.home}/policy/catserv-client-config.xml"/> - </bean> - </property> - </bean> - -</beans> - - http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/catserv-client-config.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/catserv-client-config.xml b/catalog/src/main/resources/policy/catserv-client-config.xml deleted file mode 100644 index af0281a..0000000 --- a/catalog/src/main/resources/policy/catserv-client-config.xml +++ /dev/null @@ -1,29 +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. ---> -<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.5.xsd";> - - <import resource="catserv-properties.xml"/> - <import resource="catserv-beans.xml"/> - <import resource="catserv-client-action-beans.xml"/> - <import resource="catserv-client-cmd-line-beans.xml"/> - -</beans> - http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/catserv-properties.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/catserv-properties.xml b/catalog/src/main/resources/policy/catserv-properties.xml deleted file mode 100644 index a6b625c..0000000 --- a/catalog/src/main/resources/policy/catserv-properties.xml +++ /dev/null @@ -1,43 +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. ---> -<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.5.xsd";> - - <bean class="org.apache.oodt.cas.catalog.util.CasPropertyPlaceholderConfigurer"> - - <!-- Allow for system-level properties to override all properties below --> - <property name="systemPropertiesMode" value="2"/> - - <!-- Properties --> - <property name="properties"> - <props> - <prop key="catalog.url">[CATALOG_URL];http://localhost:10000</prop> - <prop key="catalog.port">[CATALOG_PORT];10000</prop> - <prop key="pcs.support.home">[PCS_SUPPORT_HOME];/tmp</prop> - <!--prop key="filemgr.home">[FILEMGR_HOME];/tmp</prop--> - <prop key="workflowmgr.home">[WORKFLOWMGR_HOME];/tmp</prop> - <prop key="catalog.home">[CATALOG_HOME];/tmp</prop> - </props> - </property> - - </bean> - -</beans> - http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/catserv-server-cmd-line-beans.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/catserv-server-cmd-line-beans.xml b/catalog/src/main/resources/policy/catserv-server-cmd-line-beans.xml deleted file mode 100644 index dd27395..0000000 --- a/catalog/src/main/resources/policy/catserv-server-cmd-line-beans.xml +++ /dev/null @@ -1,51 +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. ---> -<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.5.xsd";> - - <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor"/> - - <!-- CAS-Catalog Cmd-Line-Options --> - <bean id="serverFactoryBeanId" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="sfb"/> - <property name="longOption" value="serverFactoryBeanId"/> - <property name="description" value="CommunicationChannelServerFactory Bean Id"/> - <property name="hasArgs" value="true"/> - <property name="optionArgName" value="bean id"/> - <property name="required" value="true"/> - </bean> - - <bean id="printSupportedServers" class="org.apache.oodt.commons.option.CmdLineOption"> - <property name="shortOption" value="pss"/> - <property name="longOption" value="printSupportedServers"/> - <property name="description" value="Prints a list and description of all supported CommunicationChannelServerFactories"/> - <property name="hasArgs" value="false"/> - <property name="required" value="false"/> - <property name="performAndQuit" value="true"/> - <property name="handler"> - <bean class="org.apache.oodt.cas.catalog.server.option.PrintSupportedServersHandler"> - <property name="beanRepo" value="/${catalog.home}/policy/catserv-server-config.xml"/> - </bean> - </property> - </bean> - -</beans> - - http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/catserv-server-config.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/catserv-server-config.xml b/catalog/src/main/resources/policy/catserv-server-config.xml deleted file mode 100644 index c7f9292..0000000 --- a/catalog/src/main/resources/policy/catserv-server-config.xml +++ /dev/null @@ -1,28 +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. ---> -<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.5.xsd";> - - <import resource="catserv-properties.xml"/> - <import resource="catserv-beans.xml"/> - <import resource="catserv-server-cmd-line-beans.xml"/> - -</beans> - http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/cmd-line-actions.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/cmd-line-actions.xml b/catalog/src/main/resources/policy/cmd-line-actions.xml deleted file mode 100644 index 0316f88..0000000 --- a/catalog/src/main/resources/policy/cmd-line-actions.xml +++ /dev/null @@ -1,51 +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. ---> -<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.5.xsd";> - - <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor" /> - - <!-- Command Line Actions --> - <bean id="shutdown" class="org.apache.oodt.cas.catalog.cli.action.ShutdownCliAction"> - <property name="description" value="Shuts down the server for which the given client connects" /> - </bean> - <bean id="query_all" class="org.apache.oodt.cas.catalog.cli.action.QueryCliAction"> - <property name="description" value="Performs a un-paged query to the server which the given client connects" /> - </bean> - <bean id="reduced_query_all" class="org.apache.oodt.cas.catalog.cli.action.ReducedQueryCliAction"> - <property name="description" value="Performs a un-paged query to the server which the given client connects" /> - </bean> - <bean id="query_paged" class="org.apache.oodt.cas.catalog.cli.action.PagedQueryCliAction"> - <property name="description" value="Performs a paged query to the server which the given client connects" /> - </bean> - <bean id="reduced_query_paged" class="org.apache.oodt.cas.catalog.cli.action.ReducedPagedQueryCliAction"> - <property name="description" value="Performs a paged query to the server which the given client connects" /> - </bean> - <bean id="load_catalogs" class="org.apache.oodt.cas.catalog.cli.action.LoadCatalogsCliAction"> - <property name="description" value="Loads the catalogs from the given spring xml file into the server for which the given client connects" /> - </bean> - <bean id="load_catalog_repo" class="org.apache.oodt.cas.catalog.cli.action.LoadCatalogRepositoryCliAction"> - <property name="description" value="Loads the catalogs from the given repository from the given spring xml file into the server for which the given client connects" /> - </bean> - <bean id="get_catalog_ids" class="org.apache.oodt.cas.catalog.cli.action.GetSupportedCatalogIdsCliAction"> - <property name="description" value="Gets a list of supported catalog ids from the server which the given client connects" /> - </bean> - -</beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/cmd-line-options.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/cmd-line-options.xml b/catalog/src/main/resources/policy/cmd-line-options.xml deleted file mode 100644 index 28253ee..0000000 --- a/catalog/src/main/resources/policy/cmd-line-options.xml +++ /dev/null @@ -1,317 +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. ---> -<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.5.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="Server 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.catalog.url</value> - </list> - </property> - </bean> - </property> - <property name="validators"> - <list> - <bean class="org.apache.oodt.cas.cli.option.validator.ArgRegExpCmdLineOptionValidator"> - <property name="allowedArgs"> - <list> - <value>http://.*:\d*</value> - </list> - </property> - </bean> - </list> - </property> - </bean> - - <bean id="chunkSize" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="cs" /> - <property name="longOption" value="chunkSize" /> - <property name="description" value="XML-RPC data chunk size in bytes" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="int" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.chunkSize</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="requestTimeout" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="rqt" /> - <property name="longOption" value="requestTimeout" /> - <property name="description" value="XML-RPC request timeout in seconds" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="int" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.requestTimeout</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="connectionTimeout" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="ct" /> - <property name="longOption" value="connectionTimeout" /> - <property name="description" value="XML-RPC connection timeout in seconds" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="int" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.connectionTimeout</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="query" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="q" /> - <property name="longOption" value="query" /> - <property name="description" value="CatalogService String Query" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="query" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="query_all" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="reduced_query_all" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="query_paged" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="reduced_query_paged" 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="query_all" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="reduced_query_all" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="query_paged" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="reduced_query_paged" /> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="pageSize" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="ps" /> - <property name="longOption" value="pageSize" /> - <property name="description" value="Paged Query PageSize" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="integer" /> - <property name="type" value="int" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="query_paged" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="reduced_query_paged" 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="query_paged" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="reduced_query_paged" /> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="pageNum" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="pn" /> - <property name="longOption" value="pageNum" /> - <property name="description" value="Paged Query PageNum" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="integer" /> - <property name="type" value="int" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="query_paged" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="reduced_query_paged" 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="query_paged" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="reduced_query_paged" /> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="reducedTerms" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="rt" /> - <property name="longOption" value="reducedTerms" /> - <property name="description" value="Term filter for query results" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="list" /> - <property name="type" value="java.util.List" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="reduced_query_all" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="reduced_query_paged" 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="reduced_query_all" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="reduced_query_paged" /> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="catalogRepositoryId" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="crid" /> - <property name="longOption" value="catalogRepositoryId" /> - <property name="description" value="CatalogRepository Spring Bean Id" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="bean id" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="load_catalog_repo" 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="load_catalog_repo" /> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="catalogIds" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="cid" /> - <property name="longOption" value="catalogIds" /> - <property name="description" value="List of Catalog IDs to query" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="catalog ids" /> - <property name="type" value="java.util.List" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="query_all" p:relation="OPTIONAL" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="reduced_query_all" p:relation="OPTIONAL" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="query_paged" p:relation="OPTIONAL" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="reduced_query_paged" 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="query_all" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="reduced_query_all" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="query_paged" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="reduced_query_paged" /> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="beanRepo" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="br" /> - <property name="longOption" value="beanRepo" /> - <property name="description" value="Spring Bean XML File" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="file path" /> - <property name="requirementRules"> - <list> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="load_catalogs" p:relation="REQUIRED" /> - <bean class="org.apache.oodt.cas.cli.option.require.ActionDependencyRule" - p:actionName="load_catalog_repo" 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="load_catalogs" /> - <bean class="org.apache.oodt.cas.cli.option.handler.ApplyToAction" - p:actionName="load_catalog_repo" /> - </list> - </property> - </bean> - </property> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/cmd-line-server-actions.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/cmd-line-server-actions.xml b/catalog/src/main/resources/policy/cmd-line-server-actions.xml deleted file mode 100644 index 3c835ea..0000000 --- a/catalog/src/main/resources/policy/cmd-line-server-actions.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. ---> -<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.5.xsd";> - - <bean class="org.apache.oodt.commons.spring.postprocessor.SetIdBeanPostProcessor" /> - - <!-- Command Line Actions --> - <bean id="launchXmlRpcServer" class="org.apache.oodt.cas.catalog.server.cli.action.LaunchXmlRpcServerCliAction"> - <property name="description" value="Brings up a Catalog Service behind an XML-RPC server" /> - </bean> - -</beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/cmd-line-server-options.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/cmd-line-server-options.xml b/catalog/src/main/resources/policy/cmd-line-server-options.xml deleted file mode 100644 index 0f8b139..0000000 --- a/catalog/src/main/resources/policy/cmd-line-server-options.xml +++ /dev/null @@ -1,207 +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. ---> -<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.5.xsd";> - - <bean id="port" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="p" /> - <property name="longOption" value="port" /> - <property name="description" value="Port number to bring up server on" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="int" /> - <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.catalog.port</value> - </list> - </property> - </bean> - </property> - <property name="validators"> - <list> - <bean class="org.apache.oodt.cas.cli.option.validator.ArgRegExpCmdLineOptionValidator"> - <property name="allowedArgs"> - <list> - <value>\d+</value> - </list> - </property> - </bean> - </list> - </property> - </bean> - - <bean id="transactionIdFactory" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="tidf" /> - <property name="longOption" value="transactionIdFactory" /> - <property name="description" value="TransactionIdFactory classpath" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="classpath" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.transactionid</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="repositoryFactory" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="rf" /> - <property name="longOption" value="repositoryFactory" /> - <property name="description" value="CatalogRepositoryFactory classpath" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="classpath" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.repository</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="ingestMapperFactory" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="imf" /> - <property name="longOption" value="ingestMapperFactory" /> - <property name="description" value="IngestMapperFactory classpath" /> - <property name="hasArgs" value="true" /> - <property name="argsDescription" value="int" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.ingestmapper</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="restrictQueries" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="rq" /> - <property name="longOption" value="restrictQueries" /> - <property name="description" value="Restrict query permissions" /> - <property name="hasArgs" value="false" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.restrict.query.permissions</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="restrictIngest" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="ri" /> - <property name="longOption" value="restrictIngest" /> - <property name="description" value="Restrict ingest permissions" /> - <property name="hasArgs" value="false" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.restrict.ingest.permissions</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="oneCatalogFailsAllFail" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="ofaf" /> - <property name="longOption" value="oneCatalogFailsAllFail" /> - <property name="description" value="" /> - <property name="hasArgs" value="false" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.oneCatalogFailsAllFail</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="simplifyQuery" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="sq" /> - <property name="longOption" value="simplifyQuery" /> - <property name="description" value="Will optimize your query if true" /> - <property name="hasArgs" value="false" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.simplifyQueries</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="disableCrossCatalogJoins" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="dccj" /> - <property name="longOption" value="disableCrossCatalogJoins" /> - <property name="description" value="Will disable queries from joining metadata that has been split across multiple catalogs" /> - <property name="hasArgs" value="false" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.disableIntersectingCrossCatalogQueries</value> - </list> - </property> - </bean> - </property> - </bean> - - <bean id="sortingThreshold" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption"> - <property name="shortOption" value="st" /> - <property name="longOption" value="sortingThreshold" /> - <property name="description" value="Threshold of query results at which sorting is turned off so query return time can be optimized" /> - <property name="hasArgs" value="false" /> - <property name="required" value="false" /> - <property name="handler"> - <bean class="org.apache.oodt.cas.cli.option.handler.SetJavaPropertiesHandler"> - <property name="propertyNames"> - <list> - <value>org.apache.oodt.cas.catalog.crossCatalogResultSortingThreshold</value> - </list> - </property> - </bean> - </property> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/in-memory-index-cat.sql ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/in-memory-index-cat.sql b/catalog/src/main/resources/policy/in-memory-index-cat.sql deleted file mode 100644 index fbbd46e..0000000 --- a/catalog/src/main/resources/policy/in-memory-index-cat.sql +++ /dev/null @@ -1,32 +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. - -DROP TABLE transactions IF EXISTS; -DROP TABLE transaction_terms IF EXISTS; - -CREATE TABLE transactions -( - transaction_id varchar(256) NOT NULL, - transaction_date varchar(256) NOT NULL -); - -CREATE TABLE transaction_terms -( - transaction_id varchar(256) NOT NULL, - bucket_name varchar(256) NOT NULL, - term_name varchar(256) NOT NULL, - term_value varchar(1000) NOT NULL -); - http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/in-memory-ingest-mapper.sql ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/in-memory-ingest-mapper.sql b/catalog/src/main/resources/policy/in-memory-ingest-mapper.sql deleted file mode 100644 index 571a36e..0000000 --- a/catalog/src/main/resources/policy/in-memory-ingest-mapper.sql +++ /dev/null @@ -1,26 +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. - -DROP TABLE CatalogServiceMapper IF EXISTS; - -CREATE TABLE CatalogServiceMapper ( - CAT_SERV_TRANS_ID VARCHAR(255) NOT NULL , - CAT_SERV_TRANS_FACTORY VARCHAR(255) NOT NULL , - CAT_TRANS_ID VARCHAR(255) NOT NULL , - CAT_TRANS_FACTORY VARCHAR(255) NOT NULL , - CAT_TRANS_DATE VARCHAR(255) NOT NULL , - CATALOG_ID VARCHAR(255) NOT NULL -); - http://git-wip-us.apache.org/repos/asf/oodt/blob/098cc4fa/catalog/src/main/resources/policy/workflow-catalog-beans.xml ---------------------------------------------------------------------- diff --git a/catalog/src/main/resources/policy/workflow-catalog-beans.xml b/catalog/src/main/resources/policy/workflow-catalog-beans.xml deleted file mode 100644 index b641b8d..0000000 --- a/catalog/src/main/resources/policy/workflow-catalog-beans.xml +++ /dev/null @@ -1,56 +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. ---> -<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.5.xsd";> - - <bean id="WorkflowManagerCatalog" factory-bean="WorkflowManagerCatalogFactory" factory-method="createCatalog"/> - <bean id="WorkflowManagerCatalogFactory" class="org.apache.oodt.cas.catalog.system.CatalogFactory"> - <property name="catalogId" value="urn:PEATE:WorkflowInstancesCatalog"/> - <property name="indexFactory" ref="WorkflowManagerDataSourceIndexFactory"/> - <property name="dictionaryFactories"> - <list> - <ref bean="WorkflowManagerDictionaryFactory"/> - </list> - </property> - <property name="restrictQueryPermissions" value="false"/> - <property name="restrictIngestPermissions" value="false"/> - </bean> - - <!-- WorkflowManager Indexes --> - <bean id="WorkflowManagerDataSourceIndexFactory" class="org.apache.oodt.cas.catalog.struct.impl.index.WorkflowManagerDataSourceIndexFactory"> - <property name="jdbcUrl" value="jdbc:oracle:thin:@dew.jpl.nasa.gov:1521:npptest"/> - <property name="user" value="nppint"/> - <property name="pass" value="Peate"/> - <property name="driver" value="oracle.jdbc.driver.OracleDriver"/> - </bean> - <bean id="InMemoryIndexFactory" class="org.apache.oodt.cas.catalog.struct.impl.index.InMemoryIndexFactory"> - <property name="jdbcUrl" value="jdbc:hsqldb:file:${pcs.support.home}/hsqldb;shutdown=true"/> - <property name="user" value="sa"/> - <property name="pass" value=""/> - <property name="driver" value="org.hsqldb.jdbcDriver"/> - <property name="tablesFile" value="${workflowmgr.home}/policy/in-memory-index-cat.sql"/> - </bean> - - <!-- WorkflowManager Dictionary --> - <bean id="WorkflowManagerDictionaryFactory" class="org.apache.oodt.cas.catalog.struct.impl.dictionary.WorkflowManagerDictionaryFactory"/> - -</beans> - -
