You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2016/12/06 22:01:46 UTC
oozie git commit: OOZIE-2741 Remove Tomcat (asasvari via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master 62c060c34 -> 5f53676bb
OOZIE-2741 Remove Tomcat (asasvari via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5f53676b
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5f53676b
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5f53676b
Branch: refs/heads/master
Commit: 5f53676bb544e98dacba112acbdbde8caca3e8bc
Parents: 62c060c
Author: Robert Kanter <rk...@cloudera.com>
Authored: Tue Dec 6 14:01:29 2016 -0800
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Tue Dec 6 14:01:29 2016 -0800
----------------------------------------------------------------------
core/src/main/conf/oozie-env.sh | 5 +-
core/src/main/resources/oozie-default.xml | 2 +-
distro/pom.xml | 57 +---
distro/src/main/bin/oozie-setup.sh | 147 +--------
distro/src/main/bin/oozie-sys.sh | 27 --
distro/src/main/bin/oozie-tomcat-server.sh | 89 ------
distro/src/main/bin/oozied.sh | 21 +-
distro/src/main/tomcat/ROOT/WEB-INF/web.xml | 25 --
distro/src/main/tomcat/ROOT/favicon.ico | Bin 1150 -> 0 bytes
distro/src/main/tomcat/ROOT/index.html | 25 --
distro/src/main/tomcat/logging.properties | 64 ----
distro/src/main/tomcat/server.xml | 150 ----------
distro/src/main/tomcat/ssl-server.xml | 152 ----------
distro/src/main/tomcat/ssl-web.xml | 295 -------------------
pom.xml | 8 -
release-log.txt | 1 +
.../org/apache/oozie/server/JspHandler.java | 3 -
src/main/assemblies/distro-jetty.xml | 155 ----------
src/main/assemblies/distro-tomcat.xml | 153 ----------
src/main/assemblies/distro.xml | 155 ++++++++++
20 files changed, 164 insertions(+), 1370 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/core/src/main/conf/oozie-env.sh
----------------------------------------------------------------------
diff --git a/core/src/main/conf/oozie-env.sh b/core/src/main/conf/oozie-env.sh
index bc8c601..033c87b 100644
--- a/core/src/main/conf/oozie-env.sh
+++ b/core/src/main/conf/oozie-env.sh
@@ -19,12 +19,9 @@
# Set Oozie specific environment variables here.
-# Settings for the Embedded Tomcat that runs Oozie
+# Settings for the Embedded Jetty that runs Oozie
# Java System properties for Oozie should be specified in this variable
#
-if [ "${OOZIE_USE_TOMCAT}" = "1" ]; then
- export CATALINA_OPTS="$CATALINA_OPTS -Xmx1024m"
-fi
# Oozie configuration file to load from Oozie configuration directory
#
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/core/src/main/resources/oozie-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/oozie-default.xml b/core/src/main/resources/oozie-default.xml
index 8565643..2d7650a 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -2604,7 +2604,7 @@ will be the requeue interval for the actions which are waiting for a long time w
<name>oozie.server.threadpool.max.threads</name>
<value>150</value>
<description>
- Controls the threadpool size for the Oozie Server (both Jetty and Tomcat)
+ Controls the threadpool size for the Oozie Server (if using embbedded Jetty)
</description>
</property>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/pom.xml
----------------------------------------------------------------------
diff --git a/distro/pom.xml b/distro/pom.xml
index ce5319f..740aff0 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -31,10 +31,6 @@
<name>Apache Oozie Distro</name>
<packaging>jar</packaging>
- <properties>
- <distro.descriptor>../src/main/assemblies/distro-jetty.xml</distro.descriptor>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.oozie</groupId>
@@ -77,7 +73,7 @@
<configuration>
<finalName>oozie-${project.version}</finalName>
<descriptors>
- <descriptor>${distro.descriptor}</descriptor>
+ <descriptor>../src/main/assemblies/distro.xml</descriptor>
</descriptors>
</configuration>
</plugin>
@@ -108,56 +104,5 @@
</dependency>
</dependencies>
</profile>
-
- <profile>
- <id>tomcat</id>
- <properties>
- <distro.descriptor>../src/main/assemblies/distro-tomcat.xml</distro.descriptor>
- </properties>
- <build>
- <plugins>
- <!-- Downloading Tomcat TAR.GZ, using downloads/ dir to avoid downloading over an over -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <configuration>
- <target>
- <mkdir dir="downloads"/>
- <get src="http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz"
- dest="downloads/tomcat-${tomcat.version}.tar.gz" verbose="true" skipexisting="true"/>
- <delete dir="target/tomcat"/>
- <mkdir dir="target/tomcat"/>
- <gunzip src="downloads/tomcat-${tomcat.version}.tar.gz"
- dest="target/tomcat/tomcat-${tomcat.version}.tar"/>
- <untar src="target/tomcat/tomcat-${tomcat.version}.tar" dest="target/tomcat"/>
- <move file="target/tomcat/apache-tomcat-${tomcat.version}" tofile="target/tomcat/oozie-server"/>
- <delete dir="target/tomcat/oozie-server/webapps"/>
- <mkdir dir="target/tomcat/oozie-server/webapps"/>
- <delete file="target/tomcat/oozie-server/conf/server.xml"/>
- <copy file="src/main/tomcat/server.xml" toDir="target/tomcat/oozie-server/conf"/>
- <copy file="src/main/tomcat/logging.properties"
- toDir="target/tomcat/oozie-server/conf"/>
- <mkdir dir="target/tomcat/oozie-server/conf/ssl"/>
- <copy file="src/main/tomcat/server.xml" toDir="target/tomcat/oozie-server/conf/ssl"/>
- <copy file="src/main/tomcat/ssl-server.xml" toDir="target/tomcat/oozie-server/conf/ssl"/>
- <copy file="src/main/tomcat/ssl-web.xml" toDir="target/tomcat/oozie-server/conf/ssl"/>
- <copy todir="target/tomcat/oozie-server/webapps/ROOT">
- <fileset dir="src/main/tomcat/ROOT"/>
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/bin/oozie-setup.sh
----------------------------------------------------------------------
diff --git a/distro/src/main/bin/oozie-setup.sh b/distro/src/main/bin/oozie-setup.sh
index 9d6a2d0..b8d8016 100644
--- a/distro/src/main/bin/oozie-setup.sh
+++ b/distro/src/main/bin/oozie-setup.sh
@@ -125,11 +125,7 @@ additionalDir=""
extjsHome=""
jarsPath=""
prepareWar=""
-inputWar="${OOZIE_HOME}/oozie.war"
-outputWar="${CATALINA_BASE}/webapps/oozie.war"
-outputWarExpanded="${CATALINA_BASE}/webapps/oozie"
secure=""
-secureConfigsDir="${CATALINA_BASE}/conf/ssl"
while [ $# -gt 0 ]
do
@@ -143,16 +139,7 @@ do
#Create lib directory from war if lib doesn't exist
if [ ! -d "${BASEDIR}/lib" ]; then
mkdir ${BASEDIR}/lib
-
- if [ "${OOZIE_USE_TOMCAT}" = "1" ]; then
- unzip ${BASEDIR}/oozie.war WEB-INF/lib/*.jar -d ${BASEDIR}/lib > /dev/null
- mv ${BASEDIR}/lib/WEB-INF/lib/*.jar ${BASEDIR}/lib/
- rmdir ${BASEDIR}/lib/WEB-INF/lib
- rmdir ${BASEDIR}/lib/WEB-INF
- else
- cp ${JETTY_LIB_DIR}/* ${BASEDIR}/lib
- fi
-
+ cp ${JETTY_LIB_DIR}/* ${BASEDIR}/lib
fi
OOZIECPPATH=""
@@ -191,13 +178,6 @@ do
shift
done
-if [ -e "${CATALINA_PID}" -a "${OOZIE_USE_TOMCAT}" = "1" ]; then
- echo
- echo "ERROR: Stop Oozie first"
- echo
- exit -1
-fi
-
echo
@@ -274,130 +254,7 @@ prepare_jetty() {
fi
}
-prepare_tomcat() {
- if [ "${prepareWar}" == "" ]; then
- echo "no arguments given"
- printUsage
- exit -1
- else
- if [ -e "${outputWar}" ]; then
- chmod -f u+w ${outputWar}
- rm -rf ${outputWar}
- fi
- rm -rf ${outputWarExpanded}
-
- check_adding_extensions
-
- prepare
-
- checkFileExists ${inputWar}
- checkFileDoesNotExist ${outputWar}
-
- check_extjs
-
- if [ "${addJars}" = "true" ]; then
- for jarPath in ${jarsPath//:/$'\n'}
- do
- checkFileExists ${jarPath}
- done
- fi
-
- #Unpacking original war
- unzip ${inputWar} -d ${tmpWarDir} > /dev/null
- checkExec "unzipping Oozie input WAR"
-
- components=""
-
- if [ "${OOZIE_USE_TOMCAT}" == "1" ]; then
- if [ "${secure}" != "" ]; then
- #Use the SSL version of server.xml in oozie-server
- checkFileExists ${secureConfigsDir}/ssl-server.xml
- cp ${secureConfigsDir}/ssl-server.xml ${CATALINA_BASE}/conf/server.xml
- #Inject the SSL version of web.xml in oozie war
- checkFileExists ${secureConfigsDir}/ssl-web.xml
- cp ${secureConfigsDir}/ssl-web.xml ${tmpWarDir}/WEB-INF/web.xml
- echo "INFO: Using secure server.xml and secure web.xml"
- else
- #Use the regular version of server.xml in oozie-server
- checkFileExists ${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
- fi
- fi
-
- if [ "${addExtjs}" = "true" ]; then
- if [ ! "${components}" = "" ];then
- components="${components}, "
- fi
- components="${components}ExtJS library"
- if [ -e ${tmpWarDir}/ext-2.2 ]; then
- echo
- echo "Specified Oozie WAR '${inputWar}' already contains ExtJS library files"
- cleanup_and_exit
- fi
- #If the extjs path given is a ZIP, expand it and use it from there
- if [ -f ${extjsHome} ]; then
- unzip ${extjsHome} -d ${tmpDir} > /dev/null
- extjsHome=${tmpDir}/ext-2.2
- fi
- #Inject the library in oozie war
- cp -r ${extjsHome} ${tmpWarDir}/ext-2.2
- checkExec "copying ExtJS files into staging"
- fi
-
- if [ "${addJars}" = "true" ]; then
- if [ ! "${components}" = "" ];then
- components="${components}, "
- fi
- components="${components}JARs"
-
- for jarPath in ${jarsPath//:/$'\n'}
- do
- found=`ls ${tmpWarDir}/WEB-INF/lib/${jarPath} 2> /dev/null | wc -l`
- checkExec "looking for JAR ${jarPath} in input WAR"
- if [ ! $found = 0 ]; then
- echo
- echo "Specified Oozie WAR '${inputWar}' already contains JAR ${jarPath}"
- cleanup_and_exit
- fi
- cp ${jarPath} ${tmpWarDir}/WEB-INF/lib/
- checkExec "copying jar ${jarPath} to staging"
- done
- fi
-
- #Creating new Oozie WAR
- currentDir=`pwd`
- cd ${tmpWarDir}
- zip -r oozie.war * > /dev/null
- checkExec "creating new Oozie WAR"
- cd ${currentDir}
-
- #copying new Oozie WAR to asked location
- if [ "${OOZIE_USE_TOMCAT}" == "1" ]; then
- cp ${tmpWarDir}/oozie.war ${outputWar}
- checkExec "copying new Oozie WAR"
-
- echo
- echo "New Oozie WAR file with added '${components}' at ${outputWar}"
- echo
- fi
-
- cleanUp
-
- if [ "$?" -ne "0" ]; then
- exit -1
- fi
-
- log_ready_to_start
-
- fi
-}
-
-if [ "${OOZIE_USE_TOMCAT}" = "1" ]; then
- prepare_tomcat
-else
- prepare_jetty
-fi
+prepare_jetty
log_ready_to_start
exit 0
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/bin/oozie-sys.sh
----------------------------------------------------------------------
diff --git a/distro/src/main/bin/oozie-sys.sh b/distro/src/main/bin/oozie-sys.sh
index 688aeb2..90bffba 100755
--- a/distro/src/main/bin/oozie-sys.sh
+++ b/distro/src/main/bin/oozie-sys.sh
@@ -195,13 +195,6 @@ else
print "Using OOZIE_BASE_URL: ${OOZIE_BASE_URL}"
fi
-if [ "${OOZIE_USE_TOMCAT}" = "1" -a "${CATALINA_BASE}" = "" ]; then
- export CATALINA_BASE=${OOZIE_HOME}/oozie-server
- print "Setting CATALINA_BASE: ${CATALINA_BASE}"
-else
- print "Using CATALINA_BASE: ${CATALINA_BASE}"
-fi
-
if [ "${OOZIE_HTTPS_KEYSTORE_FILE}" = "" ]; then
export OOZIE_HTTPS_KEYSTORE_FILE=${HOME}/.keystore
print "Setting OOZIE_HTTPS_KEYSTORE_FILE: ${OOZIE_HTTPS_KEYSTORE_FILE}"
@@ -223,26 +216,6 @@ else
print "Using OOZIE_INSTANCE_ID: ${OOZIE_INSTANCE_ID}"
fi
-if [ "${OOZIE_USE_TOMCAT}" = "1" ]; then
- if [ "${CATALINA_OUT}" = "" ]; then
- export CATALINA_OUT=${OOZIE_LOG}/catalina.out
- print "Setting CATALINA_OUT: ${CATALINA_OUT}"
- else
- print "Using CATALINA_OUT: ${CATALINA_OUT}"
- fi
-fi
-
-if [ "${OOZIE_USE_TOMCAT}" = "1" -a "${CATALINA_PID}" = "" ]; then
- export CATALINA_PID=${OOZIE_HOME}/oozie-server/temp/oozie.pid
- print "Setting CATALINA_PID: ${CATALINA_PID}"
-else
- print "Using CATALINA_PID: ${CATALINA_PID}"
-fi
-
-if [ "${OOZIE_USE_TOMCAT}" = "1" ]; then
- export CATALINA_OPTS="${CATALINA_OPTS} -Dderby.stream.error.file=${OOZIE_LOG}/derby.log"
-fi
-
print
setup_ooziedb() {
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/bin/oozie-tomcat-server.sh
----------------------------------------------------------------------
diff --git a/distro/src/main/bin/oozie-tomcat-server.sh b/distro/src/main/bin/oozie-tomcat-server.sh
deleted file mode 100644
index 18dd0f6..0000000
--- a/distro/src/main/bin/oozie-tomcat-server.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-CATALINA=${OOZIE_CATALINA_HOME:-${BASEDIR}/oozie-server}/bin/catalina.sh
-
-setup_catalina_opts() {
- # The Java System properties 'oozie.http.port' and 'oozie.https.port' are not
- # used by Oozie, they are used in Tomcat's server.xml configuration file
- #
- echo "Using CATALINA_OPTS: ${CATALINA_OPTS}"
-
- catalina_opts="-Doozie.home.dir=${OOZIE_HOME}";
- catalina_opts="${catalina_opts} -Doozie.config.dir=${OOZIE_CONFIG}";
- catalina_opts="${catalina_opts} -Doozie.log.dir=${OOZIE_LOG}";
- catalina_opts="${catalina_opts} -Doozie.data.dir=${OOZIE_DATA}";
- catalina_opts="${catalina_opts} -Doozie.instance.id=${OOZIE_INSTANCE_ID}"
-
- catalina_opts="${catalina_opts} -Doozie.config.file=${OOZIE_CONFIG_FILE}";
-
- catalina_opts="${catalina_opts} -Doozie.log4j.file=${OOZIE_LOG4J_FILE}";
- catalina_opts="${catalina_opts} -Doozie.log4j.reload=${OOZIE_LOG4J_RELOAD}";
-
- catalina_opts="${catalina_opts} -Doozie.http.hostname=${OOZIE_HTTP_HOSTNAME}";
- catalina_opts="${catalina_opts} -Doozie.admin.port=${OOZIE_ADMIN_PORT}";
- catalina_opts="${catalina_opts} -Doozie.http.port=${OOZIE_HTTP_PORT}";
- catalina_opts="${catalina_opts} -Doozie.https.port=${OOZIE_HTTPS_PORT}";
- catalina_opts="${catalina_opts} -Doozie.base.url=${OOZIE_BASE_URL}";
- catalina_opts="${catalina_opts} -Doozie.https.keystore.file=${OOZIE_HTTPS_KEYSTORE_FILE}";
- catalina_opts="${catalina_opts} -Doozie.https.keystore.pass=${OOZIE_HTTPS_KEYSTORE_PASS}";
-
- # add required native libraries such as compression codecs
- catalina_opts="${catalina_opts} -Djava.library.path=${JAVA_LIBRARY_PATH}";
-
- echo "Adding to CATALINA_OPTS: ${catalina_opts}"
-
- export CATALINA_OPTS="${CATALINA_OPTS} ${catalina_opts}"
-}
-
-setup_oozie() {
- if [ ! -e "${CATALINA_BASE}/webapps/oozie.war" ]; then
- echo "WARN: Oozie WAR has not been set up at '${CATALINA_BASE}/webapps', doing default set up"
- ${BASEDIR}/bin/oozie-setup.sh prepare-war
- if [ "$?" -ne "0" ]; then
- exit -1
- fi
- fi
- echo
-}
-
-tomcat_main() {
- source ${BASEDIR}/bin/oozie-sys.sh
-
- #Create webapp directory from war if lib doesn't exist
- if [ ! -d "${BASEDIR}/embedded-oozie-server/webapp" ]; then
- unzip "${BASEDIR}/oozie.war" -d "${BASEDIR}/embedded-oozie-server/webapp" > /dev/null
- fi
-
- actionCmd=$1
- case $actionCmd in
- (start|run)
- setup_catalina_opts
- setup_oozie
- setup_ooziedb
- #TODO setup default oozie sharelib
- ;;
- (stop)
- setup_catalina_opts
-
- # A bug in catalina.sh script does not use CATALINA_OPTS for stopping the server
- export JAVA_OPTS=${CATALINA_OPTS}
- ;;
- esac
- exec $CATALINA $actionCmd "$@"
-}
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/bin/oozied.sh
----------------------------------------------------------------------
diff --git a/distro/src/main/bin/oozied.sh b/distro/src/main/bin/oozied.sh
index 462ba76..0b1b987 100644
--- a/distro/src/main/bin/oozied.sh
+++ b/distro/src/main/bin/oozied.sh
@@ -33,28 +33,13 @@ done
BASEDIR=`dirname ${PRG}`
BASEDIR=`cd ${BASEDIR}/..;pwd`
-if [ -e "${BASEDIR}/oozie-server" ]; then
- export OOZIE_USE_TOMCAT=1
-else
- export OOZIE_USE_TOMCAT=0
-fi
-
if [ $# -le 0 ]; then
- if [ "${OOZIE_USE_TOMCAT}" -eq "1" ]; then
- echo "Usage: oozied.sh (start|stop|run) [<catalina-args...>]"
- else
- echo "Usage: oozied.sh (start|stop|run)"
- fi
+ echo "Usage: oozied.sh (start|stop|run)"
exit 1
fi
actionCmd=$1
shift
-if [ "${OOZIE_USE_TOMCAT}" == "1" ]; then
- source ${BASEDIR}/bin/oozie-tomcat-server.sh
- tomcat_main $actionCmd
-else
- source ${BASEDIR}/bin/oozie-jetty-server.sh
- jetty_main $actionCmd
-fi
+source ${BASEDIR}/bin/oozie-jetty-server.sh
+jetty_main $actionCmd
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/tomcat/ROOT/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/distro/src/main/tomcat/ROOT/WEB-INF/web.xml b/distro/src/main/tomcat/ROOT/WEB-INF/web.xml
deleted file mode 100644
index ad01e89..0000000
--- a/distro/src/main/tomcat/ROOT/WEB-INF/web.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <display-name>ROOT</display-name>
-</web-app>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/tomcat/ROOT/favicon.ico
----------------------------------------------------------------------
diff --git a/distro/src/main/tomcat/ROOT/favicon.ico b/distro/src/main/tomcat/ROOT/favicon.ico
deleted file mode 100644
index 5d95710..0000000
Binary files a/distro/src/main/tomcat/ROOT/favicon.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/tomcat/ROOT/index.html
----------------------------------------------------------------------
diff --git a/distro/src/main/tomcat/ROOT/index.html b/distro/src/main/tomcat/ROOT/index.html
deleted file mode 100644
index 8cc891c..0000000
--- a/distro/src/main/tomcat/ROOT/index.html
+++ /dev/null
@@ -1,25 +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.
--->
-<html>
- <head>
- <meta http-equiv="refresh" content="0;url=./oozie">
- </head>
- <body>
- <a href="/oozie">Oozie Console</a>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/tomcat/logging.properties
----------------------------------------------------------------------
diff --git a/distro/src/main/tomcat/logging.properties b/distro/src/main/tomcat/logging.properties
deleted file mode 100644
index 305195b..0000000
--- a/distro/src/main/tomcat/logging.properties
+++ /dev/null
@@ -1,64 +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.
-
-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-1catalina.org.apache.juli.FileHandler.level = FINE
-1catalina.org.apache.juli.FileHandler.directory = ${oozie.log.dir}
-1catalina.org.apache.juli.FileHandler.prefix = catalina.
-
-2localhost.org.apache.juli.FileHandler.level = FINE
-2localhost.org.apache.juli.FileHandler.directory = ${oozie.log.dir}
-2localhost.org.apache.juli.FileHandler.prefix = localhost.
-
-3manager.org.apache.juli.FileHandler.level = FINE
-3manager.org.apache.juli.FileHandler.directory = ${oozie.log.dir}
-3manager.org.apache.juli.FileHandler.prefix = manager.
-
-4host-manager.org.apache.juli.FileHandler.level = FINE
-4host-manager.org.apache.juli.FileHandler.directory = ${oozie.log.dir}
-4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-#org.apache.catalina.startup.ContextConfig.level = FINE
-#org.apache.catalina.startup.HostConfig.level = FINE
-#org.apache.catalina.session.ManagerBase.level = FINE
-#org.apache.catalina.core.AprLifecycleListener.level=FINE
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/tomcat/server.xml
----------------------------------------------------------------------
diff --git a/distro/src/main/tomcat/server.xml b/distro/src/main/tomcat/server.xml
deleted file mode 100644
index e4fcfcc..0000000
--- a/distro/src/main/tomcat/server.xml
+++ /dev/null
@@ -1,150 +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.
--->
-<!-- Note: A "Server" is not itself a "Container", so you may not
- define subcomponents such as "Valves" at this level.
- Documentation at /docs/config/server.html
- -->
-<Server port="${oozie.admin.port}" shutdown="SHUTDOWN">
-
- <!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener" />
- <!-- Prevent memory leaks due to use of particular java/javax APIs-->
- <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
- <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-
- <!-- Global JNDI resources
- Documentation at /docs/jndi-resources-howto.html
- -->
- <GlobalNamingResources>
- <!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users
- -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
- <!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" Note: A "Service" is not itself a "Container",
- so you may not define subcomponents such as "Valves" at this level.
- Documentation at /docs/config/service.html
- -->
- <Service name="Catalina">
-
- <!--The connectors can use a shared executor, you can define one or more named thread pools-->
- <!--
- <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
- maxThreads="150" minSpareThreads="4"/>
- -->
-
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Documentation at :
- Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
- Java AJP Connector: /docs/config/ajp.html
- APR (HTTP/AJP) Connector: /docs/apr.html
- Define a non-SSL HTTP/1.1 Connector on port ${oozie.http.port}
- -->
- <Connector port="${oozie.http.port}" protocol="HTTP/1.1"
- connectionTimeout="20000"
- maxHttpHeaderSize="65536"
- redirectPort="8443" />
- <!-- A "Connector" using the shared thread pool-->
- <!--
- <Connector executor="tomcatThreadPool"
- port="${oozie.http.port}" protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- -->
- <!-- Define a SSL HTTP/1.1 Connector on port 8443
- This connector uses the JSSE configuration, when using APR, the
- connector should be using the OpenSSL style configuration
- described in the APR documentation -->
- <!--
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS" />
- -->
-
- <!-- Define an AJP 1.3 Connector on port 8009 -->
-
-
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host).
- Documentation at /docs/config/engine.html -->
-
- <!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
- -->
- <Engine name="Catalina" defaultHost="localhost">
-
- <!--For clustering, please take a look at documentation at:
- /docs/cluster-howto.html (simple how to)
- /docs/config/cluster.html (reference documentation) -->
- <!--
- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
- -->
-
- <!-- The request dumper valve dumps useful debugging information about
- the request and response data received and sent by Tomcat.
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
- -->
-
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
-
- <!-- Define the default virtual host
- Note: XML Schema validation will not work with Xerces 2.2.
- -->
- <Host name="localhost" appBase="webapps"
- unpackWARs="true" autoDeploy="true"
- xmlValidation="false" xmlNamespaceAware="false">
-
- <!-- SingleSignOn valve, share authentication between web applications
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
- -->
-
- <!-- Access log processes all example.
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
- prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
- -->
-
- </Host>
- </Engine>
- </Service>
-</Server>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/tomcat/ssl-server.xml
----------------------------------------------------------------------
diff --git a/distro/src/main/tomcat/ssl-server.xml b/distro/src/main/tomcat/ssl-server.xml
deleted file mode 100644
index 9a44560..0000000
--- a/distro/src/main/tomcat/ssl-server.xml
+++ /dev/null
@@ -1,152 +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.
--->
-<!-- Note: A "Server" is not itself a "Container", so you may not
- define subcomponents such as "Valves" at this level.
- Documentation at /docs/config/server.html
- -->
-<Server port="${oozie.admin.port}" shutdown="SHUTDOWN">
-
- <!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener" />
- <!-- Prevent memory leaks due to use of particular java/javax APIs-->
- <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
- <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-
- <!-- Global JNDI resources
- Documentation at /docs/jndi-resources-howto.html
- -->
- <GlobalNamingResources>
- <!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users
- -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
- <!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" Note: A "Service" is not itself a "Container",
- so you may not define subcomponents such as "Valves" at this level.
- Documentation at /docs/config/service.html
- -->
- <Service name="Catalina">
-
- <!--The connectors can use a shared executor, you can define one or more named thread pools-->
- <!--
- <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
- maxThreads="150" minSpareThreads="4"/>
- -->
-
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Documentation at :
- Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
- Java AJP Connector: /docs/config/ajp.html
- APR (HTTP/AJP) Connector: /docs/apr.html
- Define a non-SSL HTTP/1.1 Connector on port ${oozie.http.port}
- -->
- <Connector port="${oozie.http.port}" protocol="HTTP/1.1"
- connectionTimeout="20000"
- maxHttpHeaderSize="65536"
- redirectPort="${oozie.https.port}" />
- <!-- A "Connector" using the shared thread pool-->
- <!--
- <Connector executor="tomcatThreadPool"
- port="${oozie.http.port}" protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- -->
- <!-- Define a SSL HTTP/1.1 Connector on port 8443
- This connector uses the JSSE configuration, when using APR, the
- connector should be using the OpenSSL style configuration
- described in the APR documentation -->
-
- <Connector port="${oozie.https.port}" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- maxHttpHeaderSize="65536"
- clientAuth="false" sslEnabledProtocols="TLSv1,SSLv2Hello,TLSv1.1,TLSv1.2"
- keystoreFile="${oozie.https.keystore.file}"
- keystorePass="${oozie.https.keystore.pass}" />
-
- <!-- Define an AJP 1.3 Connector on port 8009 -->
-
-
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host).
- Documentation at /docs/config/engine.html -->
-
- <!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
- -->
- <Engine name="Catalina" defaultHost="localhost">
-
- <!--For clustering, please take a look at documentation at:
- /docs/cluster-howto.html (simple how to)
- /docs/config/cluster.html (reference documentation) -->
- <!--
- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
- -->
-
- <!-- The request dumper valve dumps useful debugging information about
- the request and response data received and sent by Tomcat.
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
- -->
-
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
-
- <!-- Define the default virtual host
- Note: XML Schema validation will not work with Xerces 2.2.
- -->
- <Host name="localhost" appBase="webapps"
- unpackWARs="true" autoDeploy="true"
- xmlValidation="false" xmlNamespaceAware="false">
-
- <!-- SingleSignOn valve, share authentication between web applications
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
- -->
-
- <!-- Access log processes all example.
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
- prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
- -->
-
- </Host>
- </Engine>
- </Service>
-</Server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/distro/src/main/tomcat/ssl-web.xml
----------------------------------------------------------------------
diff --git a/distro/src/main/tomcat/ssl-web.xml b/distro/src/main/tomcat/ssl-web.xml
deleted file mode 100644
index cf0d621..0000000
--- a/distro/src/main/tomcat/ssl-web.xml
+++ /dev/null
@@ -1,295 +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.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd" [
- <!ENTITY web-common SYSTEM "web-common.xml">
-]>
-
-<web-app>
-
- <!--
- ========================================================================
- IMPORTANT: ANY CHANGES TO THE SERVLETS, SERVLET MAPPINGS, LISTENERS, ETC
- MUST BE REFLECTED IN webapp/src/main/webapp/WEB-INF/web.xml
- AS WELL.
- ========================================================================
- -->
-
- <display-name>OOZIE</display-name>
-
- <!-- Listeners -->
- <listener>
- <listener-class>org.apache.oozie.servlet.ServicesLoader</listener-class>
- </listener>
-
- <!-- Servlets -->
- <servlet>
- <servlet-name>versions</servlet-name>
- <display-name>WS API for Workflow Instances</display-name>
- <servlet-class>org.apache.oozie.servlet.VersionServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v0admin</servlet-name>
- <display-name>Oozie admin</display-name>
- <servlet-class>org.apache.oozie.servlet.V0AdminServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v1admin</servlet-name>
- <display-name>Oozie admin</display-name>
- <servlet-class>org.apache.oozie.servlet.V1AdminServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v2admin</servlet-name>
- <display-name>Oozie admin</display-name>
- <servlet-class>org.apache.oozie.servlet.V2AdminServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>callback</servlet-name>
- <display-name>Callback Notification</display-name>
- <servlet-class>org.apache.oozie.servlet.CallbackServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v0jobs</servlet-name>
- <display-name>WS API for Workflow Jobs</display-name>
- <servlet-class>org.apache.oozie.servlet.V0JobsServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v1jobs</servlet-name>
- <display-name>WS API for Workflow Jobs</display-name>
- <servlet-class>org.apache.oozie.servlet.V1JobsServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v0job</servlet-name>
- <display-name>WS API for a specific Workflow Job</display-name>
- <servlet-class>org.apache.oozie.servlet.V0JobServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v1job</servlet-name>
- <display-name>WS API for a specific Workflow Job</display-name>
- <servlet-class>org.apache.oozie.servlet.V1JobServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v2job</servlet-name>
- <display-name>WS API for a specific Workflow Job</display-name>
- <servlet-class>org.apache.oozie.servlet.V2JobServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>sla-event</servlet-name>
- <display-name>WS API for specific SLA Events</display-name>
- <servlet-class>org.apache.oozie.servlet.SLAServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>v2sla</servlet-name>
- <display-name>WS API for specific SLA Events</display-name>
- <servlet-class>org.apache.oozie.servlet.V2SLAServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>validate</servlet-name>
- <display-name>WS API for Workflow Applications</display-name>
- <servlet-class>org.apache.oozie.servlet.V2ValidateServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- servlet-mapping -->
- <servlet-mapping>
- <servlet-name>versions</servlet-name>
- <url-pattern>/versions</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v0admin</servlet-name>
- <url-pattern>/v0/admin/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v1admin</servlet-name>
- <url-pattern>/v1/admin/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v2admin</servlet-name>
- <url-pattern>/v2/admin/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>callback</servlet-name>
- <url-pattern>/callback/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v0jobs</servlet-name>
- <url-pattern>/v0/jobs</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v1jobs</servlet-name>
- <url-pattern>/v1/jobs</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v1jobs</servlet-name>
- <url-pattern>/v2/jobs</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v0job</servlet-name>
- <url-pattern>/v0/job/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v1job</servlet-name>
- <url-pattern>/v1/job/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v2job</servlet-name>
- <url-pattern>/v2/job/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>sla-event</servlet-name>
- <url-pattern>/v1/sla/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>v2sla</servlet-name>
- <url-pattern>/v2/sla/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>validate</servlet-name>
- <url-pattern>/v2/validate</url-pattern>
- </servlet-mapping>
-
- <!-- welcome-file -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
- <filter>
- <filter-name>hostnameFilter</filter-name>
- <filter-class>org.apache.oozie.servlet.HostnameFilter</filter-class>
- </filter>
-
- <filter>
- <filter-name>authenticationfilter</filter-name>
- <filter-class>org.apache.oozie.servlet.AuthFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>hostnameFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/versions/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/v0/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/v1/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/v2/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/index.jsp</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/admin/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>*.js</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/ext-2.2/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/docs/*</url-pattern>
- </filter-mapping>
-
- <!-- Require SSL (HTTPS) for everything except callbacks -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Callback</web-resource-name>
- <url-pattern>/callback/*</url-pattern>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Oozie Resources</web-resource-name>
- <url-pattern>/*</url-pattern>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <!-- Property used by Oozie to determine that SSL (HTTPS) has been enabled -->
- <!-- Do not remove or change this -->
- <context-param>
- <param-name>ssl.enabled</param-name>
- <param-value>true</param-value>
- </context-param>
-
-</web-app>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e67b77..d5db296 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,8 +107,6 @@
<jetty.version>9.2.19.v20160908</jetty.version>
- <!-- Tomcat version -->
- <tomcat.version>6.0.47</tomcat.version>
<jline.version>0.9.94</jline.version>
<openjpa.version>2.4.1</openjpa.version>
<xerces.version>2.10.0</xerces.version>
@@ -2014,11 +2012,5 @@
<spark.bagel.version>1.6.2</spark.bagel.version>
</properties>
</profile>
- <profile>
- <id>tomcat</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 2fd869f..f7b74a2 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.4.0 release (trunk - unreleased)
+OOZIE-2741 Remove Tomcat (asasvari via rkanter)
OOZIE-2745 test-patch should also list the failed tests (gezapeti via rkanter)
OOZIE-2740 oozie help misspelled coordinator (coordiantor) and retrieved (retreived) (gsohn via rkanter)
OOZIE-2690 OOZIE NPE while executing kill() (abhishekbafna via jaydeepvishwakarma)
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/server/src/main/java/org/apache/oozie/server/JspHandler.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/oozie/server/JspHandler.java b/server/src/main/java/org/apache/oozie/server/JspHandler.java
index 9658fd6..453998a 100644
--- a/server/src/main/java/org/apache/oozie/server/JspHandler.java
+++ b/server/src/main/java/org/apache/oozie/server/JspHandler.java
@@ -19,8 +19,6 @@
package org.apache.oozie.server;
import com.google.common.base.Preconditions;
-import org.apache.tomcat.InstanceManager;
-import org.apache.tomcat.SimpleInstanceManager;
import org.eclipse.jetty.annotations.ServletContainerInitializersStarter;
import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
import org.eclipse.jetty.jsp.JettyJspServlet;
@@ -87,7 +85,6 @@ public class JspHandler {
URI baseUri = webRootResourceLocator.getWebRootResourceUri();
servletContextHandler.setResourceBase(baseUri.toASCIIString());
servletContextHandler.setAttribute("org.eclipse.jetty.containerInitializers", jspInitializers());
- servletContextHandler.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager());
servletContextHandler.addBean(new ServletContainerInitializersStarter(servletContextHandler), true);
servletContextHandler.setClassLoader(getUrlClassLoader());
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/src/main/assemblies/distro-jetty.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/distro-jetty.xml b/src/main/assemblies/distro-jetty.xml
deleted file mode 100644
index 6e3db57..0000000
--- a/src/main/assemblies/distro-jetty.xml
+++ /dev/null
@@ -1,155 +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.
--->
-<assembly>
- <id>distro</id>
- <formats>
- <format>dir</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>oozie-${project.version}</baseDirectory>
- <fileSets>
- <!-- Oozie configuration files -->
- <fileSet>
- <directory>${basedir}/../core/src/main/conf/</directory>
- <outputDirectory>/conf</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- <!-- Distro files, readme, licenses, etc -->
- <fileSet>
- <directory>${basedir}/../</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>README.txt</include>
- <include>release-log.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/src/main/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <!-- Client -->
- <fileSet>
- <directory>${basedir}/../client/target/oozie-client-${project.version}-client/oozie-client-${project.version}/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <!-- Tools -->
- <fileSet>
- <directory>${basedir}/../tools/target/oozie-tools-${project.version}-tools/oozie-tools-${project.version}/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../tools/target/oozie-tools-${project.version}-tools/oozie-tools-${project.version}/libtools</directory>
- <outputDirectory>/libtools</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <!-- Oozie Login Server Example war and jar -->
- <fileSet>
- <directory>${basedir}/../login/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>oozie-login.war</include>
- <include>oozie-login.jar</include>
- </includes>
- <fileMode>0555</fileMode>
- </fileSet>
- <!-- Oozie Server - embedded jetty -->
- <fileSet>
- <directory>${basedir}/../server/target/</directory>
- <outputDirectory>/embedded-oozie-server</outputDirectory>
- <includes>
- <include>oozie-server*.jar</include>
- <include>**/jetty*.jar</include>
- <include>**/*jsp*.jar</include>
- <include>**/mail*.jar</include>
- <include>**/apache*.jar</include>
- <include>**/commons-el*.jar</include>
- <include>**/javax.servlet-api-3.1.0.jar</include>
- <include>**/jasper*jar</include>
- <include>**/taglibs-*jar</include>
- <include>**/org.eclipse.jdt.core-*jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../webapp/target/oozie-webapp-${project.version}</directory>
- <outputDirectory>/embedded-oozie-server/webapp</outputDirectory>
- <excludes>
- <exclude>**/web.xml</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <files>
- <!-- Oozie configuration files -->
- <file>
- <source>${basedir}/../core/src/main/resources/oozie-default.xml</source>
- <outputDirectory>/conf</outputDirectory>
- </file>
- <!-- Oozie core jar -->
- <file>
- <source>${basedir}/../core/target/oozie-core-${project.version}.jar</source>
- <outputDirectory>/oozie-core</outputDirectory>
- </file>
- <!-- Oozie core test jar -->
- <file>
- <source>${basedir}/../core/target/oozie-core-${project.version}-tests.jar</source>
- <outputDirectory>/oozie-core</outputDirectory>
- </file>
- <!-- Oozie Documentation -->
- <file>
- <source>${basedir}/../docs/target/oozie-docs-${project.version}-docs.zip</source>
- <outputDirectory>/</outputDirectory>
- <destName>docs.zip</destName>
- </file>
- <!-- Oozie Client TAR.GZ -->
- <file>
- <source>${basedir}/../client/target/oozie-client-${project.version}-client.tar.gz</source>
- <outputDirectory>/</outputDirectory>
- <destName>oozie-client-${project.version}.tar.gz</destName>
- </file>
- <!-- Oozie examples TAR.GZ -->
- <file>
- <source>${basedir}/../examples/target/oozie-examples-${project.version}-examples.tar.gz</source>
- <outputDirectory>/</outputDirectory>
- <destName>oozie-examples.tar.gz</destName>
- </file>
- <!-- Oozie sharelib TAR.GZ -->
- <file>
- <source>${basedir}/../sharelib/target/oozie-sharelib-${project.version}.tar.gz</source>
- <outputDirectory>/</outputDirectory>
- <fileMode>0444</fileMode>
- </file>
- </files>
-</assembly>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/src/main/assemblies/distro-tomcat.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/distro-tomcat.xml b/src/main/assemblies/distro-tomcat.xml
deleted file mode 100644
index 82ba8f9..0000000
--- a/src/main/assemblies/distro-tomcat.xml
+++ /dev/null
@@ -1,153 +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.
--->
-<assembly>
- <id>distro</id>
- <formats>
- <format>dir</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>oozie-${project.version}</baseDirectory>
- <fileSets>
- <!-- Oozie configuration files -->
- <fileSet>
- <directory>${basedir}/../core/src/main/conf/</directory>
- <outputDirectory>/conf</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- <!-- Distro files, readme, licenses, etc -->
- <fileSet>
- <directory>${basedir}/../</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>README.txt</include>
- <include>release-log.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/src/main/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <!-- Client -->
- <fileSet>
- <directory>${basedir}/../client/target/oozie-client-${project.version}-client/oozie-client-${project.version}/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <!-- Tools -->
- <fileSet>
- <directory>${basedir}/../tools/target/oozie-tools-${project.version}-tools/oozie-tools-${project.version}/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../tools/target/oozie-tools-${project.version}-tools/oozie-tools-${project.version}/libtools</directory>
- <outputDirectory>/libtools</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <!-- Embedded Tomcat -->
- <fileSet>
- <directory>${basedir}/target/tomcat/oozie-server</directory>
- <outputDirectory>/oozie-server</outputDirectory>
- <excludes>
- <exclude>bin/*.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/target/tomcat/oozie-server/bin</directory>
- <outputDirectory>/oozie-server/bin</outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- <fileMode>0555</fileMode>
- </fileSet>
- <!-- Oozie Login Server Example war and jar -->
- <fileSet>
- <directory>${basedir}/../login/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>oozie-login.war</include>
- <include>oozie-login.jar</include>
- </includes>
- <fileMode>0555</fileMode>
- </fileSet>
- </fileSets>
- <files>
- <!-- Oozie configuration files -->
- <file>
- <source>${basedir}/../core/src/main/resources/oozie-default.xml</source>
- <outputDirectory>/conf</outputDirectory>
- </file>
- <!-- Oozie core jar -->
- <file>
- <source>${basedir}/../core/target/oozie-core-${project.version}.jar</source>
- <outputDirectory>/oozie-core</outputDirectory>
- </file>
- <!-- Oozie core test jar -->
- <file>
- <source>${basedir}/../core/target/oozie-core-${project.version}-tests.jar</source>
- <outputDirectory>/oozie-core</outputDirectory>
- </file>
- <!-- Oozie war -->
- <file>
- <source>${basedir}/../webapp/target/oozie-webapp-${project.version}.war</source>
- <outputDirectory>/</outputDirectory>
- <destName>oozie.war</destName>
- </file>
- <!-- Oozie Documentation -->
- <file>
- <source>${basedir}/../docs/target/oozie-docs-${project.version}-docs.zip</source>
- <outputDirectory>/</outputDirectory>
- <destName>docs.zip</destName>
- </file>
- <!-- Oozie Client TAR.GZ -->
- <file>
- <source>${basedir}/../client/target/oozie-client-${project.version}-client.tar.gz</source>
- <outputDirectory>/</outputDirectory>
- <destName>oozie-client-${project.version}.tar.gz</destName>
- </file>
- <!-- Oozie examples TAR.GZ -->
- <file>
- <source>${basedir}/../examples/target/oozie-examples-${project.version}-examples.tar.gz</source>
- <outputDirectory>/</outputDirectory>
- <destName>oozie-examples.tar.gz</destName>
- </file>
- <!-- Oozie sharelib TAR.GZ -->
- <file>
- <source>${basedir}/../sharelib/target/oozie-sharelib-${project.version}.tar.gz</source>
- <outputDirectory>/</outputDirectory>
- <fileMode>0444</fileMode>
- </file>
- </files>
-</assembly>
http://git-wip-us.apache.org/repos/asf/oozie/blob/5f53676b/src/main/assemblies/distro.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/distro.xml b/src/main/assemblies/distro.xml
new file mode 100644
index 0000000..6e3db57
--- /dev/null
+++ b/src/main/assemblies/distro.xml
@@ -0,0 +1,155 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>distro</id>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>oozie-${project.version}</baseDirectory>
+ <fileSets>
+ <!-- Oozie configuration files -->
+ <fileSet>
+ <directory>${basedir}/../core/src/main/conf/</directory>
+ <outputDirectory>/conf</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ <!-- Distro files, readme, licenses, etc -->
+ <fileSet>
+ <directory>${basedir}/../</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
+ <include>release-log.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/src/main/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <!-- Client -->
+ <fileSet>
+ <directory>${basedir}/../client/target/oozie-client-${project.version}-client/oozie-client-${project.version}/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <!-- Tools -->
+ <fileSet>
+ <directory>${basedir}/../tools/target/oozie-tools-${project.version}-tools/oozie-tools-${project.version}/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../tools/target/oozie-tools-${project.version}-tools/oozie-tools-${project.version}/libtools</directory>
+ <outputDirectory>/libtools</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <!-- Oozie Login Server Example war and jar -->
+ <fileSet>
+ <directory>${basedir}/../login/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>oozie-login.war</include>
+ <include>oozie-login.jar</include>
+ </includes>
+ <fileMode>0555</fileMode>
+ </fileSet>
+ <!-- Oozie Server - embedded jetty -->
+ <fileSet>
+ <directory>${basedir}/../server/target/</directory>
+ <outputDirectory>/embedded-oozie-server</outputDirectory>
+ <includes>
+ <include>oozie-server*.jar</include>
+ <include>**/jetty*.jar</include>
+ <include>**/*jsp*.jar</include>
+ <include>**/mail*.jar</include>
+ <include>**/apache*.jar</include>
+ <include>**/commons-el*.jar</include>
+ <include>**/javax.servlet-api-3.1.0.jar</include>
+ <include>**/jasper*jar</include>
+ <include>**/taglibs-*jar</include>
+ <include>**/org.eclipse.jdt.core-*jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../webapp/target/oozie-webapp-${project.version}</directory>
+ <outputDirectory>/embedded-oozie-server/webapp</outputDirectory>
+ <excludes>
+ <exclude>**/web.xml</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ <files>
+ <!-- Oozie configuration files -->
+ <file>
+ <source>${basedir}/../core/src/main/resources/oozie-default.xml</source>
+ <outputDirectory>/conf</outputDirectory>
+ </file>
+ <!-- Oozie core jar -->
+ <file>
+ <source>${basedir}/../core/target/oozie-core-${project.version}.jar</source>
+ <outputDirectory>/oozie-core</outputDirectory>
+ </file>
+ <!-- Oozie core test jar -->
+ <file>
+ <source>${basedir}/../core/target/oozie-core-${project.version}-tests.jar</source>
+ <outputDirectory>/oozie-core</outputDirectory>
+ </file>
+ <!-- Oozie Documentation -->
+ <file>
+ <source>${basedir}/../docs/target/oozie-docs-${project.version}-docs.zip</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>docs.zip</destName>
+ </file>
+ <!-- Oozie Client TAR.GZ -->
+ <file>
+ <source>${basedir}/../client/target/oozie-client-${project.version}-client.tar.gz</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>oozie-client-${project.version}.tar.gz</destName>
+ </file>
+ <!-- Oozie examples TAR.GZ -->
+ <file>
+ <source>${basedir}/../examples/target/oozie-examples-${project.version}-examples.tar.gz</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>oozie-examples.tar.gz</destName>
+ </file>
+ <!-- Oozie sharelib TAR.GZ -->
+ <file>
+ <source>${basedir}/../sharelib/target/oozie-sharelib-${project.version}.tar.gz</source>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>0444</fileMode>
+ </file>
+ </files>
+</assembly>