OOZIE-2836 Remove .ps1 and .cmd windows scripts (kmarton via asalamon74)
diff --git a/core/src/main/conf/oozie-env.cmd b/core/src/main/conf/oozie-env.cmd
deleted file mode 100644
index 0238cb6..0000000
--- a/core/src/main/conf/oozie-env.cmd
+++ /dev/null
@@ -1,67 +0,0 @@
-@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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@rem Set Oozie specific environment variables here.
-
-@rem Settings for the Embedded Jetty that runs Oozie
-@rem Java System properties for Oozie should be specified in this variable
-@rem
-set CATALINA_OPTS=%CATALINA_OPTS% -Xmx1024m
-
-@rem Oozie configuration file to load from Oozie configuration directory
-@rem
-@rem set OOZIE_CONFIG_FILE=oozie-site.xml
-
-@rem Oozie logs directory
-@rem
-@rem set OOZIE_LOG=%OOZIE_HOME%\logs
-
-@rem Oozie Log4J configuration file to load from Oozie configuration directory
-@rem
-@rem set OOZIE_LOG4J_FILE=oozie-log4j.properties
-
-@rem Reload interval of the Log4J configuration file, in seconds
-@rem
-@rem set OOZIE_LOG4J_RELOAD=10
-
-@rem The port Oozie server runs
-@rem
-@rem set OOZIE_HTTP_PORT=11000
-
-@rem The port Oozie server runs if using SSL (HTTPS)
-@rem
-@rem export OOZIE_HTTPS_PORT=11443
-
-@rem The host name Oozie server runs on
-@rem
-@rem set OOZIE_HTTP_HOSTNAME=%COMPUTERNAME%
-
-@rem The base URL for callback URLs to Oozie
-@rem
-@rem set OOZIE_BASE_URL=http://%OOZIE_HTTP_HOSTNAME%:%OOZIE_HTTP_PORT%/oozie
-
-@rem The location of the keystore for the Oozie server if using SSL (HTTPS)
-@rem
-@rem set OOZIE_HTTPS_KEYSTORE_FILE=%HOME%/.keystore
-
-@rem The password of the keystore for the Oozie server if using SSL (HTTPS)
-@rem
-@rem set OOZIE_HTTPS_KEYSTORE_PASS=password
-
-@rem The Oozie Instance ID
-@rem
-@rem set OOZIE_INSTANCE_ID=%OOZIE_HTTP_HOSTNAME%
\ No newline at end of file
diff --git a/distro/src/main/bin/oozie-setup.cmd b/distro/src/main/bin/oozie-setup.cmd
deleted file mode 100644
index 295b981..0000000
--- a/distro/src/main/bin/oozie-setup.cmd
+++ /dev/null
@@ -1,18 +0,0 @@
-@rem echo off
-@rem Licensed to the Apache Software Foundation (ASF) under one or more
-@rem contributor license agreements. See the NOTICE file distributed with
-@rem this work for additional information regarding copyright ownership.
-@rem The ASF licenses this file to You under the Apache License, Version 2.0
-@rem (the "License"); you may not use this file except in compliance with
-@rem 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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-powershell.exe -NoProfile -InputFormat none -ExecutionPolicy unrestricted -File %~dp0oozie-setup.ps1 %*
-goto :eof
diff --git a/distro/src/main/bin/oozie-setup.ps1 b/distro/src/main/bin/oozie-setup.ps1
deleted file mode 100644
index 7446230..0000000
--- a/distro/src/main/bin/oozie-setup.ps1
+++ /dev/null
@@ -1,206 +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.
-
-param(
-[Parameter(Mandatory=$true,Position = 0)] [string] $Command="",
-[string] $D="",
-[switch] $Secure,
-[Parameter(ValueFromRemainingArguments = $true)][string[]]$args)
-
-# FUNCTIONS
-
-Function PrintUsage { param ()
- Write-Output "Usage : oozie-setup.ps1 COMMAND [OPTIONS]"
- Write-Output " prepare-war [-d directory] [-secure] (-d identifies an alternative directory for processing jars"
- Write-Output " -secure will configure the war file to use HTTPS (SSL))"
- Write-Output " sharelib create -fs FS_URI [-locallib SHARED_LIBRARY] [-concurrency CONCURRENCY]"
- Write-Output " (create sharelib for oozie,"
- Write-Output " FS_URI is the fs.default.name"
- Write-Output " for hdfs uri; SHARED_LIBRARY, path to the"
- Write-Output " Oozie sharelib to install, it can be a tarball"
- Write-Output " or an expanded version of it. If ommited,"
- Write-Output " the Oozie sharelib tarball from the Oozie"
- Write-Output " installation directory will be used."
- Write-Output " CONCURRENCY is a number of threads to be used"
- Write-Output " for copy operations."
- Write-Output " By default 1 thread will be used)"
- Write-Output " (action failes if sharelib is already installed"
- Write-Output " in HDFS)"
- Write-Output " sharelib upgrade -fs FS_URI [-locallib SHARED_LIBRARY] ([deprecated]"
- Write-Output " [use create command to create new version]"
- Write-Output " upgrade existing sharelib, fails if there"
- Write-Output " is no existing sharelib installed in HDFS)"
- Write-Output " db create|upgrade|postupgrade -run [-sqlfile <FILE>] (create, upgrade or postupgrade oozie db with an"
- Write-Output " optional sql File)"
- Write-Output " EXTJS can be downloaded from http://www.extjs.com/learn/Ext_Version_Archives"
-}
-
-function Expand-ZIPFile($file, $destination){
- $shell = new-object -com shell.application
- $zip = $shell.NameSpace($file)
- foreach($item in $zip.items()){
- $shell.Namespace($destination).copyhere($item)
- }
-}
-
-# MAIN()
-
-# The script will terminate if any steps fail
-$ErrorActionPreference = "Stop"
-
-# Constants
-$EXT_SUBDIR = "ext-2.2"
-$OOZIE_HOME = (Split-Path $MyInvocation.MyCommand.Path) + "\.."
-$OOZIE_HOME = Resolve-Path $OOZIE_HOME
-
-$CATALINA_BASE = ""
-if ($env:CATALINA_BASE){
- $CATALINA_BASE = "$env:CATALINA_BASE"
-}else{
- $CATALINA_BASE = "$OOZIE_HOME\oozie-server"
-}
-
-# Finds JAR.EXE and Java
-$JAR_EXE=""
-$JAVA_BIN=""
-if ($env:JAVA_HOME) {
- $JAR_EXE = "$env:JAVA_HOME\bin\jar.exe"
- $JAVA_BIN = "$env:JAVA_HOME\bin\java.exe"
-} else {
- Write-Output "WARN: JAVA_HOME not defined. oozie-setup.ps1 will relay on the PATH environment variable to use JAR.exe"
- $JAR_EXE = "jar.exe"
- $JAVA_BIN = "java.exe"
-}
-
-if (($Command -eq "sharelib") -Or ($Command -eq "db") -Or ($Command -eq "import") -Or ($Command -eq "export")) {
- $OOZIE_OPTS="-Doozie.home.dir=$OOZIE_HOME";
- $OOZIE_OPTS="$OOZIE_OPTS -Doozie.config.dir=$OOZIE_HOME\conf";
- $OOZIE_OPTS="$OOZIE_OPTS -Doozie.log.dir=$OOZIE_HOME\log";
- $OOZIE_OPTS="$OOZIE_OPTS -Doozie.data.dir=$OOZIE_HOME\data";
- $OOZIE_OPTS="$OOZIE_OPTS -Dderby.stream.error.file=$OOZIE_HOME\log\derby.log"
-
- $OOZIECPPATH=""
- $OOZIECPPATH="$OOZIE_HOME\libtools\*;$OOZIE_HOME\lib\*;$OOZIE_HOME\..\extra_libs\*"
-
- $COMMAND_OPTS=[string]$args
-
- if ($Command -eq "sharelib") {
- Start-Process $JAVA_BIN -ArgumentList "$OOZIE_OPTS -cp $OOZIECPPATH org.apache.oozie.tools.OozieSharelibCLI $COMMAND_OPTS" -Wait -NoNewWindow
- } elseif ($Command -eq "db") {
- Start-Process $JAVA_BIN -ArgumentList "$OOZIE_OPTS -cp $OOZIECPPATH org.apache.oozie.tools.OozieDBCLI $COMMAND_OPTS" -Wait -NoNewWindow
- } elseif ($Command -eq "export"){
- Start-Process $JAVA_BIN -ArgumentList "$OOZIE_OPTS -cp $OOZIECPPATH org.apache.oozie.tools.OozieDBExportCLI $COMMAND_OPTS" -Wait -NoNewWindow
- } elseif ($Command -eq "import"){
- Start-Process $JAVA_BIN -ArgumentList "$OOZIE_OPTS -cp $OOZIECPPATH org.apache.oozie.tools.OozieDBImportCLI $COMMAND_OPTS" -Wait -NoNewWindow
- }
- exit 0
-}elseif ($Command -eq "prepare-war"){
-
- $InputWar = "$OOZIE_HOME\oozie.war"
- $OutputWar = "$OOZIE_HOME\oozie-server\webapps\oozie.war"
- $SecureConfigsDir="$CATALINA_BASE\conf\ssl"
- $ExtraLibs = Resolve-Path "$OOZIE_HOME\..\extra_libs"
- $EXTJS = "$ExtraLibs\ext-2.2.zip"
-
- # Validates the input\output wars
- if (!(Test-Path $InputWar)){
- PrintUsage
- throw "Path '$InputWar' doesn't exist"
- }
- if (!$InputWar.ToLower().EndsWith(".war")){
- PrintUsage
- throw "Invalid input war file '$InputWar'"
- }
- if (!$OutputWar.ToLower().EndsWith(".war")){
- PrintUsage
- throw "Invalid input war file '$OutputWar'"
- }
- if ($OutputWar -ieq $InputWar){
- PrintUsage
- throw "Invalid output\input war file. Both parameters cannot be the same file"
- }
- # Deletes previous output wars.
- if (Test-Path $OutputWar){
- Write-Output "Deleting existing output .war '$OutputWar'"
- Remove-Item -Force -Path $OutputWar
- }
-
- # Selects\Creates the temp directory
- $OOZIE_TEMP = "$OOZIE_HOME\temp"
- $OOZIE_WEB_INF_LIB = "$OOZIE_TEMP\WEB-INF\lib"
-
- Write-Output "Creating OOZIE_TEMP directory '$OOZIE_TEMP'"
- if (Test-Path "$OOZIE_TEMP") { Remove-Item "$OOZIE_TEMP" -Force -Recurse }
- $x = New-Item "$OOZIE_TEMP" -type directory
-
- # Extract the InputWar
- pushd $OOZIE_TEMP
- cmd /c $JAR_EXE xvf $InputWar
- if ($LASTEXITCODE -ne 0) {
- throw "Unable to execute 'jar xvf'. Error ($LASTEXITCODE)"
- }
- popd
- # Copy EXT_JS files
- if ((Test-Path $EXTJS)) {
- $EXTJS_HOME = "$ExtraLibs\ext-2.2"
-
- if (Test-Path "$EXTJS_HOME") { Remove-Item "$EXTJS_HOME" -Force -Recurse }
- $x = New-Item "$EXTJS_HOME" -type directory
-
- Expand-ZIPFile -File $EXTJS -Destination $EXTJS_HOME
- cp -r "$EXTJS_HOME\ext-2.2" "$OOZIE_TEMP"
- }else{
- Write-Output "INFO: Oozie webconsole disabled, ExtJS library not specified"
- }
-
- # Copy additional Jars
- if ($D -ne "") {
- $ExtraLibs = $D
- }
- Write-Output " Adding JarFiles: $ExtraLibs\*.jar"
- cp -r $ExtraLibs\*.jar $OOZIE_WEB_INF_LIB
-
- if ($Secure) {
- #Use the SSL version of server.xml in oozie-server
- if (Test-Path $SecureConfigsDir\ssl-server.xml){
- cp $SecureConfigsDir\ssl-server.xml $CATALINA_BASE\conf\server.xml
- }
-
- #Inject the SSL version of web.xml in oozie war
- if (Test-Path $SecureConfigsDir\ssl-web.xml){
- cp $SecureConfigsDir\ssl-web.xml $OOZIE_TEMP\WEB-INF\web.xml
- }
-
- Write-Output "INFO: Using secure server.xml and secure web.xml"
- }else{
- #Use the regular version of server.xml in oozie-server
- if (Test-Path $SecureConfigsDir\server.xml){
- cp $SecureConfigsDir\server.xml $CATALINA_BASE\conf\server.xml
- }
- #No need to restore web.xml because its already in the original WAR file
- }
-
- Write-Output "Recreating the new war file '$OutputWar'..."
-
- cmd /c $JAR_EXE cvf $OutputWar -C $OOZIE_TEMP '.'
- if ($LASTEXITCODE -ne 0) {
- throw "Unable to execute 'jar uvf'. Error ($LASTEXITCODE)"
- }
-
- Write-Output "Done! $counter files added"
-} else {
- PrintUsage
- exit -1
-}
diff --git a/distro/src/main/bin/oozie-sys.cmd b/distro/src/main/bin/oozie-sys.cmd
deleted file mode 100644
index e9c8100..0000000
--- a/distro/src/main/bin/oozie-sys.cmd
+++ /dev/null
@@ -1,177 +0,0 @@
-@rem echo off
-@rem Licensed to the Apache Software Foundation (ASF) under one or more
-@rem contributor license agreements. See the NOTICE file distributed with
-@rem this work for additional information regarding copyright ownership.
-@rem The ASF licenses this file to You under the Apache License, Version 2.0
-@rem (the "License"); you may not use this file except in compliance with
-@rem 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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@echo off
-
-set OOZIE_HOME=%~dp0..
-echo Setting OOZIE_HOME to '%OOZIE_HOME%'
-set oozie_home_tmp=%OOZIE_HOME%
-
-if not defined OOZIE_CONFIG (
- set OOZIE_CONFIG=%OOZIE_HOME%\conf
- echo "Setting OOZIE_CONFIG: %OOZIE_CONFIG%"
-) else (
- echo "Using OOZIE_CONFIG: %OOZIE_CONFIG%"
-)
-set oozie_config_tmp=%OOZIE_CONFIG%
-
-@REM if the configuration dir has a env file, source it
-if exist "%OOZIE_CONFIG%\oozie-env.CMD" (
- ECHO "Sourcing: %OOZIE_CONFIG%\oozie-env.cmd"
- call %OOZIE_CONFIG%\oozie-env.cmd
-)
-
-@REM verify that the sourced env file didn't change OOZIE_HOME
-@REM if so, warn and revert
-if not "%OOZIE_HOME%" == "%oozie_home_tmp%" (
- echo "WARN: OOZIE_HOME resetting to ''%OOZIE_HOME%' ignored"
- set OOZIE_HOME=%oozie_home_tmp%
-)
-
-@REM verify that the sourced env file didn't change OOZIE_CONFIG
-@REM if so, warn and revert
-if not "%OOZIE_CONFIG%" == "%oozie_config_tmp%" (
- print "WARN: OOZIE_CONFIG resetting to ''%OOZIE_CONFIG%'' ignored"
- set OOZIE_CONFIG=%oozie_config_tmp%
-)
-
-if not defined OOZIE_CONFIG_FILE (
- set OOZIE_CONFIG_FILE=oozie-site.xml
- echo Setting OOZIE_CONFIG_FILE: '%OOZIE_CONFIG_FILE%'
-) else (
- echo Using OOZIE_CONFIG_FILE: '%OOZIE_CONFIG_FILE%'
-)
-
-if not defined OOZIE_DATA (
- set OOZIE_DATA=%OOZIE_HOME%\data
- echo Setting OOZIE_DATA: '%OOZIE_DATA%'
-) else (
- echo Using OOZIE_DATA: '%OOZIE_DATA%'
-)
-
-if not defined OOZIE_LOG (
- set OOZIE_LOG=%OOZIE_HOME%\logs
- echo Setting OOZIE_LOG: '%OOZIE_LOG%'
-) else (
- echo Using OOZIE_LOG: '%OOZIE_LOG%'
-)
-
-if not exist %OOZIE_LOG% (
- echo Creating log directory: %OOZIE_LOG%
- md %OOZIE_LOG%
-) else (
- echo Using log directory: %OOZIE_LOG%
-)
-
-if not defined OOZIE_LOG4J_FILE (
- set OOZIE_LOG4J_FILE=oozie-log4j.properties
- echo Setting OOZIE_LOG4J_FILE: '%OOZIE_LOG4J_FILE%'
-) else (
- echo Using OOZIE_LOG4J_FILE: '%OOZIE_LOG4J_FILE%'
-)
-
-if not defined OOZIE_LOG4J_RELOAD (
- set OOZIE_LOG4J_RELOAD=10
- echo Setting OOZIE_LOG4J_RELOAD: '%OOZIE_LOG4J_RELOAD%'
-) else (
- echo Using OOZIE_LOG4J_RELOAD: '%OOZIE_LOG4J_RELOAD%'
-)
-
-if not defined OOZIE_HTTP_HOSTNAME (
- set OOZIE_HTTP_HOSTNAME=%COMPUTERNAME%
- echo Setting OOZIE_HTTP_HOSTNAME: '%OOZIE_HTTP_HOSTNAME%'
-) else (
- echo Using OOZIE_HTTP_HOSTNAME: '%OOZIE_HTTP_HOSTNAME%'
-)
-
-if not defined OOZIE_HTTP_PORT (
- set OOZIE_HTTP_PORT=11000
- echo Setting OOZIE_HTTP_PORT: '%OOZIE_HTTP_PORT%'
-) else (
- echo Using OOZIE_HTTP_PORT: '%OOZIE_HTTP_PORT%'
-)
-
-if not defined OOZIE_ADMIN_PORT (
- SET /a OOZIE_ADMIN_PORT=%OOZIE_HTTP_PORT%+1
- echo Setting OOZIE_ADMIN_PORT: '%OOZIE_ADMIN_PORT%'
-) else (
- echo Using OOZIE_ADMIN_PORT: '%OOZIE_ADMIN_PORT%'
-)
-
-if not defined OOZIE_HTTPS_PORT (
- SET OOZIE_HTTPS_PORT=11443
- echo Setting OOZIE_HTTPS_PORT: '%OOZIE_HTTPS_PORT%'
-) else (
- echo Using OOZIE_HTTPS_PORT: '%OOZIE_HTTPS_PORT%'
-)
-
-if not defined OOZIE_BASE_URL (
- set OOZIE_BASE_URL=http://%OOZIE_HTTP_HOSTNAME%:%OOZIE_HTTP_PORT%/oozie
- echo Setting OOZIE_BASE_URL: '%OOZIE_BASE_URL%'
-) else (
- echo Using OOZIE_BASE_URL: '%OOZIE_BASE_URL%'
-)
-
-if not defined CATALINA_BASE (
- set CATALINA_BASE=%OOZIE_HOME%\oozie-server
- echo Setting CATALINA_BASE: '%CATALINA_BASE%'
-) else (
- echo Using CATALINA_BASE: '%CATALINA_BASE%'
-)
-
-if not defined OOZIE_HTTPS_KEYSTORE_FILE (
- set OOZIE_HTTPS_KEYSTORE_FILE=%HOME%\.keystore
- echo Setting OOZIE_HTTPS_KEYSTORE_FILE: '%OOZIE_HTTPS_KEYSTORE_FILE%'
-) else (
- echo Using OOZIE_HTTPS_KEYSTORE_FILE: '%OOZIE_HTTPS_KEYSTORE_FILE%'
-)
-
-if not defined OOZIE_HTTPS_KEYSTORE_PASS (
- set OOZIE_HTTPS_KEYSTORE_PASS=password
- echo Setting OOZIE_HTTPS_KEYSTORE_PASS: '%OOZIE_HTTPS_KEYSTORE_PASS%'
-) else (
- echo Using OOZIE_HTTPS_KEYSTORE_PASS: '%OOZIE_HTTPS_KEYSTORE_PASS%'
-)
-
-if not defined OOZIE_INSTANCE_ID (
- set OOZIE_INSTANCE_ID=%OOZIE_HTTP_HOSTNAME%
- echo Setting OOZIE_INSTANCE_ID: '%OOZIE_INSTANCE_ID%'
-) else (
- echo Using OOZIE_INSTANCE_ID: '%OOZIE_INSTANCE_ID%'
-)
-
-if not defined CATALINA_HOME (
- set CATALINA_HOME=%OOZIE_HOME%\oozie-server
- echo Setting CATALINA_HOME: '%CATALINA_HOME%'
-) else (
- echo Using CATALINA_HOME: '%CATALINA_HOME%'
-)
-
-if not defined CATALINA_OUT (
- set CATALINA_OUT=%OOZIE_LOG%\catalina.out
- echo Setting CATALINA_OUT: '%CATALINA_OUT%'
-) else (
- echo Using CATALINA_OUT: '%CATALINA_OUT%'
-)
-
-if not defined CATALINA_PID (
- set CATALINA_PID=%OOZIE_HOME%\oozie-server\temp\oozie.pid
- echo Setting CATALINA_PID: '%CATALINA_PID%'
-) else (
- echo Using CATALINA_PID: '%CATALINA_PID%'
-)
-
-set CATALINA_OPTS=%CATALINA_OPTS% -Dderby.stream.error.file=%OOZIE_LOG%\derby.log
diff --git a/distro/src/main/bin/oozie.cmd b/distro/src/main/bin/oozie.cmd
deleted file mode 100644
index 5d74258..0000000
--- a/distro/src/main/bin/oozie.cmd
+++ /dev/null
@@ -1,57 +0,0 @@
-@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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@echo off
-setlocal enabledelayedexpansion
-
-set BASEDIR=%~dp0..
-
-set OOZIECPPATH=.
-
-for %%i IN (%BASEDIR%\lib\*.jar) do set OOZIECPPATH=!OOZIECPPATH!;%%i
-
-set JAVA_PROPERTIES=
-set OOZIE_PROPERTIES=
-
-:copyJavaProperties
-set str=%~1
-if "%str:~0,2%"=="-D" (
- set JAVA_PROPERTIES=!JAVA_PROPERTIES! %str%
-) else (
- goto :copyOozieProperties
-)
-SHIFT
-goto :copyJavaProperties
-
-:copyOozieProperties
-set str=%~1
-if not "%str%"=="" (
- set OOZIE_PROPERTIES=!OOZIE_PROPERTIES! %str%
-) else (
- goto :startExecuting
-)
-SHIFT
-goto :copyOozieProperties
-
-:startExecuting
-
-if "%JAVA_HOME%"=="" (
- set JAVA_BIN=java
-) else (
- set JAVA_BIN=%JAVA_HOME%\bin\java
-)
-
-%JAVA_BIN% %JAVA_PROPERTIES% -cp %OOZIECPPATH% org.apache.oozie.cli.OozieCLI %OOZIE_PROPERTIES%
diff --git a/distro/src/main/bin/oozied.cmd b/distro/src/main/bin/oozied.cmd
deleted file mode 100644
index 6b8d45b..0000000
--- a/distro/src/main/bin/oozied.cmd
+++ /dev/null
@@ -1,96 +0,0 @@
-@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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@echo off
-
-set argC=0
-for %%x in (%*) do Set /A argC+=1
-
-if %argC% == 0 (
- echo "Usage: oozied.cmd (start|stop|run) [<catalina-args...>]"
- exit 1
-)
-
-set actionCmd=%1
-
-set BASEDIR=%~dp0
-set BASEDIR=%BASEDIR%\..
-call %BASEDIR%\bin\oozie-sys.cmd
-
-
-set CATALINA=%BASEDIR%\oozie-server\bin\catalina.bat
-
-if "%actionCmd%" == "start" goto setup_catalina_opts
-if "%actionCmd%" == "run" goto setup_catalina_opts
-
-goto exec_catalina
-
-:setup
- echo "WARN: Oozie WAR has not been set up at '%CATALINA_BASE%\webapps', doing default set up"
- call %BASEDIR%\bin\oozie-setup.cmd
- if errorlevel 1(
- exit /b %errorlevel%
- )
- goto :EOF
-
-:setup_catalina_opts
- @REM The Java System properties 'oozie.http.port' and 'oozie.https.port' are not
- @REM used by Oozie, they are used in Tomcat's server.xml configuration file
-
- echo "Using CATALINA_OPTS: %CATALINA_OPTS%"
- echo "OOZIE_HOME" %OOZIE_HOME%
- set catalina_opts_tmp=-Doozie.home.dir=%OOZIE_HOME%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.config.dir=%OOZIE_CONFIG%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.log.dir=%OOZIE_LOG%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.data.dir=%OOZIE_DATA%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.instance.id=%OOZIE_INSTANCE_ID%
-
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.config.file=%OOZIE_CONFIG_FILE%
-
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.log4j.file=%OOZIE_LOG4J_FILE%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.log4j.reload=%OOZIE_LOG4J_RELOAD%
-
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.http.hostname=%OOZIE_HTTP_HOSTNAME%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.http.port=%OOZIE_HTTP_PORT%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.https.port=%OOZIE_HTTPS_PORT%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.base.url=%OOZIE_BASE_URL%
-
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.https.keystore.file=%OOZIE_HTTPS_KEYSTORE_FILE%
- set catalina_opts_tmp=%catalina_opts_tmp% -Doozie.https.keystore.pass=%OOZIE_HTTPS_KEYSTORE_PASS%
-
- # add required native libraries such as compression codecs
- set catalina_opts_tmp=%catalina_opts_tmp% -Djava.library.path=%JAVA_LIBRARY_PATH%
- echo "Adding to CATALINA_OPTS: %catalina_opts_tmp%"
- set CATALINA_OPTS=%CATALINA_OPTS% %catalina_opts_tmp%
- echo CATALINA_OPTS: %CATALINA_OPTS%
-
-:setup_oozie
- if NOT EXIST "%CATALINA_BASE%\webapps\oozie.war" call setup
-
-
-:exec_catalina
- ECHO EXECUTING CATALINA "%CATALINA% %actionCmd%"
- call %CATALINA% %actionCmd%
- if errorlevel 1 (
- echo
- echo "ERROR: Oozie %actionCmd% aborted"
- echo
- exit /b %errorlevel%
- ) else (
- echo
- echo "Oozie %actionCmd% succeeded"
- echo
- )
diff --git a/release-log.txt b/release-log.txt
index 5003830..62634fe 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-2836 Remove .ps1 and .cmd windows scripts (kmarton via asalamon74)
OOZIE-3506 Flaky test TestOozieRollingPolicy (asalamon74 via kmarton)
OOZIE-3476 Migrate classes without setup/tearDown to JUnit4 (asalamon74 via kmarton)
OOZIE-3522 Migrate from Guava's Joiner (asalamon74 via kmarton)
diff --git a/tools/src/main/bin/ooziedb.cmd b/tools/src/main/bin/ooziedb.cmd
deleted file mode 100644
index 04b3bdd..0000000
--- a/tools/src/main/bin/ooziedb.cmd
+++ /dev/null
@@ -1,70 +0,0 @@
-@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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-
-@echo off
-setlocal enabledelayedexpansion
-
-set BASEDIR=%~dp0..
-pushd %BASEDIR%
-set BASEDIR=%cd%
-popd
-
-set OOZIE_HOME=%BASEDIR%
-set OOZIE_CONFIG=%OOZIE_HOME%\conf
-set OOZIE_LOG=%OOZIE_HOME%\logs
-set OOZIE_DATA=%OOZIE_HOME%\data
-
-@rem Verify the \conf directory is available
-if not exist %OOZIE_CONFIG%\NUL (
- echo.
- echo."ERROR: Oozie configuration directory could not be found at %OOZIE_CONFIG%"
- echo.
- exit 1
-)
-
-@rem Check if oozie-env.cmd is provided under \bin and import user defined
-@rem settings defined in it if it exists
-if exist "%OOZIE_HOME%\bin\oozie-env.cmd" (
- call "%OOZIE_HOME%\bin\oozie-env.cmd"
-)
-if exist "%OOZIE_CONFIG%\oozie-env.cmd" (
- call "%OOZIE_CONFIG%\oozie-env.cmd"
-)
-
-@rem Set Oozie Options
-set OOZIEDB_OPTS=-Doozie.home.dir=%OOZIE_HOME%
-set OOZIEDB_OPTS=%OOZIEDB_OPTS% -Doozie.config.dir=%OOZIE_CONFIG%
-set OOZIEDB_OPTS=%OOZIEDB_OPTS% -Doozie.log.dir=%OOZIE_LOG%
-set OOZIEDB_OPTS=%OOZIEDB_OPTS% -Doozie.data.dir=%OOZIE_DATA%
-
-@rem Set Classpath to load oozie dependencies
-set OOZIECPPATH=.
-
-@rem Add libtools to the classpath
-set OOZIECPPATH=%OOZIECPPATH%;%BASEDIR%\libtools\*
-@rem Add lib to the classpath
-set OOZIECPPATH=%OOZIECPPATH%;%BASEDIR%\lib\*
-@rem Add extra_libs to the classpath
-set OOZIECPPATH=%OOZIECPPATH%;%BASEDIR%\..\extra_libs\*
-
-@rem Set JAVA_BIN based on JAVA_HOME
-if "%JAVA_HOME%"=="" (
- set JAVA_BIN=java
-) else (
- set JAVA_BIN=%JAVA_HOME%\bin\java
-)
-
-%JAVA_BIN% %JAVA_PROPERTIES% %OOZIEDB_OPTS% -classpath %OOZIECPPATH% org.apache.oozie.tools.OozieDBCLI %*
