falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srik...@apache.org
Subject [3/3] git commit: FALCON-66 Make oozie version change configurable. Contributed by Shwetha GS
Date Tue, 10 Dec 2013 05:12:25 GMT
FALCON-66 Make oozie version change configurable. Contributed by Shwetha GS


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/73e54e04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/73e54e04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/73e54e04

Branch: refs/heads/master
Commit: 73e54e04bd3015f895174890a0aae868cac7b796
Parents: 3825357
Author: srikanth.sundarrajan <srikanth.sundarrajan@inmobi.com>
Authored: Tue Dec 10 10:41:40 2013 +0530
Committer: srikanth.sundarrajan <srikanth.sundarrajan@inmobi.com>
Committed: Tue Dec 10 10:41:40 2013 +0530

----------------------------------------------------------------------
 CHANGES.txt                                     |    2 +
 build-tools/pom.xml                             |   19 +-
 build-tools/src/bin/build-oozie.sh              |   96 ++
 build-tools/src/bin/oozie-patch-pkg.sh          |   49 -
 .../resources/falcon/checkstyle-java-header.txt |   17 -
 .../resources/falcon/checkstyle-noframes.xsl    |  218 ----
 .../src/main/resources/falcon/checkstyle.xml    |  233 ----
 .../main/resources/falcon/findbugs-exclude.xml  |   34 -
 .../src/patch/oozie-1551-hadoop-2-profile.patch |   63 -
 build-tools/src/patch/oozie-4.0.0-falcon.patch  | 1075 ------------------
 .../src/patch/oozie-bundle-el-extension.patch   |   18 -
 build-tools/src/patches/OOZIE-1465-3.3.2.patch  |   15 +
 build-tools/src/patches/OOZIE-1465.patch        |   15 +
 .../src/patches/OOZIE-674-v6-3.2.0.patch        |  370 ++++++
 build-tools/src/patches/OOZIE-674-v6.patch      |  481 ++++++++
 build-tools/src/patches/OOZIE-882.patch         |   28 +
 build-tools/src/patches/oozie-site.patch        |  177 +++
 checkstyle/pom.xml                              |   28 +
 .../resources/falcon/checkstyle-java-header.txt |   17 +
 .../resources/falcon/checkstyle-noframes.xsl    |  218 ++++
 .../src/main/resources/falcon/checkstyle.xml    |  233 ++++
 .../main/resources/falcon/findbugs-exclude.xml  |   34 +
 docs/src/site/twiki/InstallationSteps.twiki     |   11 +-
 hadoop-webapp/pom.xml                           |   18 +-
 .../src/main/resources/oozie-log4j.properties   |   43 -
 .../oozie/extensions/OozieELExtensions.java     |   26 +-
 .../oozie/extensions/TestOozieELExtensions.java |   19 +-
 .../src/test/resources/oozie-site.xml           |   13 +
 .../falcon/workflow/engine/NullBundleJob.java   |    1 -
 .../falcon/workflow/engine/NullCoordJob.java    |  158 ---
 .../workflow/engine/OozieWorkflowEngine.java    |    7 +-
 pom.xml                                         |   59 +-
 process/pom.xml                                 |    5 +
 src/bin/package.sh                              |   48 +-
 src/bin/service-start.sh                        |    2 +-
 src/conf/startup.properties                     |    2 +-
 webapp/pom.xml                                  |    2 +-
 .../src/conf/oozie/conf/oozie-log4j.properties  |   43 +
 webapp/src/conf/oozie/conf/oozie-site.xml       |    1 -
 39 files changed, 1915 insertions(+), 1983 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 74d1472..3f21903 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ Trunk (Unreleased)
   NEW FEATURES
 
   IMPROVEMENTS
+    FALCON-66 Make oozie version change configurable. (Shwetha GS
+    via Srikanth Sundarrajan)
 
   OPTIMIZATIONS
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 1a18200..7a020d3 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -21,9 +21,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.falcon</groupId>
+        <artifactId>falcon-main</artifactId>
+        <version>0.5-incubating-SNAPSHOT</version>
+    </parent>
     <groupId>org.apache.falcon</groupId>
     <artifactId>build-tools</artifactId>
-    <version>0.5-incubating-SNAPSHOT</version>
     <name>Build Tools</name>
 
     <build>
@@ -31,7 +35,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.1</version>
+                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>BUILD-OOZIE</id>
@@ -39,11 +43,16 @@
                         <goals>
                             <goal>exec</goal>
                         </goals>
-                        <configuration>
-                            <executable>src/bin/oozie-patch-pkg.sh</executable>
-                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <executable>src/bin/build-oozie.sh</executable>
+                    <arguments>
+                        <argument>${oozie.version}</argument>
+                        <argument>${oozie.buildversion}</argument>
+                        <argument>${oozie.forcebuild}</argument>
+                    </arguments>
+                </configuration>
             </plugin>
         </plugins>
     </build>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/bin/build-oozie.sh
