falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srik...@apache.org
Subject [1/2] git commit: FALCON-58 Gaps in release source / binary tarball. Contributed by Srikanth Sundarrajan
Date Wed, 24 Jul 2013 17:03:44 GMT
Updated Branches:
  refs/heads/master 9f3c4d9ec -> 0e1e578c4
  refs/heads/v0.3 5b5a5ce43 -> 6277ff76b


FALCON-58 Gaps in release source / binary tarball. Contributed by Srikanth Sundarrajan


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

Branch: refs/heads/master
Commit: 0e1e578c4be4d2cce98af1e6a54cd9b11f830ab9
Parents: 9f3c4d9
Author: srikanth.sundarrajan <srikanth.sundarrajan@inmobi.com>
Authored: Wed Jul 24 21:04:58 2013 +0530
Committer: srikanth.sundarrajan <srikanth.sundarrajan@inmobi.com>
Committed: Wed Jul 24 21:04:58 2013 +0530

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 DISCLAIMER.txt                                  |  16 +++
 Installation-steps.txt                          | 104 +++++++++-------
 LICENSE.txt                                     |  41 -------
 NOTICE.txt                                      |   6 +
 backlog                                         |  43 -------
 docs/pom.xml                                    |  18 +--
 docs/src/main/webapp/WEB-INF/web.xml            |  25 ----
 docs/src/site/resources/Architecture.png        | Bin 86498 -> 65687 bytes
 docs/src/site/resources/FeedSchedule.png        | Bin 99204 -> 84841 bytes
 docs/src/site/resources/PrismSetup.png          | Bin 154455 -> 103747 bytes
 docs/src/site/resources/ProcessSchedule.png     | Bin 101530 -> 85720 bytes
 .../images/accessories-text-editor.png          | Bin 0 -> 746 bytes
 docs/src/site/resources/images/add.gif          | Bin 0 -> 397 bytes
 .../resources/images/apache-incubator-logo.png  | Bin 0 -> 4234 bytes
 .../resources/images/apache-maven-project-2.png | Bin 0 -> 33442 bytes
 .../images/application-certificate.png          | Bin 0 -> 923 bytes
 docs/src/site/resources/images/contact-new.png  | Bin 0 -> 736 bytes
 .../resources/images/document-properties.png    | Bin 0 -> 577 bytes
 .../site/resources/images/drive-harddisk.png    | Bin 0 -> 700 bytes
 docs/src/site/resources/images/falcon-logo.png  | Bin 0 -> 13293 bytes
 docs/src/site/resources/images/fix.gif          | Bin 0 -> 366 bytes
 .../site/resources/images/icon_error_sml.gif    | Bin 0 -> 633 bytes
 .../src/site/resources/images/icon_help_sml.gif | Bin 0 -> 1072 bytes
 .../src/site/resources/images/icon_info_sml.gif | Bin 0 -> 638 bytes
 .../site/resources/images/icon_success_sml.gif  | Bin 0 -> 604 bytes
 .../site/resources/images/icon_warning_sml.gif  | Bin 0 -> 625 bytes
 .../site/resources/images/image-x-generic.png   | Bin 0 -> 662 bytes
 .../resources/images/internet-web-browser.png   | Bin 0 -> 1017 bytes
 .../images/logos/build-by-maven-black.png       | Bin 0 -> 2294 bytes
 .../images/logos/build-by-maven-white.png       | Bin 0 -> 2260 bytes
 .../resources/images/logos/maven-feather.png    | Bin 0 -> 3330 bytes
 .../site/resources/images/network-server.png    | Bin 0 -> 536 bytes
 .../site/resources/images/package-x-generic.png | Bin 0 -> 717 bytes
 .../resources/images/profiles/pre-release.png   | Bin 0 -> 32607 bytes
 .../site/resources/images/profiles/retired.png  | Bin 0 -> 22003 bytes
 .../site/resources/images/profiles/sandbox.png  | Bin 0 -> 33010 bytes
 docs/src/site/resources/images/remove.gif       | Bin 0 -> 607 bytes
 docs/src/site/resources/images/rss.png          | Bin 0 -> 474 bytes
 docs/src/site/resources/images/update.gif       | Bin 0 -> 1090 bytes
 docs/src/site/resources/images/window-new.png   | Bin 0 -> 583 bytes
 docs/src/site/site.xml                          |  52 ++++++--
 docs/src/site/twiki/InstallationSteps.twiki     | 120 ++++++++++++-------
 docs/src/site/twiki/index.twiki                 |   2 +
 pom.xml                                         |  72 ++++++-----
 src/main/assemblies/package.xml                 |  12 ++
 src/main/assemblies/src-package.xml             |   3 +-
 webapp/pom.xml                                  |  22 ++++
 48 files changed, 290 insertions(+), 248 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8a133bf..c8f38c8 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,8 @@ Trunk (Unreleased)
 
 Release Version: 0.3
 
