diff --git a/hcatalog/bin/templeton.cmd b/hcatalog/bin/templeton.cmd new file mode 100644 index 0000000..dcb976e --- /dev/null +++ b/hcatalog/bin/templeton.cmd @@ -0,0 +1,86 @@ +@rem Licensed to the Apache Software Foundation (ASF) under one +@rem or more contributor license agreements. See the NOTICE file +@rem distributed with this work for additional information +@rem regarding copyright ownership. The ASF licenses this file +@rem to you under the Apache License, Version 2.0 (the +@rem "License"); you may not use this file except in compliance +@rem with the License. You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, +@rem software distributed under the License is distributed on an +@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@rem KIND, either express or implied. See the License for the +@rem specific language governing permissions and limitations +@rem under the License. +@echo off + +setlocal enabledelayedexpansion + +:main + if "%1" == "--service" ( + set service_entry=true + shift + ) + + @rem Init hadoop env variables (CLASSPATH, HADOOP_OPTS, etc) + set HADOOP_OPTS= + call %HADOOP_HOME%\bin\hadoop-config.cmd + + set templeton-service-name=%1 + + if not defined templeton-service-name ( + goto print_usage + ) + + @rem + @rem Compute the classpath + @rem + set TEMPLETON_CONF_DIR=%HCATALOG_HOME%\conf + set TEMPLETON_CLASSPATH=%TEMPLETON_CONF_DIR%;%HCATALOG_HOME%;%HCATALOG_HOME%\share\webhcat\svr + + set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\hcatalog\* + set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\webhcat\svr\* + set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\webhcat\svr\lib\* + + @rem TODO: append hcat classpath to the templeton classpath + @rem append hadoop classpath + set CLASSPATH=%TEMPLETON_CLASSPATH%;!CLASSPATH! + + @rem compute templeton ops + if not defined TEMPLETON_LOG_DIR ( + set TEMPLETON_LOG_DIR=%HCATALOG_HOME%\logs + ) + + if not defined TEMPLETON_LOG4J ( + @rem must be prefixed with file: otherwise config is not picked up + set TEMPLETON_LOG4J=file:%HCATALOG_HOME%\conf\webhcat-log4j.properties + ) + set TEMPLETON_OPTS=-Dtempleton.log.dir=%TEMPLETON_LOG_DIR% -Dlog4j.configuration=%TEMPLETON_LOG4J% %HADOOP_OPTS% + set arguments=%JAVA_HEAP_MAX% %TEMPLETON_OPTS% -classpath %CLASSPATH% org.apache.hcatalog.templeton.Main + + if defined service_entry ( + call :makeServiceXml %arguments% + ) else ( + goto print_usage + ) + +goto :eof + +:makeServiceXml + set arguments=%* + @echo ^ + @echo ^%templeton-service-name%^ + @echo ^%templeton-service-name%^ + @echo ^This service runs Apache Templeton^ + @echo ^%JAVA%^ + @echo ^%arguments%^ + @echo ^ + goto :eof + + :print_usage + @echo Usage: templeton --service SERVICENAME + @echo where SERVICENAME is name of the windows service xml + +endlocal diff --git a/hcatalog/build-support/checkstyle/apache_header.txt b/hcatalog/build-support/checkstyle/apache_header.txt index 718f9b5..d1baaae 100644 --- a/hcatalog/build-support/checkstyle/apache_header.txt +++ b/hcatalog/build-support/checkstyle/apache_header.txt @@ -1,19 +1,19 @@ ^#! ^<\?(xml|xml-stylesheet).*>$ ^\W*$ -\W*Licensed to the Apache Software Foundation \(ASF\) under one$ -\W*or more contributor license agreements. See the NOTICE file$ -\W*distributed with this work for additional information$ -\W*regarding copyright ownership. The ASF licenses this file$ -\W*to you under the Apache License, Version 2.0 \(the$ -\W*"License"\); you may not use this file except in compliance$ -\W*with the License. You may obtain a copy of the License at$ -\W*$ -\W*http://www.apache.org/licenses/LICENSE-2.0$ -\W*$ -\W*Unless required by applicable law or agreed to in writing,$ -\W*software distributed under the License is distributed on an$ -\W*"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$ -\W*KIND, either express or implied. See the License for the$ -\W*specific language governing permissions and limitations$ -\W*under the License.$ +.*? 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.$ diff --git a/hcatalog/build.xml b/hcatalog/build.xml index 94c31fc..484ab65 100644 --- a/hcatalog/build.xml +++ b/hcatalog/build.xml @@ -363,6 +363,7 @@ +