----------------------------------------------------------------------
diff --git a/build-tools/src/bin/build-oozie.sh b/build-tools/src/bin/build-oozie.sh
new file mode 100755
index 0000000..2b47a4f
--- /dev/null
+++ b/build-tools/src/bin/build-oozie.sh
@@ -0,0 +1,96 @@
+#!/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.
+
+set -e
+set -x
+
+VERSION=$1
+BUILD_VERSION=$2
+FORCE_BUILD=$3
+
+echo "oozie version $OOZIE_VERSION"
+
+if [[ ($FORCE_BUILD == 'false') && ( -f `mvn help:effective-settings | grep localRepository | cut -d\> -f2 | cut -d\< -f1`/org/apache/oozie/oozie-webapp/$BUILD_VERSION/oozie-webapp-$BUILD_VERSION.war) ]]
+then
+    echo "Oozie already setup. skipping";
+    exit 0;
+fi
+
+PKG_URL="http://www.apache.org/dist/oozie/$VERSION/oozie-$VERSION.tar.gz"
+if [ $VERSION == '3.1.3-incubating' ]
+then
+    PKG_URL="http://www.apache.org/dist/oozie/$VERSION/oozie-$VERSION-src.tar.gz"
+fi
+
+PKG=oozie-$VERSION
+
+mkdir -p ../target
+pushd ../target
+rm -rf oozie-*
+
+curl -v $PKG_URL -o oozie-$VERSION.tgz
+tar -xzvf oozie-$VERSION.tgz
+rm oozie-$VERSION.tgz
+cd $PKG
+
+case $VERSION in
+3.2.0-incubating )
+    sed -i .bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
+    patch -p0 < ../../build-tools/src/patches/oozie-site.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-882.patch
+    ;;
+3.3.0 )
+    sed -i .bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
+    patch -p0 < ../../build-tools/src/patches/oozie-site.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
+    ;;
+3.3.1 )
+    sed -i .bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
+    patch -p0 < ../../build-tools/src/patches/oozie-site.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
+    ;;
+3.3.2 )
+    sed -i .bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
+    patch -p0 < ../../build-tools/src/patches/oozie-site.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6.patch
+    patch -p0 < ../../build-tools/src/patches/OOZIE-1465-3.3.2.patch
+    ;;
+4* )
+    sed -i .bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
+    patch -p0 < ../../build-tools/src/patches/oozie-site.patch
+    ;;
+esac
+
+rm `find . -name 'pom.xml.bak'`
+
+
+if [ -z "${MAVEN_HOME}" ]
+then
+    export MVN_CMD=`which mvn`;
+else
+    export MVN_CMD=${MAVEN_HOME}/bin/mvn;
+fi
+
+echo "Using maven from " $MVN_CMD
+$MVN_CMD clean install -DskipTests
+
+popd

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/bin/oozie-patch-pkg.sh
----------------------------------------------------------------------
diff --git a/build-tools/src/bin/oozie-patch-pkg.sh b/build-tools/src/bin/oozie-patch-pkg.sh
deleted file mode 100755
index fdc0392..0000000
--- a/build-tools/src/bin/oozie-patch-pkg.sh
+++ /dev/null
@@ -1,49 +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.
-
-set -e
-
-if [ -z "${MAVEN_HOME}" ]
-then
-    export MVN_CMD=`which mvn`;
-else
-    export MVN_CMD=${MAVEN_HOME}/bin/mvn;
-fi
-echo "Using maven from " $MVN_CMD
-
-if [ -d `$MVN_CMD help:effective-settings | grep localRepository | cut -d\> -f2 | cut -d\< -f1`/org/apache/oozie/oozie-core/4.0.0-falcon ]
-then
-    echo "Oozie already setup. skipping";
-    exit 0;
-fi
-
-mkdir -p ../target
-pushd ../target
-rm -rf oozie-4.0.0*
-curl -v "http://www.apache.org/dist/oozie/4.0.0/oozie-4.0.0.tar.gz" -o oozie-4.0.0.tgz
-tar -xzvf oozie-4.0.0.tgz
-cd oozie-4.0.0
-pwd
-
-patch -p1 < ../../build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
-patch -p0 < ../../build-tools/src/patch/oozie-4.0.0-falcon.patch
-
-$MVN_CMD clean install -DskipTests
-cd ..
-rm -rf oozie-4.0.0*
-popd

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/main/resources/falcon/checkstyle-java-header.txt
----------------------------------------------------------------------
diff --git a/build-tools/src/main/resources/falcon/checkstyle-java-header.txt b/build-tools/src/main/resources/falcon/checkstyle-java-header.txt
deleted file mode 100644
index 5d5f1e3..0000000
--- a/build-tools/src/main/resources/falcon/checkstyle-java-header.txt
+++ /dev/null
@@ -1,17 +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.
- */

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/main/resources/falcon/checkstyle-noframes.xsl
----------------------------------------------------------------------
diff --git a/build-tools/src/main/resources/falcon/checkstyle-noframes.xsl b/build-tools/src/main/resources/falcon/checkstyle-noframes.xsl
deleted file mode 100644
index 6308ef8..0000000
--- a/build-tools/src/main/resources/falcon/checkstyle-noframes.xsl
+++ /dev/null
@@ -1,218 +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.
-  -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <xsl:output method="html" indent="yes"/>
-    <xsl:decimal-format decimal-separator="." grouping-separator=","/>
-
-    <xsl:key name="files" match="file" use="@name"/>
-
-    <!-- Checkstyle XML Style Sheet by Stephane Bailliez <sbailliez@apache.org>         -->
-    <!-- Part of the Checkstyle distribution found at http://checkstyle.sourceforge.net -->
-    <!-- Usage (generates checkstyle_report.html):                                      -->
-    <!--    <checkstyle failonviolation="false" config="${check.config}">               -->
-    <!--      <fileset dir="${src.dir}" includes="**/*.java"/>                          -->
-    <!--      <formatter type="xml" toFile="${doc.dir}/checkstyle_report.xml"/>         -->
-    <!--    </checkstyle>                                                               -->
-    <!--    <style basedir="${doc.dir}" destdir="${doc.dir}"                            -->
-    <!--            includes="checkstyle_report.xml"                                    -->
-    <!--            style="${doc.dir}/checkstyle-noframes-sorted.xsl"/>                 -->
-
-    <xsl:template match="checkstyle">
-        <html>
-            <head>
-                <style type="text/css">
-                    .bannercell {
-                    border: 0px;
-                    padding: 0px;
-                    }
-                    body {
-                    margin-left: 10;
-                    margin-right: 10;
-                    font:normal 80% arial,helvetica,sanserif;
-                    background-color:#FFFFFF;
-                    color:#000000;
-                    }
-                    .a td {
-                    background: #efefef;
-                    }
-                    .b td {
-                    background: #fff;
-                    }
-                    th, td {
-                    text-align: left;
-                    vertical-align: top;
-                    }
-                    th {
-                    font-weight:bold;
-                    background: #ccc;
-                    color: black;
-                    }
-                    table, th, td {
-                    font-size:100%;
-                    border: none
-                    }
-                    table.log tr td, tr th {
-
-                    }
-                    h2 {
-                    font-weight:bold;
-                    font-size:140%;
-                    margin-bottom: 5;
-                    }
-                    h3 {
-                    font-size:100%;
-                    font-weight:bold;
-                    background: #525D76;
-                    color: white;
-                    text-decoration: none;
-                    padding: 5px;
-                    margin-right: 2px;
-                    margin-left: 2px;
-                    margin-bottom: 0;
-                    }
-                </style>
-            </head>
-            <body>
-                <a name="top"></a>
-                <!-- jakarta logo -->
-                <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                    <tr>
-                        <td class="bannercell" rowspan="2">
-                            <!--a href="http://jakarta.apache.org/">
-                            <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
-                            </a-->
-                        </td>
-                        <td class="text-align:right">
-                            <h2>CheckStyle Audit</h2>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="text-align:right">Designed for use with
-                            <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a>
-                            and<a href='http://jakarta.apache.org'>Ant</a>.
-                        </td>
-                    </tr>
-                </table>
-                <hr size="1"/>
-
-                <!-- Summary part -->
-                <xsl:apply-templates select="." mode="summary"/>
-                <hr size="1" width="100%" align="left"/>
-
-                <!-- Package List part -->
-                <xsl:apply-templates select="." mode="filelist"/>
-                <hr size="1" width="100%" align="left"/>
-
-                <!-- For each package create its part -->
-                <xsl:apply-templates select="file[@name and generate-id(.) = generate-id(key('files', @name))]"/>
-
-                <hr size="1" width="100%" align="left"/>
-
-
-            </body>
-        </html>
-    </xsl:template>
-
-
-    <xsl:template match="checkstyle" mode="filelist">
-        <h3>Files</h3>
-        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-            <tr>
-                <th>Name</th>
-                <th>Errors</th>
-            </tr>
-            <xsl:for-each select="file[@name and generate-id(.) = generate-id(key('files', @name))]">
-                <xsl:sort data-type="number" order="descending" select="count(key('files', @name)/error)"/>
-                <xsl:variable name="errorCount" select="count(error)"/>
-                <tr>
-                    <xsl:call-template name="alternated-row"/>
-                    <td>
-                        <a href="#f-{@name}">
-                            <xsl:value-of select="@name"/>
-                        </a>
-                    </td>
-                    <td>
-                        <xsl:value-of select="$errorCount"/>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-    </xsl:template>
-
-
-    <xsl:template match="file">
-        <a name="f-{@name}"></a>
-        <h3>File
-            <xsl:value-of select="@name"/>
-        </h3>
-
-        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-            <tr>
-                <th>Error Description</th>
-                <th>Line</th>
-            </tr>
-            <xsl:for-each select="key('files', @name)/error">
-                <xsl:sort data-type="number" order="ascending" select="@line"/>
-                <tr>
-                    <xsl:call-template name="alternated-row"/>
-                    <td>
-                        <xsl:value-of select="@message"/>
-                    </td>
-                    <td>
-                        <xsl:value-of select="@line"/>
-                    </td>
-                </tr>
-            </xsl:for-each>
-        </table>
-        <a href="#top">Back to top</a>
-    </xsl:template>
-
-
-    <xsl:template match="checkstyle" mode="summary">
-        <h3>Summary</h3>
-        <xsl:variable name="fileCount"
-                      select="count(file[@name and generate-id(.) = generate-id(key('files', @name))])"/>
-        <xsl:variable name="errorCount" select="count(file/error)"/>
-        <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-            <tr>
-                <th>Files</th>
-                <th>Errors</th>
-            </tr>
-            <tr>
-                <xsl:call-template name="alternated-row"/>
-                <td>
-                    <xsl:value-of select="$fileCount"/>
-                </td>
-                <td>
-                    <xsl:value-of select="$errorCount"/>
-                </td>
-            </tr>
-        </table>
-    </xsl:template>
-
-    <xsl:template name="alternated-row">
-        <xsl:attribute name="class">
-            <xsl:if test="position() mod 2 = 1">a</xsl:if>
-            <xsl:if test="position() mod 2 = 0">b</xsl:if>
-        </xsl:attribute>
-    </xsl:template>
-</xsl:stylesheet>
-
-

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/main/resources/falcon/checkstyle.xml
----------------------------------------------------------------------
diff --git a/build-tools/src/main/resources/falcon/checkstyle.xml b/build-tools/src/main/resources/falcon/checkstyle.xml
deleted file mode 100644
index 6525990..0000000
--- a/build-tools/src/main/resources/falcon/checkstyle.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.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.
-  -->
-
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
-  Checkstyle configuration for Falcon that is based on the sun_checks.xml file
-  that is bundled with Checkstyle and includes checks for:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
-    <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <!-- module name="PackageHtml"/ -->
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks for Headers                                -->
-    <!-- See http://checkstyle.sf.net/config_header.html   -->
-    <module name="Header">
-        <property name="headerFile" value="build-tools/src/main/resources/falcon/checkstyle-java-header.txt"/>
-    </module>
-
-    <module name="FileLength"/>
-    <module name="FileTabCharacter"/>
-
-    <module name="TreeWalker">
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocType">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-        </module>
-        <module name="JavadocStyle"/>
-
-        <module name="SuperClone"/>
-        <module name="SuperFinalize"/>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="^[A-Z]+$"/>
-        </module>
-        <module name="LocalFinalVariableName">
-            <!--<property name="format" value="^[A-Z][_A-Z0-9]*$"/>-->
-        </module>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="^[A-Z]+$"/>
-        </module>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="IllegalImport"/>
-        <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
-        <module name="MethodLength"/>
-        <module name="ParameterNumber"/>
-        <module name="OuterTypeNumber"/>
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="GenericWhitespace"/>
-        <module name="EmptyForIteratorPad"/>
-        <module name="MethodParamPad"/>
-        <module name="WhitespaceAround">
-            <property name="tokens" value="LITERAL_IF"/>
-        </module>
-        <module name="NoWhitespaceAfter">
-            <property name="tokens"
-                      value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
-        </module>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter">
-            <property name="tokens" value="COMMA, SEMI"/>
-        </module>
-
-        <module name="Regexp">
-            <property name="format" value="[ \t]+$"/>
-            <property name="illegalPattern" value="true"/>
-            <property name="message" value="Trailing whitespace"/>
-        </module>
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock">
-            <!-- catch blocks need a statement or a comment. -->
-            <property name="option" value="text"/>
-            <property name="tokens" value="LITERAL_CATCH"/>
-        </module>
-        <module name="EmptyBlock">
-            <!-- all other blocks need a real statement. -->
-            <property name="option" value="stmt"/>
-            <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
-          LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT,
-          STATIC_INIT"/>
-        </module>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- module name="AvoidInlineConditionals"/-->
-        <module name="DoubleCheckedLocking"/>
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="StringLiteralEquality"/>
-        <module name="HiddenField">
-            <property name="ignoreConstructorParameter" value="true"/>
-            <property name="ignoreAbstractMethods" value="true"/>
-            <property name="ignoreSetter" value="true"/>
-        </module>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="RedundantThrows"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-        <module name="DefaultComesLast"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier">
-            <property name="protectedAllowed" value="true"/>
-        </module>
-        <module name="MissingOverride"/>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="ArrayTrailingComma"/>
-        <!--
-          This generates too many false-positives on wrapped 'throws' clauses
-          to be really useful. Disabled for now.
-
-          Falcon style is:
-          * Spaces, not tabs.
-          * Indent by four spaces.
-          * Indent by four spaces when wrapping a line.
-        -->
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="caseIndent" value="0"/>
-        </module>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-
-        <module name="FileContentsHolder"/>
-    </module>
-
-    <!-- allow warnings to be suppressed -->
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="SUSPEND CHECKSTYLE CHECK ParameterNumberCheck|VisibilityModifierCheck|HiddenFieldCheck|MethodName"/>
-        <property name="onCommentFormat" value="RESUME CHECKSTYLE CHECK ParameterNumberCheck|VisibilityModifierCheck|HiddenFieldCheck|MethodName"/>
-        <property name="checkFormat" value="ParameterNumberCheck|VisibilityModifierCheck|HiddenFieldCheck|MethodName"/>
-    </module>
-
-</module>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/main/resources/falcon/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/build-tools/src/main/resources/falcon/findbugs-exclude.xml b/build-tools/src/main/resources/falcon/findbugs-exclude.xml
deleted file mode 100644
index 0a7580d..0000000
--- a/build-tools/src/main/resources/falcon/findbugs-exclude.xml
+++ /dev/null
@@ -1,34 +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.
- -->
-<FindBugsFilter>
-    <!-- These are generated by xjc compiler and hence excluded. -->
-    <Match>
-        <Or>
-            <Class name="~org.apache.falcon.entity.v0.feed.Validity" />
-            <Class name="~org.apache.falcon.entity.v0.process.Validity" />
-        </Or>
-    </Match>
-
-    <!--
-    Disable encoding as this might give an impression that Falcon code base is
-    "Internationalization" ready, but we haven't done anything consciously to guarantee that.
-    -->
-    <Match>
-        <Bug pattern="DM_DEFAULT_ENCODING" />
-    </Match>
-</FindBugsFilter>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch b/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
deleted file mode 100644
index 3a4d496..0000000
--- a/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN oozie-4.0.0/hadooplibs/hadoop-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-2/pom.xml
---- oozie-4.0.0/hadooplibs/hadoop-2/pom.xml	2013-08-27 12:47:42.000000000 -0700
-+++ oozie-4.0.0-new/hadooplibs/hadoop-2/pom.xml	2013-11-12 13:06:07.000000000 -0800
-@@ -27,7 +27,7 @@
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop</artifactId>
--    <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+    <version>2.2.0.oozie-4.0.0</version>
-     <description>Apache Oozie Hadoop ${project.version}</description>
-     <name>Apache Oozie Hadoop ${project.version}</name>
-     <packaging>jar</packaging>
-@@ -36,7 +36,7 @@
-         <dependency>
-             <groupId>org.apache.hadoop</groupId>
-             <artifactId>hadoop-client</artifactId>
--            <version>2.2.0-SNAPSHOT</version>
-+            <version>2.2.0</version>
-             <scope>compile</scope>
-         </dependency>
-     </dependencies>
-diff -urN oozie-4.0.0/hadooplibs/hadoop-distcp-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-distcp-2/pom.xml
---- oozie-4.0.0/hadooplibs/hadoop-distcp-2/pom.xml	2013-08-27 12:47:42.000000000 -0700
-+++ oozie-4.0.0-new/hadooplibs/hadoop-distcp-2/pom.xml	2013-11-12 13:06:19.000000000 -0800
-@@ -27,7 +27,7 @@
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-distcp</artifactId>
--    <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+    <version>2.2.0.oozie-4.0.0</version>
-     <description>Apache Oozie Hadoop Distcp ${project.version}</description>
-     <name>Apache Oozie Hadoop Distcp ${project.version}</name>
-     <packaging>jar</packaging>
-@@ -36,7 +36,7 @@
-         <dependency>
-             <groupId>org.apache.hadoop</groupId>
-             <artifactId>hadoop-distcp</artifactId>
--            <version>2.2.0-SNAPSHOT</version>
-+            <version>2.2.0</version>
-             <scope>compile</scope>
-         </dependency>
-     </dependencies>
-diff -urN oozie-4.0.0/hadooplibs/hadoop-test-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-test-2/pom.xml
---- oozie-4.0.0/hadooplibs/hadoop-test-2/pom.xml	2013-08-27 12:47:42.000000000 -0700
-+++ oozie-4.0.0-new/hadooplibs/hadoop-test-2/pom.xml	2013-11-12 13:06:30.000000000 -0800
-@@ -27,7 +27,7 @@
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-test</artifactId>
--    <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+    <version>2.2.0.oozie-4.0.0</version>
-     <description>Apache Oozie Hadoop ${project.version} Test</description>
-     <name>Apache Oozie Hadoop ${project.version} Test</name>
-     <packaging>jar</packaging>
-@@ -36,7 +36,7 @@
-         <dependency>
-             <groupId>org.apache.hadoop</groupId>
-             <artifactId>hadoop-minicluster</artifactId>
--            <version>2.2.0-SNAPSHOT</version>
-+            <version>2.2.0</version>
-             <scope>compile</scope>
-         </dependency>
-     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/patch/oozie-4.0.0-falcon.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patch/oozie-4.0.0-falcon.patch b/build-tools/src/patch/oozie-4.0.0-falcon.patch
deleted file mode 100644
index e5632f7..0000000
--- a/build-tools/src/patch/oozie-4.0.0-falcon.patch
+++ /dev/null
@@ -1,1075 +0,0 @@
-Index: hadooplibs/hadoop-test-1/pom.xml
-===================================================================
---- hadooplibs/hadoop-test-1/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-test-1/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-test</artifactId>
--    <version>1.1.1.oozie-4.0.0</version>
-+    <version>1.1.1.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop ${project.version} Test</description>
-     <name>Apache Oozie Hadoop ${project.version} Test</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-test-2/pom.xml
-===================================================================
---- hadooplibs/hadoop-test-2/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-test-2/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-test</artifactId>
--    <version>2.2.0.oozie-4.0.0</version>
-+    <version>2.2.0.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop ${project.version} Test</description>
-     <name>Apache Oozie Hadoop ${project.version} Test</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-test-0.23/pom.xml
-===================================================================
---- hadooplibs/hadoop-test-0.23/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-test-0.23/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-test</artifactId>
--    <version>0.23.5.oozie-4.0.0</version>
-+    <version>0.23.5.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop ${project.version} Test</description>
-     <name>Apache Oozie Hadoop ${project.version} Test</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-test-3/pom.xml
-===================================================================
---- hadooplibs/hadoop-test-3/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-test-3/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-test</artifactId>
--    <version>3.0.0-SNAPSHOT.oozie-4.0.0</version>
-+    <version>3.0.0-SNAPSHOT.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop ${project.version} Test</description>
-     <name>Apache Oozie Hadoop ${project.version} Test</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-1/pom.xml
-===================================================================
---- hadooplibs/hadoop-1/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-1/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop</artifactId>
--    <version>1.1.1.oozie-4.0.0</version>
-+    <version>1.1.1.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop ${project.version}</description>
-     <name>Apache Oozie Hadoop ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-2/pom.xml
-===================================================================
---- hadooplibs/hadoop-2/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-2/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop</artifactId>
--    <version>2.2.0.oozie-4.0.0</version>
-+    <version>2.2.0.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop ${project.version}</description>
-     <name>Apache Oozie Hadoop ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-0.23/pom.xml
-===================================================================
---- hadooplibs/hadoop-0.23/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-0.23/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop</artifactId>
--    <version>0.23.5.oozie-4.0.0</version>
-+    <version>0.23.5.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop ${project.version}</description>
-     <name>Apache Oozie Hadoop ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-3/pom.xml
-===================================================================
---- hadooplibs/hadoop-3/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-3/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop</artifactId>
--    <version>3.0.0-SNAPSHOT.oozie-4.0.0</version>
-+    <version>3.0.0-SNAPSHOT.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop ${project.version}</description>
-     <name>Apache Oozie Hadoop ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/pom.xml
-===================================================================
---- hadooplibs/pom.xml	(revision 1521237)
-+++ hadooplibs/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadooplibs</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop Libs</description>
-     <name>Apache Oozie Hadoop Libs</name>
-     <packaging>pom</packaging>
-Index: hadooplibs/hadoop-distcp-1/pom.xml
-===================================================================
---- hadooplibs/hadoop-distcp-1/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-distcp-1/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-distcp</artifactId>
--    <version>1.1.1.oozie-4.0.0</version>
-+    <version>1.1.1.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop Distcp ${project.version}</description>
-     <name>Apache Oozie Hadoop Distcp ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-distcp-2/pom.xml
-===================================================================
---- hadooplibs/hadoop-distcp-2/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-distcp-2/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-distcp</artifactId>
--    <version>2.2.0.oozie-4.0.0</version>
-+    <version>2.2.0.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop Distcp ${project.version}</description>
-     <name>Apache Oozie Hadoop Distcp ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-distcp-0.23/pom.xml
-===================================================================
---- hadooplibs/hadoop-distcp-0.23/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-distcp-0.23/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-distcp</artifactId>
--    <version>0.23.5.oozie-4.0.0</version>
-+    <version>0.23.5.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop Distcp ${project.version}</description>
-     <name>Apache Oozie Hadoop Distcp ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hadooplibs/hadoop-distcp-3/pom.xml
-===================================================================
---- hadooplibs/hadoop-distcp-3/pom.xml	(revision 1521237)
-+++ hadooplibs/hadoop-distcp-3/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hadoop-distcp</artifactId>
--    <version>3.0.0-SNAPSHOT.oozie-4.0.0</version>
-+    <version>3.0.0-SNAPSHOT.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hadoop Distcp ${project.version}</description>
-     <name>Apache Oozie Hadoop Distcp ${project.version}</name>
-     <packaging>jar</packaging>
-Index: docs/pom.xml
-===================================================================
---- docs/pom.xml	(revision 1521237)
-+++ docs/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-docs</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Docs</description>
-     <name>Apache Oozie Docs</name>
-     <packaging>war</packaging>
-Index: core/src/main/conf/oozie-site.xml
-===================================================================
---- core/src/main/conf/oozie-site.xml	(revision 1521237)
-+++ core/src/main/conf/oozie-site.xml	(working copy)
-@@ -127,7 +127,7 @@
- 
-     <property>
-         <name>oozie.service.JPAService.create.db.schema</name>
--        <value>false</value>
-+        <value>true</value>
-         <description>
-             Creates Oozie DB.
- 
-@@ -336,6 +336,164 @@
-         </description>
-     </property>
- 
-+    <!-- HCatalog Integration Properties -->
-+    <property>
-+        <name>oozie.service.URIHandlerService.uri.handlers</name>
-+        <value>org.apache.oozie.dependency.FSURIHandler,org.apache.oozie.dependency.HCatURIHandler</value>
-+        <description>
-+            Enlist the different uri handlers supported for data availability checks.
-+        </description>
-+    </property>
-+
-+    <property>
-+        <name>oozie.services.ext</name>
-+        <value>
-+            org.apache.oozie.service.JMSAccessorService,
-+            org.apache.oozie.service.PartitionDependencyManagerService,
-+            org.apache.oozie.service.HCatAccessorService
-+        </value>
-+        <description>
-+            To add/replace services defined in 'oozie.services' with custom implementations.
-+            Class names must be separated by commas.
-+        </description>
-+    </property>
-+
-+    <!-- Coord EL Functions Properties -->
-+    <property>
-+        <name>oozie.service.ELService.ext.functions.coord-job-submit-instances</name>
-+        <value>
-+            now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
-+            today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
-+            yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
-+            currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
-+            lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
-+            currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
-+            lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
-+            formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
-+            latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
-+            future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo
-+        </value>
-+        <description>
-+            EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
-+            This property is a convenience property to add extensions to the built in executors without having to
-+            include all the built in ones.
-+        </description>
-+    </property>
-+
-+    <property>
-+        <name>oozie.service.ELService.ext.functions.coord-action-create-inst</name>
-+        <value>
-+            now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,
-+            today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,
-+            yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst,
-+            currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst,
-+            lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst,
-+            currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst,
-+            lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst,
-+            latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
-+            future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
-+            formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
-+            user=org.apache.oozie.coord.CoordELFunctions#coord_user
-+        </value>
-+        <description>
-+            EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
-+            This property is a convenience property to add extensions to the built in executors without having to
-+            include all the built in ones.
-+        </description>
-+    </property>
-+
-+    <property>
-+        <name>oozie.service.ELService.ext.functions.coord-action-create</name>
-+        <value>
-+            now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
-+            today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
-+            yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
-+            currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,
-+            lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,
-+            currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,
-+            lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,
-+            latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
-+            future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
-+            formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
-+            user=org.apache.oozie.coord.CoordELFunctions#coord_user
-+        </value>
-+        <description>
-+            EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
-+            This property is a convenience property to add extensions to the built in executors without having to
-+            include all the built in ones.
-+        </description>
-+    </property>
-+
-+    <property>
-+        <name>oozie.service.ELService.ext.functions.coord-job-submit-data</name>
-+        <value>
-+            now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
-+            today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
-+            yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
-+            currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
-+            lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
-+            currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
-+            lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
-+            dataIn=org.apache.oozie.extensions.OozieELExtensions#ph1_dataIn_echo,
-+            instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_wrap,
-+            formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
-+            dateOffset=org.apache.oozie.coord.CoordELFunctions#ph1_coord_dateOffset_echo,
-+            user=org.apache.oozie.coord.CoordELFunctions#coord_user
-+        </value>
-+        <description>
-+            EL constant declarations, separated by commas, format is [PREFIX:]NAME=CLASS#CONSTANT.
-+            This property is a convenience property to add extensions to the built in executors without having to
-+            include all the built in ones.
-+        </description>
-+    </property>
-+
-+    <property>
-+        <name>oozie.service.ELService.ext.functions.coord-action-start</name>
-+        <value>
-+            now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
-+            today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
-+            yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
-+            currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,
-+            lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,
-+            currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,
-+            lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,
-+            latest=org.apache.oozie.coord.CoordELFunctions#ph3_coord_latest,
-+            future=org.apache.oozie.coord.CoordELFunctions#ph3_coord_future,
-+            dataIn=org.apache.oozie.extensions.OozieELExtensions#ph3_dataIn,
-+            instanceTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_nominalTime,
-+            dateOffset=org.apache.oozie.coord.CoordELFunctions#ph3_coord_dateOffset,
-+            formatTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_formatTime,
-+            user=org.apache.oozie.coord.CoordELFunctions#coord_user
-+        </value>
-+        <description>
-+            EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
-+            This property is a convenience property to add extensions to the built in executors without having to
-+            include all the built in ones.
-+        </description>
-+    </property>
-+
-+    <property>
-+        <name>oozie.service.ELService.ext.functions.coord-sla-submit</name>
-+        <value>
-+            instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_fixed,
-+            user=org.apache.oozie.coord.CoordELFunctions#coord_user
-+        </value>
-+        <description>
-+            EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
-+        </description>
-+    </property>
-+
-+    <property>
-+        <name>oozie.service.ELService.ext.functions.coord-sla-create</name>
-+        <value>
-+            instanceTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_nominalTime,
-+            user=org.apache.oozie.coord.CoordELFunctions#coord_user
-+        </value>
-+        <description>
-+            EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD.
-+        </description>
-+    </property>
-+
-     <!-- Proxyuser Configuration -->
- 
-     <!--
-Index: core/pom.xml
-===================================================================
---- core/pom.xml	(revision 1521237)
-+++ core/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-core</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Core</description>
-     <name>Apache Oozie Core</name>
-     <packaging>jar</packaging>
-Index: sharelib/pig/pom.xml
-===================================================================
---- sharelib/pig/pom.xml	(revision 1521237)
-+++ sharelib/pig/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../..</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-sharelib-pig</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Share Lib Pig</description>
-     <name>Apache Oozie Share Lib Pig</name>
-     <packaging>jar</packaging>
-Index: sharelib/sqoop/pom.xml
-===================================================================
---- sharelib/sqoop/pom.xml	(revision 1521237)
-+++ sharelib/sqoop/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../..</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-sharelib-sqoop</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Share Lib Sqoop</description>
-     <name>Apache Oozie Share Lib Sqoop</name>
-     <packaging>jar</packaging>
-Index: sharelib/hcatalog/pom.xml
-===================================================================
---- sharelib/hcatalog/pom.xml	(revision 1521237)
-+++ sharelib/hcatalog/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../..</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-sharelib-hcatalog</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Share Lib HCatalog</description>
-     <name>Apache Oozie Share Lib HCatalog</name>
-     <packaging>jar</packaging>
-Index: sharelib/oozie/pom.xml
-===================================================================
---- sharelib/oozie/pom.xml	(revision 1521237)
-+++ sharelib/oozie/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../..</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-sharelib-oozie</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Share Lib Oozie</description>
-     <name>Apache Oozie Share Lib Oozie</name>
-     <packaging>jar</packaging>
-Index: sharelib/distcp/pom.xml
-===================================================================
---- sharelib/distcp/pom.xml	(revision 1521237)
-+++ sharelib/distcp/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../..</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-sharelib-distcp</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Share Lib Distcp</description>
-     <name>Apache Oozie Share Lib Distcp</name>
-     <packaging>jar</packaging>
-Index: sharelib/streaming/pom.xml
-===================================================================
---- sharelib/streaming/pom.xml	(revision 1521237)
-+++ sharelib/streaming/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../..</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-sharelib-streaming</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Share Lib Streaming</description>
-     <name>Apache Oozie Share Lib Streaming</name>
-     <packaging>jar</packaging>
-Index: sharelib/pom.xml
-===================================================================
---- sharelib/pom.xml	(revision 1521237)
-+++ sharelib/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-sharelib</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Share Lib</description>
-     <name>Apache Oozie Share Lib</name>
-     <packaging>pom</packaging>
-Index: sharelib/hive/pom.xml
-===================================================================
---- sharelib/hive/pom.xml	(revision 1521237)
-+++ sharelib/hive/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../..</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-sharelib-hive</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Share Lib Hive</description>
-     <name>Apache Oozie Share Lib Hive</name>
-     <packaging>jar</packaging>
-Index: pom.xml
-===================================================================
---- pom.xml	(revision 1521237)
-+++ pom.xml	(working copy)
-@@ -21,7 +21,7 @@
-     <modelVersion>4.0.0</modelVersion>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-main</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Main</description>
-     <name>Apache Oozie Main</name>
-     <packaging>pom</packaging>
-Index: hbaselibs/hbase-0.94/pom.xml
-===================================================================
---- hbaselibs/hbase-0.94/pom.xml	(revision 1521237)
-+++ hbaselibs/hbase-0.94/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hbase</artifactId>
--    <version>0.94.2.oozie-4.0.0</version>
-+    <version>0.94.2.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie Hbase ${project.version}</description>
-     <name>Apache Oozie Hbase ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hbaselibs/pom.xml
-===================================================================
---- hbaselibs/pom.xml	(revision 1521237)
-+++ hbaselibs/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hbaselibs</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Hbase Libs</description>
-     <name>Apache Oozie Hbase Libs</name>
-     <packaging>pom</packaging>
-Index: hcataloglibs/hcatalog-0.5/pom.xml
-===================================================================
---- hcataloglibs/hcatalog-0.5/pom.xml	(revision 1521237)
-+++ hcataloglibs/hcatalog-0.5/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hcatalog</artifactId>
--    <version>0.5.0.oozie-4.0.0</version>
-+    <version>0.5.0.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie HCatalog ${project.version}</description>
-     <name>Apache Oozie HCatalog ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hcataloglibs/hcatalog-0.6/pom.xml
-===================================================================
---- hcataloglibs/hcatalog-0.6/pom.xml	(revision 1521237)
-+++ hcataloglibs/hcatalog-0.6/pom.xml	(working copy)
-@@ -22,12 +22,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-         <relativePath>../../pom.xml</relativePath>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hcatalog</artifactId>
--    <version>0.6.0.oozie-4.0.0</version>
-+    <version>0.6.0.oozie-4.0.0-falcon</version>
-     <description>Apache Oozie HCatalog ${project.version}</description>
-     <name>Apache Oozie HCatalog ${project.version}</name>
-     <packaging>jar</packaging>
-Index: hcataloglibs/pom.xml
-===================================================================
---- hcataloglibs/pom.xml	(revision 1521237)
-+++ hcataloglibs/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-hcataloglibs</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie HCatalog Libs</description>
-     <name>Apache Oozie HCatalog Libs</name>
-     <packaging>pom</packaging>
-Index: minitest/pom.xml
-===================================================================
---- minitest/pom.xml	(revision 1521237)
-+++ minitest/pom.xml	(working copy)
-@@ -23,12 +23,12 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
- 
-     <groupId>org.apache.oozie.test</groupId>
-     <artifactId>oozie-mini</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie MiniOozie</description>
-     <name>Apache Oozie MiniOozie</name>
- 
-Index: tools/pom.xml
-===================================================================
---- tools/pom.xml	(revision 1521237)
-+++ tools/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-tools</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Tools</description>
-     <name>Apache Oozie Tools</name>
-     <packaging>jar</packaging>
-Index: distro/pom.xml
-===================================================================
---- distro/pom.xml	(revision 1521237)
-+++ distro/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-distro</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Distro</description>
-     <name>Apache Oozie Distro</name>
-     <packaging>jar</packaging>
-Index: login/pom.xml
-===================================================================
---- login/pom.xml	(revision 1521237)
-+++ login/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-login</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Login</description>
-     <name>Apache Oozie Login</name>
-     <packaging>war</packaging>
-Index: examples/pom.xml
-===================================================================
---- examples/pom.xml	(revision 1521237)
-+++ examples/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-examples</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Examples</description>
-     <name>Apache Oozie Examples</name>
-     <packaging>jar</packaging>
-Index: client/pom.xml
-===================================================================
---- client/pom.xml	(revision 1521237)
-+++ client/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-client</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie Client</description>
-     <name>Apache Oozie Client</name>
-     <packaging>jar</packaging>
-Index: webapp/src/main/webapp/WEB-INF/web.xml
-===================================================================
---- webapp/src/main/webapp/WEB-INF/web.xml	(revision 1521237)
-+++ webapp/src/main/webapp/WEB-INF/web.xml	(working copy)
-@@ -16,13 +16,219 @@
-   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">
--]>
-+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
- 
- <web-app>
-+    <display-name>OOZIE</display-name>
- 
--    <!-- The servlets are defined in web-common.xml -->
--    &web-common;
-+    <!-- Listeners -->
-+    <listener>
-+        <listener-class>org.apache.oozie.servlet.ServicesLoader</listener-class>
-+    </listener>
- 
--</web-app>
-+    <!-- 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-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>
-+
-+    <!-- welcome-file -->
-+    <welcome-file-list>
-+        <welcome-file>index.html</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>/index.html</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>
-+</web-app>
-\ No newline at end of file
-Index: webapp/pom.xml
-===================================================================
---- webapp/pom.xml	(revision 1521237)
-+++ webapp/pom.xml	(working copy)
-@@ -22,11 +22,11 @@
-     <parent>
-         <groupId>org.apache.oozie</groupId>
-         <artifactId>oozie-main</artifactId>
--        <version>4.0.0</version>
-+        <version>4.0.0-falcon</version>
-     </parent>
-     <groupId>org.apache.oozie</groupId>
-     <artifactId>oozie-webapp</artifactId>
--    <version>4.0.0</version>
-+    <version>4.0.0-falcon</version>
-     <description>Apache Oozie WebApp</description>
-     <name>Apache Oozie WebApp</name>
-     <packaging>war</packaging>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/patch/oozie-bundle-el-extension.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patch/oozie-bundle-el-extension.patch b/build-tools/src/patch/oozie-bundle-el-extension.patch
deleted file mode 100644
index 61abce8..0000000
--- a/build-tools/src/patch/oozie-bundle-el-extension.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git webapp/pom.xml webapp/pom.xml
-index 38ec438..c3bc9b8 100644
---- webapp/pom.xml
-+++ webapp/pom.xml
-@@ -33,6 +33,13 @@
-
-     <dependencies>
-         <dependency>
-+            <groupId>org.apache.falcon</groupId>
-+            <artifactId>falcon-oozie-el-extension</artifactId>
-+            <version>0.4-SNAPSHOT</version>
-+            <scope>compile</scope>
-+        </dependency>
-+
-+        <dependency>
-             <groupId>org.apache.oozie</groupId>
-             <artifactId>oozie-core</artifactId>
-             <scope>compile</scope>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/patches/OOZIE-1465-3.3.2.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patches/OOZIE-1465-3.3.2.patch b/build-tools/src/patches/OOZIE-1465-3.3.2.patch
new file mode 100644
index 0000000..4890c7c
--- /dev/null
+++ b/build-tools/src/patches/OOZIE-1465-3.3.2.patch
@@ -0,0 +1,15 @@
+Index: core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
+===================================================================
+--- core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java	(revision 1506445)
++++ core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java	(working copy)
+@@ -40,8 +40,8 @@
+
+ public class CoordELFunctions {
+     final private static XLog LOG = XLog.getLog(CoordELFunctions.class);
+-    final private static String DATASET = "oozie.coord.el.dataset.bean";
+-    final private static String COORD_ACTION = "oozie.coord.el.app.bean";
++    final public static String DATASET = "oozie.coord.el.dataset.bean";
++    final public static String COORD_ACTION = "oozie.coord.el.app.bean";
+     final public static String CONFIGURATION = "oozie.coord.el.conf";
+     final public static String LATEST_EL_USE_CURRENT_TIME = "oozie.service.ELService.latest-el.use-current-time";
+     // INSTANCE_SEPARATOR is used to separate multiple directories into one tag.

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/73e54e04/build-tools/src/patches/OOZIE-1465.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patches/OOZIE-1465.patch b/build-tools/src/patches/OOZIE-1465.patch
new file mode 100644
index 0000000..b203fac
--- /dev/null
+++ b/build-tools/src/patches/OOZIE-1465.patch
@@ -0,0 +1,15 @@
+Index: core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
+===================================================================
+--- core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java	(revision 1506445)
++++ core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java	(working copy)
+@@ -40,8 +40,8 @@
+  */
+ 
+ public class CoordELFunctions {
+-    final private static String DATASET = "oozie.coord.el.dataset.bean";
+-    final private static String COORD_ACTION = "oozie.coord.el.app.bean";
++    final public static String DATASET = "oozie.coord.el.dataset.bean";
++    final public static String COORD_ACTION = "oozie.coord.el.app.bean";
+     final public static String CONFIGURATION = "oozie.coord.el.conf";
+     final public static String LATEST_EL_USE_CURRENT_TIME = "oozie.service.ELService.latest-el.use-current-time";
+     // INSTANCE_SEPARATOR is used to separate multiple directories into one tag.


Mime
View raw message