+    FALCON-58 Gaps in release source / binary tarball. (Srikanth Sundarrajan)
+
     FALCON-57 Build fails if the source is not in scm. (Srikanth Sundarrajan)
 
     FALCON-53 Add -incubating to the version. (Jarek Jarcec Cecho via Srikanth

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/DISCLAIMER.txt
----------------------------------------------------------------------
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
new file mode 100644
index 0000000..61f9c40
--- /dev/null
+++ b/DISCLAIMER.txt
@@ -0,0 +1,16 @@
+Apache Falcon is an effort undergoing incubation at the Apache
+Software Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further
+review indicates that the infrastructure, communications, and decision
+making process have stabilized in a manner consistent with other
+successful ASF projects.
+
+While incubation status is not necessarily a reflection of the
+completeness or stability of the code, it does indicate that the
+project has yet to be fully endorsed by the ASF.
+
+For more information about the incubation status of the Falcon project
+you can go to the following page:
+
+http://incubator.apache.org/projects/falcon.html
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/Installation-steps.txt
----------------------------------------------------------------------
diff --git a/Installation-steps.txt b/Installation-steps.txt
index 4631dff..a0bcf46 100644
--- a/Installation-steps.txt
+++ b/Installation-steps.txt
@@ -14,61 +14,81 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-Building & Packaging Falcon
+A. Building & Installing Falcon
+===============================
 
-Installing Falcon
-*Pre-requisites:
-   * hadoop-0.20.2 +
-   * oozie-3.1.5 + (Patched version can be downloaded from: https://github.com/InMobi/oozie/tree/branch-3.2)
+1. Building Falcon
+------------------
 
-*Falcon Server
+* git clone https://git-wip-us.apache.org/repos/asf/incubator-falcon.git falcon
+* cd falcon
+* export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install
 
-   * Download the source from https://git-wip-us.apache.org/repos/asf/incubator-falcon.git
-   * Navigate to base project folder,named 'Falcon'
-   * Build as "mvn clean package" at the base location. Please note that both maven 2/3 are supported.
-   * By default only embedded/standalone mode is build.
-   * To build Falcon with documentation build with MVN profile "all".
-   * To build the Falcon for distributed mode, i.e. multiple server and prism mode, build with MVN profile "distributed".
-   * Once the build operation is over,navigate to '<base-folder>/Falcon/webapps/target' and deploy the .war file generated
-      there in a web container (Eg: tomcat6).
+[optionally -Dhadoop.version=<<hadoop.version>> can be appended to build for a specific version of hadoop]
+[Falcon has currently not been tested with secure Hadoop / Hadoop 2.0]
 
+Once the build successfully completes, artifacts can be packaged for deployment.
+By default the falcon is built for embedded mode.
 
-*Falcon Client
+* mvn clean assembly:assembly -DskipTests
 
-   * Follow the steps 1 to 3 from server instructions.
-   * Once the build operation is over, navigate to '<base-folder>/Falcon/client/target'. There is a client.jar that has
-      been generated along with multiple other jars. Fetch this jar and others to use the Falcon client application.
-      Please ensure that the other jars in the folder are always specified in the classpath of the client.jar.
-   * Please refer Falcon-CLI guide for various options on how to use the falcon client.
+Tar can be found in {project dir}/target/falcon-${project.version}-bin.tar.gz
 
+Tar is structured as follows
 
-*Setting up Falcon server properties:
+|- bin
+   |- falcon
+   |- falcon-start
+   |- falcon-stop
+|- conf
+   |- startup.properties
+   |- runtime.properties
+   |- client.properties
+   |- log4j.xml
+|- src
+|- docs
+|- client
+   |- lib (client support libs)
+|- server
+   |- webapp
+      |- classes (serer support classes)
+      |- lib (server support libs)
+   |- falcon.war
+|- logs (application log files & temp data files)
+   |- falcon.pid
 
-Inside your web container, where the falcon war has exploded, you should be able to find 2 files, startup.properties and runtime.properties.
-The path would be:
-<container-base>/<war-location>/falcon-webapp-<<project version>>/WEB-INF/classes
+2. Installing & running Falcon
+------------------------------
 
-*startup.properties:* Specifies values/paths used by Falcon on startup. Common entries usually include config store location
-,broker url (for messaging), and other settings.Any changes to this requires Falcon to be restarted to take effect.
+a. Installing falcon
+~~~~~~~~~~~~~~~~~~~~
 
-*runtime.properties:* Specifies various properties that can be picked at runtime. Falcon server keeps polling this file after a certain interval;
-and incorporates changes, if any.
+* tar -xzvf falcon-${project.version}.tar.gz
+* cd falcon-main-${project.version}
 
-*Domain based settings (only applicable for Falcon 0.2):*
+b. Starting Falcon Server
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Falcon 0.2 and subsequent releases support domain based properties. The user can specify properties either for all domains
-(with prefixing the property with a '*' ) or for a particular domain (with prefixing the domain name to the property).
-Once the domain is set,  the user can set an env variable,FALCON_DOMAIN as the domain that the Falcon is supposed to use.
+* bin/falcon-start
 
-Example:
-Trying to set the config store property for all domains:
-*.config.store.uri=file:///var/lib/tomcat6/target/store
-Trying to set config store property for a 'specific' domain:
-qa.config.store.uri=file:///var/lib/tomcat6/target/store
+c. Using Falcon
+~~~~~~~~~~~~~~~
 
-To ensure that Falcon installation on your system uses the qa domain settings, just set the FALCON_DOMAIN value to 'qa' in your environment.
+* bin/falcon admin -version
+  Falcon server build version: {Version:"0.3-SNAPSHOT-rd7e2be9afa2a5dc96acd1ec9e325f39c6b2f17f7",Mode:"embedded"}
 
-*Falcon logs
-Once deployed, all the Falcon operations are logged in folder ${user.dir}/logs by default.
-Application.log contains logs for all the falcon server operations, if Falcon is deployed in distributed mode then prism logs are populated in
-Prism.log
+* bin/falcon help
+  (for more details about falcon cli usage)
+
+d. Stopping Falcon Server
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* bin/falcon-stop
+
+3. Preparing oozie bundle for use with Falcon
+---------------------------------------------
+
+* cd <<project home>>
+* src/bin/pacakge.sh <<hadoop-version>>
+  >> ex. src/bin/pacakge.sh 1.1.2 or src/bin/pacakge.sh 0.20.2-cdh3u5
+  >> oozie bundle available in target/package/oozie-3.2.0-incubating/distro/target/oozie-3.2.2-distro.tar.gz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 372123c..57bc88a 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -200,44 +200,3 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-
-APACHE HADOOP SUBCOMPONENTS:
-
-The Apache Hadoop project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses. 
-
-For the org.apache.hadoop.org.apache.falcon.util.bloom.* classes:
-
-/**
- *
- * Copyright (c) 2005, European Commission project OneLab under contract
- * 034819 (http://www.one-lab.org)
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or 
- * without modification, are permitted provided that the following 
- * conditions are met:
- *  - Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in 
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of the University Catholique de Louvain - UCL
- *    nor the names of its contributors may be used to endorse or 
- *    promote products derived from this software without specific prior 
- *    written permission.
- *    
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- * POSSIBILITY OF SUCH DAMAGE.
- */

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 0000000..00c057e
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,6 @@
+Apache Falcon (incubating)
+
+Copyright 2011-2013 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/backlog
----------------------------------------------------------------------
diff --git a/backlog b/backlog
deleted file mode 100644
index 1290217..0000000
--- a/backlog
+++ /dev/null
@@ -1,43 +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.
-
-Bugs: (Must fix)
-* In oozie workflow engine, findBundle filters on killed bundles. This can create issues if the bundle is killed because all instances are killed. Instead, we can check for missing bundle path - Shwetha
-* use queueName from properties for parent wf. - Let us make queueName parameter as first class citizen if set, then we will use it for the launcher as well, else we fall back to default - Shaikh
-* Updating feed/process with another cluster doesn't work – A simple solution would be just go through the regular update by detecting that update needs to be done. Ideally I would prefer that we don't touch the unaffected clusters. But that is going to fairly tricky. - Shwetha
-* Clean up of Falcon TT logs from hdfs, also expose stats and meta path and add retention for it - Add a admin service to take care of some administrative tasks. Drive it through config values in runtime.properties - Shaikh
-* Get Status should look at last materialization time – Need to additionally check if too many instances qualify. - Shwetha
-
-Important Enhancements / Improvements  & Less Critical Bugs:
-* optional process inputs – elext, by passing optional input as properties. - Shwetha
-* deb fix for falcon stop - trivial - Nikhil
-* late arrival,retention should be optional for feed – trivial (handle nulls to avoid NPE) - Shaikh
-* process with latest and future EL exp not getting submitted to falcon - Shaikh, done
-* GlobStatus in replication throws null when…. - trivial fix - Shaikh
-* For feed, cluster type should be optional, partition expression is required only if there is a target and multiple sources – just validations … - Shaikh
-* Number of expressions in Partition Expression are not equal to number of feed partitions - this may not be the case always - Shaikh
-* we should use process's lib path - trivial - Shaikh
-* add cluster properties into job.properties while creating bundle - trivial - Shaikh
-* Feed to support clister specific data path - Shaikh
-
-Deprioritized
-* SLA tracking
-* For CLI, client.properties shouldn't be mandatory
-* JMS message is not sent if process has no output
-* process should gate on partition
-* retention to delete root path if all children are gone (till date part, not over it)
-* stats path in the properties for process/feed. retention to clean up stats as well
-* evaluate / build replication with a bulking factor

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 5f038b1..1b0a3cf 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -27,7 +27,6 @@
     <artifactId>falcon-docs</artifactId>
     <description>Apache Falcon Documentation</description>
     <name>Apache Falcon Documentation</name>
-    <packaging>war</packaging>
 
     <properties>
         <skipTests>true</skipTests>
@@ -53,21 +52,10 @@
                         <phase>prepare-package</phase>
                     </execution>
                 </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>src/site/resources</directory>
-                            <targetPath>pages</targetPath>
-                        </resource>
-                        <resource>
-                            <directory>target/site</directory>
-                            <targetPath>pages</targetPath>
-                        </resource>
-                    </webResources>
+                    <generateProjectInfo>false</generateProjectInfo>
+                    <generateReports>false</generateReports>
+                    <skip>false</skip>
                 </configuration>
             </plugin>
         </plugins>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/docs/src/main/webapp/WEB-INF/web.xml b/docs/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 64d59b9..0000000
--- a/docs/src/main/webapp/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>Apache Falcon Documentation</display-name>
-</web-app>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/Architecture.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/Architecture.png b/docs/src/site/resources/Architecture.png
index d70ad7d..0378b49 100644
Binary files a/docs/src/site/resources/Architecture.png and b/docs/src/site/resources/Architecture.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/FeedSchedule.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/FeedSchedule.png b/docs/src/site/resources/FeedSchedule.png
index 8828f85..105c6b1 100644
Binary files a/docs/src/site/resources/FeedSchedule.png and b/docs/src/site/resources/FeedSchedule.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/PrismSetup.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/PrismSetup.png b/docs/src/site/resources/PrismSetup.png
index fae46af..b0dc9a5 100644
Binary files a/docs/src/site/resources/PrismSetup.png and b/docs/src/site/resources/PrismSetup.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/ProcessSchedule.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/ProcessSchedule.png b/docs/src/site/resources/ProcessSchedule.png
index 33c32e9..a7dd788 100644
Binary files a/docs/src/site/resources/ProcessSchedule.png and b/docs/src/site/resources/ProcessSchedule.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/accessories-text-editor.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/accessories-text-editor.png b/docs/src/site/resources/images/accessories-text-editor.png
new file mode 100644
index 0000000..abc3366
Binary files /dev/null and b/docs/src/site/resources/images/accessories-text-editor.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/add.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/add.gif b/docs/src/site/resources/images/add.gif
new file mode 100644
index 0000000..1cb3dbf
Binary files /dev/null and b/docs/src/site/resources/images/add.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/apache-incubator-logo.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/apache-incubator-logo.png b/docs/src/site/resources/images/apache-incubator-logo.png
new file mode 100644
index 0000000..81fb31e
Binary files /dev/null and b/docs/src/site/resources/images/apache-incubator-logo.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/apache-maven-project-2.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/apache-maven-project-2.png b/docs/src/site/resources/images/apache-maven-project-2.png
new file mode 100644
index 0000000..6c096ec
Binary files /dev/null and b/docs/src/site/resources/images/apache-maven-project-2.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/application-certificate.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/application-certificate.png b/docs/src/site/resources/images/application-certificate.png
new file mode 100644
index 0000000..cc6aff6
Binary files /dev/null and b/docs/src/site/resources/images/application-certificate.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/contact-new.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/contact-new.png b/docs/src/site/resources/images/contact-new.png
new file mode 100644
index 0000000..ebc4316
Binary files /dev/null and b/docs/src/site/resources/images/contact-new.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/document-properties.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/document-properties.png b/docs/src/site/resources/images/document-properties.png
new file mode 100644
index 0000000..34c2409
Binary files /dev/null and b/docs/src/site/resources/images/document-properties.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/drive-harddisk.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/drive-harddisk.png b/docs/src/site/resources/images/drive-harddisk.png
new file mode 100644
index 0000000..d7ce475
Binary files /dev/null and b/docs/src/site/resources/images/drive-harddisk.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/falcon-logo.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/falcon-logo.png b/docs/src/site/resources/images/falcon-logo.png
new file mode 100644
index 0000000..0a9f6cf
Binary files /dev/null and b/docs/src/site/resources/images/falcon-logo.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/fix.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/fix.gif b/docs/src/site/resources/images/fix.gif
new file mode 100644
index 0000000..b7eb3dc
Binary files /dev/null and b/docs/src/site/resources/images/fix.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/icon_error_sml.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/icon_error_sml.gif b/docs/src/site/resources/images/icon_error_sml.gif
new file mode 100644
index 0000000..12e9a01
Binary files /dev/null and b/docs/src/site/resources/images/icon_error_sml.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/icon_help_sml.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/icon_help_sml.gif b/docs/src/site/resources/images/icon_help_sml.gif
new file mode 100644
index 0000000..aaf20e6
Binary files /dev/null and b/docs/src/site/resources/images/icon_help_sml.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/icon_info_sml.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/icon_info_sml.gif b/docs/src/site/resources/images/icon_info_sml.gif
new file mode 100644
index 0000000..b776326
Binary files /dev/null and b/docs/src/site/resources/images/icon_info_sml.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/icon_success_sml.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/icon_success_sml.gif b/docs/src/site/resources/images/icon_success_sml.gif
new file mode 100644
index 0000000..0a19527
Binary files /dev/null and b/docs/src/site/resources/images/icon_success_sml.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/icon_warning_sml.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/icon_warning_sml.gif b/docs/src/site/resources/images/icon_warning_sml.gif
new file mode 100644
index 0000000..ac6ad6a
Binary files /dev/null and b/docs/src/site/resources/images/icon_warning_sml.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/image-x-generic.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/image-x-generic.png b/docs/src/site/resources/images/image-x-generic.png
new file mode 100644
index 0000000..ab49efb
Binary files /dev/null and b/docs/src/site/resources/images/image-x-generic.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/internet-web-browser.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/internet-web-browser.png b/docs/src/site/resources/images/internet-web-browser.png
new file mode 100644
index 0000000..307d6ac
Binary files /dev/null and b/docs/src/site/resources/images/internet-web-browser.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/logos/build-by-maven-black.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/build-by-maven-black.png b/docs/src/site/resources/images/logos/build-by-maven-black.png
new file mode 100644
index 0000000..919fd0f
Binary files /dev/null and b/docs/src/site/resources/images/logos/build-by-maven-black.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/logos/build-by-maven-white.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/build-by-maven-white.png b/docs/src/site/resources/images/logos/build-by-maven-white.png
new file mode 100644
index 0000000..7d44c9c
Binary files /dev/null and b/docs/src/site/resources/images/logos/build-by-maven-white.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/logos/maven-feather.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/maven-feather.png b/docs/src/site/resources/images/logos/maven-feather.png
new file mode 100644
index 0000000..b5ada83
Binary files /dev/null and b/docs/src/site/resources/images/logos/maven-feather.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/network-server.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/network-server.png b/docs/src/site/resources/images/network-server.png
new file mode 100644
index 0000000..1d12e19
Binary files /dev/null and b/docs/src/site/resources/images/network-server.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/package-x-generic.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/package-x-generic.png b/docs/src/site/resources/images/package-x-generic.png
new file mode 100644
index 0000000..8b7e9e6
Binary files /dev/null and b/docs/src/site/resources/images/package-x-generic.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/profiles/pre-release.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/profiles/pre-release.png b/docs/src/site/resources/images/profiles/pre-release.png
new file mode 100644
index 0000000..d448e85
Binary files /dev/null and b/docs/src/site/resources/images/profiles/pre-release.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/profiles/retired.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/profiles/retired.png b/docs/src/site/resources/images/profiles/retired.png
new file mode 100644
index 0000000..f89f6a2
Binary files /dev/null and b/docs/src/site/resources/images/profiles/retired.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/profiles/sandbox.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/profiles/sandbox.png b/docs/src/site/resources/images/profiles/sandbox.png
new file mode 100644
index 0000000..f88b362
Binary files /dev/null and b/docs/src/site/resources/images/profiles/sandbox.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/remove.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/remove.gif b/docs/src/site/resources/images/remove.gif
new file mode 100644
index 0000000..fc65631
Binary files /dev/null and b/docs/src/site/resources/images/remove.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/rss.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/rss.png b/docs/src/site/resources/images/rss.png
new file mode 100644
index 0000000..a9850ee
Binary files /dev/null and b/docs/src/site/resources/images/rss.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/update.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/update.gif b/docs/src/site/resources/images/update.gif
new file mode 100644
index 0000000..b2a6d0b
Binary files /dev/null and b/docs/src/site/resources/images/update.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/resources/images/window-new.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/window-new.png b/docs/src/site/resources/images/window-new.png
new file mode 100644
index 0000000..0e12ef9
Binary files /dev/null and b/docs/src/site/resources/images/window-new.png differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 4238dee..6f8c8a5 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -1,3 +1,4 @@
+<?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
@@ -15,18 +16,53 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project name="Falcon">
+<project name="Falcon" xmlns="http://maven.apache.org/DECORATION/1.3.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+
+    <skin>
+        <groupId>org.apache.maven.skins</groupId>
+        <artifactId>maven-fluido-skin</artifactId>
+        <version>1.3.0</version>
+    </skin>
+
+    <custom>
+        <fluidoSkin>
+            <project>Apache Falcon</project>
+            <sideBarEnabled>false</sideBarEnabled>
+        </fluidoSkin>
+    </custom>
 
     <bannerLeft>
         <name>Falcon</name>
+        <src>./images/falcon-logo.png</src>
+        <width>200px</width>
+        <height>45px</height>
     </bannerLeft>
 
-    <skin>
-        <groupId>org.apache.maven.skins</groupId>
-        <artifactId>maven-classic-skin</artifactId>
-        <version>1.0</version>
-    </skin>
+    <bannerRight>
+        <name>Apache Incubator</name>
+        <src>./images/apache-incubator-logo.png</src>
+        <href>http://incubator.apache.org</href>
+    </bannerRight>
+
+    <publishDate position="right"/>
+    <version position="right"/>
+
+    <body>
+        <head>
+            <script type="text/javascript">
+                $( document ).ready( function() { $( '.carousel' ).carousel( { interval: 3500 } ) } );
+            </script>
+        </head>
 
-    <body/>
+        <breadcrumbs position="left">
+            <item name="Falcon" title="Apache Falcon" href="index.html"/>
+        </breadcrumbs>
 
-</project>
+        <footer>
+            © 2011-2012 The Apache Software Foundation. Apache Falcon, Falcon, Apache, the Apache feather logo,
+            and the Apache Falcon project logo are trademarks of The Apache Software Foundation.
+        </footer>
+    </body>
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 877d9ef..139ee8e 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -1,58 +1,92 @@
----+++ Building & Packaging Falcon
+---++ Building & Installing Falcon
 
 
----+++ Installing Falcon
-*Pre-requisites:*
-   * hadoop-0.20.2 +
-   * oozie-3.1.5 +
-*Falcon Server*
+---+++ Building Falcon
 
-   * Download the source from https://github.com/sriksun/Falcon
-   * Navigate to base project folder,named 'Falcon'
-   * Build as "mvn clean package" at the base location. Please note that both maven 2/3 are supported.
-   * By default only embedded/standalone mode is build.
-   * To build Falcon with documentation build with MVN profile "all".
-   * To build the Falcon for distributed mode, i.e. multiple server and prism mode, build with MVN profile "distributed".
-   * Once the build operation is over,navigate to '<base-folder>/Falcon/webapps/target' and deploy the .war file generated
-      there in a web container (Eg: tomcat6).
----+++ User Guide
-*Falcon Client*
+<verbatim>
+git clone https://git-wip-us.apache.org/repos/asf/incubator-falcon.git falcon
 
-   * Follow the steps 1 to 3 from server instructions.
-   * Once the build operation is over, navigate to '<base-folder>/Falcon/client/target'. There is a client.jar that has
-      been generated along with multiple other jars. Fetch this jar and others to use the Falcon client application.
-      Please ensure that the other jars in the folder are always specified in the classpath of the client.jar.
-   * Please refer Falcon-CLI guide for various options on how to use the falcon client.
----+++ Administration Guide
-*Setting up Falcon server properties:*
-Inside your web container, where the falcon war has exploded, you should be able to find 2 files, startup.properties and runtime.properties.
-The path would be:
-<container-base>/<war-location>/falcon-webapp-<<project version>>/WEB-INF/classes
+cd falcon
 
-*startup.properties:* Specifies values/paths used by Falcon on startup. Common entries usually include config store location
-,broker url (for messaging), and other settings.Any changes to this requires Falcon to be restarted to take effect.
+export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install
 
-*runtime.properties:* Specifies various properties that can be picked at runtime. Falcon server keeps polling this file after a certain interval;
-and incorporates changes, if any.
+[optionally -Dhadoop.version=<<hadoop.version>> can be appended to build for a specific version of hadoop]
+[Falcon has currently not been tested with secure Hadoop / Hadoop 2.0]
 
-*Domain based settings (only applicable for Falcon 0.2):*
+</verbatim>
 
-Falcon 0.2 and subsequent releases support domain based properties. The user can specify properties either for all domains
-(with prefixing the property with a '*' ) or for a particular domain (with prefixing the domain name to the property).
-Once the domain is set,  the user can set an env variable,FALCON_DOMAIN as the domain that the Falcon is supposed to use.
+Once the build successfully completes, artifacts can be packaged for deployment. By default the falcon is built for embedded mode.
 
-Please refer the example below:
+<verbatim>
 
-Example:
-Trying to set the config store property for all domains:
+mvn clean assembly:assembly -DskipTests
 
-*.config.store.uri=file:///var/lib/tomcat6/target/store
+</verbatim>
 
-Trying to set config store property for a 'specific' domain:
+Tar can be found in {project dir}/target/falcon-${project.version}.tar.gz
 
-qa.config.store.uri=file:///var/lib/tomcat6/target/store
+Tar is structured as follows
 
-To ensure that Falcon installation on your system uses the qa domain settings, just set the FALCON_DOMAIN value to 'qa' in your environment.
----++++ Security
+<verbatim>
 
-*TO-DO*
\ No newline at end of file
+|- bin
+   |- falcon
+   |- falcon-start
+   |- falcon-stop
+|- conf
+   |- startup.properties
+   |- runtime.properties
+   |- client.properties
+   |- log4j.xml
+|- src
+|- docs
+|- client
+   |- lib (client support libs)
+|- server
+   |- webapp
+      |- classes (serer support classes)
+      |- lib (server support libs)
+   |- falcon.war
+|- logs (application log files & temp data files)
+   |- falcon.pid
+
+</verbatim>
+
+---+++ Installing & running Falcon
+
+*Installing falcon*
+<verbatim>
+tar -xzvf falcon-${project.version}.tar.gz
+cd falcon-main-${project.version}
+</verbatim>
+
+*Starting Falcon Server*
+<verbatim>
+bin/falcon-start
+</verbatim>
+
+*Using Falcon*
+<verbatim>
+bin/falcon admin -version
+Falcon server build version: {Version:"0.3-SNAPSHOT-rd7e2be9afa2a5dc96acd1ec9e325f39c6b2f17f7",Mode:"embedded"}
+
+----
+
+bin/falcon help
+(for more details about falcon cli usage)
+</verbatim>
+
+*Stopping Falcon Server*
+<verbatim>
+bin/falcon-stop
+</verbatim>
+
+---+++ Preparing oozie bundle for use with Falcon
+<verbatim>
+cd <<project home>>
+mkdir target/package
+src/bin/pacakge.sh <<hadoop-version>>
+
+>> ex. src/bin/pacakge.sh 1.1.2 or src/bin/pacakge.sh 0.20.2-cdh3u5
+>> oozie bundle available in target/package/oozie-3.2.0-incubating/distro/target/oozie-3.2.2-distro.tar.gz
+</verbatim>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/docs/src/site/twiki/index.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/index.twiki b/docs/src/site/twiki/index.twiki
index a0ff6ac..a60307c 100644
--- a/docs/src/site/twiki/index.twiki
+++ b/docs/src/site/twiki/index.twiki
@@ -24,6 +24,8 @@ management on hadoop clusters.
 Start with these simple steps to install an falcon instance [[InstallationSteps][Simple setup]]. Also refer
 to Falcon architecture and documentation in [[FalconDocumentation][Documentation]]. [[OnBoarding][On boarding]] describes steps to on-board a pipeline to Falcon. It also gives a sample pipeline for reference. [[EntitySpecification][Entity Specification]] gives complete details of all Falcon entities.
 
+[[FalconCLI][Falcon CLI]] describes the various options for the command line utility provided by Falcon.
+
 #LicenseInfo
 ---+ Licensing Information
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6986bd2..ca16762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,35 +103,9 @@
         <skipCheck>false</skipCheck>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>all</id>
-            <modules>
-                <module>client</module>
-                <module>metrics</module>
-                <module>common</module>
-                <module>test-util</module>
-                <module>hadoop-webapp</module>
-                <module>feed</module>
-                <module>messaging</module>
-                <module>process</module>
-                <module>oozie-el-extensions</module>
-                <module>oozie</module>
-                <module>acquisition</module>
-                <module>replication</module>
-                <module>retention</module>
-                <module>archival</module>
-                <module>rerun</module>
-                <module>prism</module>
-                <module>webapp</module>
-                <module>docs</module>
-                <module>build-tools</module>
-            </modules>
-        </profile>
-    </profiles>
-
     <modules>
         <module>client</module>
+        <module>metrics</module>
         <module>common</module>
         <module>test-util</module>
         <module>hadoop-webapp</module>
@@ -144,10 +118,10 @@
         <module>replication</module>
         <module>retention</module>
         <module>archival</module>
-        <module>metrics</module>
         <module>rerun</module>
         <module>prism</module>
         <module>webapp</module>
+        <module>docs</module>
         <module>build-tools</module>
     </modules>
 
@@ -640,56 +614,67 @@
                     <artifactId>buildnumber-maven-plugin</artifactId>
                     <version>1.0</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.5</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>2.3.2</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
                     <version>2.2.1</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>2.8.1</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.14</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.7</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.1.1</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.rat</groupId>
                     <artifactId>apache-rat-plugin</artifactId>
                     <version>0.7</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>2.9.1</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
                     <version>3.2</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
@@ -759,6 +744,7 @@
                         <id>attach-javadocs</id>
                         <phase>package</phase>
                         <goals>
+                            <goal>javadoc</goal>
                             <goal>jar</goal>
                         </goals>
                     </execution>
@@ -810,10 +796,10 @@
                     <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
                     <excludeSubProjects>true</excludeSubProjects>
                     <excludes>
-                        <exclude>CHANGES.txt</exclude>
+                        <exclude>*.txt</exclude>
                         <exclude>.git/**</exclude>
                         <exclude>.idea/**</exclude>
-                        <exclude>docs/src/site/twiki/*.twiki</exclude>
+                        <exclude>**/*.twiki</exclude>
                         <exclude>**/*.iml</exclude>
                         <exclude>**/target/**</exclude>
                         <exclude>**/activemq-data/**</exclude>
@@ -838,6 +824,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -865,6 +852,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
@@ -890,6 +878,30 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javancss-maven-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-module-twiki</artifactId>
+                        <version>1.3</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>site</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/src/main/assemblies/package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/package.xml b/src/main/assemblies/package.xml
index b68692b..be58be1 100644
--- a/src/main/assemblies/package.xml
+++ b/src/main/assemblies/package.xml
@@ -40,6 +40,16 @@
         </fileSet>
 
         <fileSet>
+            <directory>docs/target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>webapp/target/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+
+        <fileSet>
             <directory>src/bin</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
@@ -60,6 +70,8 @@
             <directory>./</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
+                <include>DISCLAIMER.txt</include>
+                <include>NOTICE.txt</include>
                 <include>LICENSE.txt</include>
                 <include>CHANGES.txt</include>
                 <include>README</include>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/src/main/assemblies/src-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/src-package.xml b/src/main/assemblies/src-package.xml
index bdcf464..8fa7b7c 100644
--- a/src/main/assemblies/src-package.xml
+++ b/src/main/assemblies/src-package.xml
@@ -30,7 +30,8 @@
                 <exclude>**/target/**</exclude>
                 <exclude>**/logs/**</exclude>
                 <exclude>**/activemq-data/**</exclude>
-                <exclude>**/.git/**</exclude>
+                <exclude>**/.git*/**</exclude>
+                <exclude>backlog</exclude>
             </excludes>
         </fileSet>
     </fileSets>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/0e1e578c/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index db45ae7..6743527 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -152,6 +152,28 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>uber-javadocs</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>javadoc</goal>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <includeTransitiveDependencySources>false</includeTransitiveDependencySources>
+                            <includeDependencySources>true</includeDependencySources>
+                            <dependencySourceIncludes>
+                                <dependencySourceInclude>org.apache.falcon:*</dependencySourceInclude>
+                            </dependencySourceIncludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.1.1</version>
                 <configuration>


Mime
View raw message