falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject git commit: FALCON-162 Update falcon scripts to let the user set the log and pid locations. Contributed by Arpit Gupta FALCON-165 Simplify packaging to create one package instead of client, falcon and prism packages. Contributed by Arpit Gupta FALCON-174
Date Tue, 12 Nov 2013 06:09:14 GMT
Updated Branches:
  refs/heads/FALCON-85 382781549 -> fc858f5fe


FALCON-162 Update falcon scripts to let the user set the log and pid locations. Contributed by Arpit Gupta
FALCON-165 Simplify packaging to create one package instead of client, falcon and prism packages. Contributed by Arpit Gupta
FALCON-174 Bind activemq to all interfaces rather than just localhost. Contributed by Arpit Gupta
FALCON-187 Update Falcon start script to also redirect stdout to the log file. Contributed by Arpit Gupta


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

Branch: refs/heads/FALCON-85
Commit: fc858f5fefa3de583327f69cf59b56e6ee38cb37
Parents: 3827815
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Mon Nov 11 22:04:40 2013 -0800
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Mon Nov 11 22:04:40 2013 -0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  13 ++
 Installation-steps.txt                          |  23 ++--
 docs/src/site/twiki/InstallationSteps.twiki     |  94 +++++++++++++--
 .../falcon/listener/HadoopStartupListener.java  |   2 +-
 pom.xml                                         |   9 +-
 prism/src/main/java/org/apache/falcon/Main.java |   2 +-
 src/bin/falcon                                  |  20 +---
 src/bin/falcon-config.sh                        | 120 +++++++++++++++++++
 src/bin/service-start.sh                        |  67 +++--------
 src/bin/service-stop.sh                         |   9 +-
 src/conf/falcon-env.sh                          |  55 +++++++++
 src/conf/log4j.xml                              |   9 +-
 src/conf/runtime.properties                     |   2 +-
 src/conf/startup.properties                     |   4 +-
 src/main/assemblies/bin-package.xml             | 106 ----------------
 src/main/assemblies/client-package.xml          |  73 -----------
 src/main/assemblies/distributed-package.xml     | 112 +++++++++++++++++
 src/main/assemblies/prism-package.xml           | 102 ----------------
 src/main/assemblies/server-package.xml          |  96 ---------------
 src/main/assemblies/standalone-package.xml      | 106 ++++++++++++++++
 20 files changed, 537 insertions(+), 487 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 830dd67..e9ba381 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -71,6 +71,19 @@ Trunk (Unreleased)
     via Srikanth Sundarrajan)
 
   IMPROVEMENTS
+
+    FALCON-187 Update Falcon start script to also redirect
+    stdout to the log file. (Arpit Gupta via Venkatesh Seetharam)
+
+    FALCON-174 Bind activemq to all interfaces rather than
+    just localhost. (Arpit Gupta via Venkatesh Seetharam)
+
+    FALCON-165 Simplify packaging to create one package instead of
+    client, falcon and prism packages. (Arpit Gupta via Venkatesh Seetharam)
+
+    FALCON-162 Update falcon scripts to let the user set the log
+    and pid locations. (Arpit Gupta via Venkatesh Seetharam)
+
     FALCON-151 Document the REST APIs for Falcon. (Raghav Kumar
     Gautham via Srikanth Sundarrajan) 
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/Installation-steps.txt
----------------------------------------------------------------------
diff --git a/Installation-steps.txt b/Installation-steps.txt
index cb754ab..2a5b36e 100644
--- a/Installation-steps.txt
+++ b/Installation-steps.txt
@@ -40,22 +40,27 @@ Tar is structured as follows
    |- falcon
    |- falcon-start
    |- falcon-stop
+   |- falcon-config.sh
+   |- service-start.sh
+   |- service-stop.sh
 |- conf
    |- startup.properties
    |- runtime.properties
    |- client.properties
    |- log4j.xml
-|- src
+   |- falcon-env.sh
 |- 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
+      |- falcon.war
+|- hadooplibs
+|- README
+|- NOTICE.txt
+|- LICENSE.txt
+|- DISCLAIMER.txt
+|- CHANGES.txt
 
 2. Installing & running Falcon
 ------------------------------
@@ -63,8 +68,8 @@ Tar is structured as follows
 a. Installing falcon
 ~~~~~~~~~~~~~~~~~~~~
 
-* tar -xzvf falcon-${project.version}.tar.gz
-* cd falcon-main-${project.version}
+* tar -xzvf falcon-${project.version}-bin.tar.gz
+* cd falcon-${project.version}
 
 b. Starting Falcon Server
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -91,4 +96,4 @@ d. Stopping Falcon Server
 * 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-4.0.0/distro/target/oozie-4.0.0-distro.tar.gz
\ No newline at end of file
+  >> oozie bundle available in target/package/oozie-4.0.0/distro/target/oozie-4.0.0-distro.tar.gz

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index a2ecccf..223242b 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -35,22 +35,27 @@ Tar is structured as follows
    |- falcon
    |- falcon-start
    |- falcon-stop
+   |- falcon-config.sh
+   |- service-start.sh
+   |- service-stop.sh
 |- conf
    |- startup.properties
    |- runtime.properties
    |- client.properties
    |- log4j.xml
-|- src
+   |- falcon-env.sh
 |- docs
-|- apidocs
 |- client
    |- lib (client support libs)
 |- server
    |- webapp
       |- falcon.war
-|- logs (application log files & temp data files)
-   |- falcon.pid
-   
+|- hadooplibs
+|- README
+|- NOTICE.txt
+|- LICENSE.txt
+|- DISCLAIMER.txt
+|- CHANGES.txt
 </verbatim>
 
 *Distributed Mode*
@@ -62,20 +67,40 @@ mvn clean assembly:assembly -DskipTests -DskipCheck=true -P distributed -Dhadoop
 
 </verbatim>
 
-This generates 3 tars - {project dir}/target/falcon-${project.version}-prism.tar.gz, {project dir}/target/falcon-${project.version}-server.tar.gz and {project dir}/target/falcon-${project.version}-client.tar.gz
+Tar can be found in {project dir}/target/falcon-distributed-${project.version}-server.tar.gz
+
+Tar is structured as follows
 
-Package structure of prism and server tars is same as that of the embedded package with one difference that prism package contains prism war instead of falcon war. Client package is structured as follows 
- 
 <verbatim>
 
 |- bin
    |- falcon
+   |- falcon-start
+   |- falcon-stop
+   |- falcon-config.sh
+   |- service-start.sh
+   |- service-stop.sh
+   |- prism-stop
+   |- prism-start
 |- conf
+   |- startup.properties
+   |- runtime.properties
    |- client.properties
    |- log4j.xml
+   |- falcon-env.sh
+|- docs
 |- client
    |- lib (client support libs)
-   
+|- server
+   |- webapp
+      |- falcon.war
+      |- prism.war
+|- hadooplibs
+|- README
+|- NOTICE.txt
+|- LICENSE.txt
+|- DISCLAIMER.txt
+|- CHANGES.txt
 </verbatim>
 
 ---+++ Installing & running Falcon
@@ -83,7 +108,54 @@ Package structure of prism and server tars is same as that of the embedded packa
 *Installing falcon*
 <verbatim>
 tar -xzvf {falcon package}
-cd falcon-server-${project.version} or cd falcon-prism-${project.version}
+cd falcon-distributed-${project.version} or falcon-${project.version}
+</verbatim>
+
+*Configuring Falcon*
+
+By default config directory used by faclon is {package dir}/conf. To override this set environemnt variable FALCON_CONF to the path of the conf dir. 
+
+falcon-env.sh has been added to the falcon conf. This file can be used to set various enviornment variables that you need for you services. In addition you can set any other environment variables you might need. This file will be sourced by falcon scripts before any commands are exectuted. The following enviornment variables are available to set.
+
+<verbatim>
+# The java implementation to use. If JAVA_HOME is not found we expect java and jar to be in path
+#export JAVA_HOME=
+
+# any additional java opts you want to set. This will apply to both client and server operations
+#export FALCON_OPTS=
+
+# any additional java opts that you want to set for client only
+#export FALCON_CLIENT_OPTS=
+
+# java heap size we want to set for the client. Default is 1024MB
+#export FALCON_CLIENT_HEAP=
+
+# any additional opts you want to set for prisim service.
+#export FALCON_PRISM_OPTS=
+
+# java heap size we want to set for the prisim service. Default is 1024MB
+#export FALCON_PRISM_HEAP=
+
+# any additional opts you want to set for falcon service.
+#export FALCON_SERVER_OPTS=
+
+# java heap size we want to set for the falcon server. Default is 1024MB
+#export FALCON_SERVER_HEAP=
+
+# What is is considered as falcon home dir. Default is the base locaion of the installed software
+#export FALCON_HOME_DIR=
+
+# Where log files are stored. Defatult is logs directory under the base install location
+#export FALCON_LOG_DIR=
+
+# Where pid files are stored. Defatult is logs directory under the base install location
+#export FALCON_PID_DIR=
+
+# where the falcon active mq data is stored. Defatult is logs/data directory under the base install location
+#export FALCON_DATA_DIR=
+
+# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.
+#export FALCON_EXPANDED_WEBAPP_DIR=
 </verbatim>
 
 *Starting Falcon Server*
@@ -148,4 +220,4 @@ 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-4.0.0/distro/target/oozie-4.0.0-distro.tar.gz
-</verbatim>
\ No newline at end of file
+</verbatim>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
----------------------------------------------------------------------
diff --git a/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java b/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
index 2d29b5e..61fde29 100644
--- a/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
+++ b/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
@@ -127,7 +127,7 @@ public class HadoopStartupListener implements ServletContextListener {
         broker.setUseJmx(false);
         broker.setDataDirectory("target/data");
         broker.addConnector("vm://localhost");
-        broker.addConnector("tcp://localhost:61616");
+        broker.addConnector("tcp://0.0.0.0:61616");
         broker.start();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 83c4758..091db4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,11 +133,9 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/main/assemblies/prism-package.xml</descriptor>
-                                <descriptor>src/main/assemblies/server-package.xml</descriptor>
-                                <descriptor>src/main/assemblies/client-package.xml</descriptor>
+                                <descriptor>src/main/assemblies/distributed-package.xml</descriptor>
                             </descriptors>
-                            <finalName>falcon-${project.version}</finalName>
+                            <finalName>falcon-distributed-${project.version}</finalName>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -961,7 +959,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
                     <descriptors>
-                        <descriptor>src/main/assemblies/bin-package.xml</descriptor>
+                        <descriptor>src/main/assemblies/standalone-package.xml</descriptor>
                         <descriptor>src/main/assemblies/src-package.xml</descriptor>
                     </descriptors>
                     <finalName>falcon-${project.version}</finalName>
@@ -1021,6 +1019,7 @@
                         <exclude>**/maven-eclipse.xml</exclude>
                         <exclude>**/.externalToolBuilders/**</exclude>
                     </excludes>
+                    <argLine>-Dfalcon.log.dir=target/logs -Dfalcon.embeddedmq.data=target/data</argLine>
                 </configuration>
                 <executions>
                     <execution>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/prism/src/main/java/org/apache/falcon/Main.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/Main.java b/prism/src/main/java/org/apache/falcon/Main.java
index b59983f..207b57f 100644
--- a/prism/src/main/java/org/apache/falcon/Main.java
+++ b/prism/src/main/java/org/apache/falcon/Main.java
@@ -81,7 +81,7 @@ public final class Main {
             broker.setUseJmx(false);
             broker.setDataDirectory(dataDir);
             broker.addConnector("vm://localhost");
-            broker.addConnector("tcp://localhost:" + mqport);
+            broker.addConnector("tcp://0.0.0.0:" + mqport);
             broker.start();
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/bin/falcon
----------------------------------------------------------------------
diff --git a/src/bin/falcon b/src/bin/falcon
index 696f606..08478d7 100755
--- a/src/bin/falcon
+++ b/src/bin/falcon
@@ -28,27 +28,11 @@ done
 
 BASEDIR=`dirname ${PRG}`
 BASEDIR=`cd ${BASEDIR}/..;pwd`
-
-FALCONCPPATH="$FALCON_CONF:${BASEDIR}/conf:"
-for i in "${BASEDIR}/client/lib/"*.jar; do
-  FALCONCPPATH="${FALCONCPPATH}:$i"
-done
-for i in "${BASEDIR}/server/webapp/"*/WEB-INF/lib/*.jar; do
-  FALCONCPPATH="${FALCONCPPATH}:$i"
-done
-
-
-if test -z ${JAVA_HOME}
-then
-    JAVA_BIN=java
-else
-    JAVA_BIN=${JAVA_HOME}/bin/java
-fi
+. ${BASEDIR}/bin/falcon-config.sh 'client'
 
 JAVA_PROPERTIES="$FALCON_OPTS"
 while [[ ${1} =~ ^\-D ]]; do
   JAVA_PROPERTIES="${JAVA_PROPERTIES} ${1}"
   shift
 done
-${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.falcon.cli.FalconCLI "${@}"
-
+${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.falcon.cli.FalconCLI "${@}"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/bin/falcon-config.sh
----------------------------------------------------------------------
diff --git a/src/bin/falcon-config.sh b/src/bin/falcon-config.sh
new file mode 100644
index 0000000..3f4616a
--- /dev/null
+++ b/src/bin/falcon-config.sh
@@ -0,0 +1,120 @@
+#!/bin/bash
+#
+# Licensed 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. See accompanying LICENSE file.
+#
+
+# resolve links - $0 may be a softlink
+PRG="${0}"
+
+while [ -h "${PRG}" ]; do
+  ls=`ls -ld "${PRG}"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "${PRG}"`/"$link"
+  fi
+done
+
+BASEDIR=`dirname ${PRG}`
+BASEDIR=`cd ${BASEDIR}/..;pwd`
+
+if [ -z "$FALCON_CONF" ]; then
+  FALCON_CONF=${BASEDIR}/conf
+fi
+export FALCON_CONF
+
+if [ -f "${FALCON_CONF}/falcon-env.sh" ]; then
+  . "${FALCON_CONF}/falcon-env.sh"
+fi
+
+if test -z ${JAVA_HOME}
+then
+    JAVA_BIN=java
+    JAR_BIN=jar
+else
+    JAVA_BIN=${JAVA_HOME}/bin/java
+    JAR_BIN=${JAVA_HOME}/bin/jar
+fi
+export JAVA_BIN
+
+# default the heap size to 1GB
+DEFAULT_JAVA_HEAP_MAX=-Xmx1024m
+FALCON_OPTS="$DEFAULT_JAVA_HEAP_MAX $FALCON_OPTS"
+
+type="$1"
+shift
+case $type in
+  client)
+    # set the client class path
+    FALCONCPPATH="$FALCON_CONF:${BASEDIR}/client/lib/*"
+    for i in `ls ${BASEDIR}/server/webapp`; do
+      FALCONCPPATH="${FALCONCPPATH}:${i}/WEB-INF/lib/*"
+    done
+    FALCON_OPTS="$FALCON_OPTS $FALCON_CLIENT_OPTS $FALCON_CLIENT_HEAP"
+  ;;
+  server)
+    app="$1"
+    if [ 'prism' == "$app" ]; then
+      FALCON_OPTS="$FALCON_OPTS $FALCON_PRISM_OPTS $FALCON_PRISM_HEAP"
+    elif [ 'falcon' == "$app" ]; then
+      FALCON_OPTS="$FALCON_OPTS $FALCON_SERVER_OPTS $FALCON_SERVER_HEAP"
+    else
+      echo "Invalid option for app: ${app}. Valid choices are falcon and prism"
+      exit 1
+    fi
+    FALCON_EXPANDED_WEBAPP_DIR=${FALCON_EXPANDED_WEBAPP_DIR:-${BASEDIR}/server/webapp}
+    export FALCON_EXPANDED_WEBAPP_DIR
+    # set the server classpath
+    if [ ! -d ${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF ]; then
+      mkdir -p ${FALCON_EXPANDED_WEBAPP_DIR}/$app
+      cd ${FALCON_EXPANDED_WEBAPP_DIR}/$app
+      $JAR_BIN -xf ${BASEDIR}/server/webapp/$app.war
+      cd -
+    fi
+    
+    FALCONCPPATH="$FALCON_CONF:${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF/classes"
+    FALCONCPPATH="${FALCONCPPATH}:${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF/lib/*:${BASEDIR}/libext/*"
+    
+    HADOOPDIR=`which hadoop`
+    if [ "$HADOOPDIR" != "" ]; then
+      echo "Hadoop is installed, adding hadoop classpath to falcon classpath"
+      FALCONCPPATH="${FALCONCPPATH}:`hadoop classpath`"
+    elif [ "$HADOOP_HOME" != "" ]; then
+      echo "Hadoop home is set, adding ${HADOOP_HOME}/lib/* into falcon classpath"
+      FALCONCPPATH="${FALCONCPPATH}:${HADOOP_HOME}/lib/*"
+    else
+      echo "Could not find installed hadoop and HADOOP_HOME is not set."
+      echo "Using the default jars bundled in ${BASEDIR}/hadooplibs/"
+      FALCONCPPATH="${FALCONCPPATH}:${BASEDIR}/hadooplibs/*"
+    fi
+    # log and pid dirs for applications
+    FALCON_LOG_DIR="${FALCON_LOG_DIR:-$BASEDIR/logs}"
+    export FALCON_LOG_DIR
+    FALCON_PID_DIR="${FALCON_PID_DIR:-$BASEDIR/logs}"
+    # create the pid dir if its not there
+    [ -w "$FALCON_PID_DIR" ] ||  mkdir -p "$FALCON_PID_DIR"
+    export FALCON_PID_DIR
+    FALCON_PID_FILE=${FALCON_PID_DIR}/${app}.pid
+    export FALCON_PID_FILE
+    FALCON_DATA_DIR=${FALCON_DATA_DIR:-${BASEDIR}/logs/data}
+    FALCON_HOME_DIR="${FALCON_HOME_DIR:-$BASEDIR}"
+    export FALCON_HOME_DIR
+  ;;
+  *)
+    echo "Invalid option for type: $type"
+    exit 1
+  ;;
+esac
+export FALCONCPPATH
+export FALCON_OPTS

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/bin/service-start.sh
----------------------------------------------------------------------
diff --git a/src/bin/service-start.sh b/src/bin/service-start.sh
index f72e723..d4950d5 100755
--- a/src/bin/service-start.sh
+++ b/src/bin/service-start.sh
@@ -28,60 +28,22 @@ done
 
 BASEDIR=`dirname ${PRG}`
 BASEDIR=`cd ${BASEDIR}/..;pwd`
-
-
-mkdir -p ${BASEDIR}/logs
-
-if test -z ${JAVA_HOME}
-then
-    JAVA_BIN=java
-else
-    JAVA_BIN=${JAVA_HOME}/bin/java
-fi
-
-pushd ${BASEDIR} > /dev/null
-
 APP_TYPE=$1
-if [ ! -d ${BASEDIR}/server/webapp/$APP_TYPE/WEB-INF ]; then
-  mkdir -p ${BASEDIR}/server/webapp/$APP_TYPE
-  cd ${BASEDIR}/server/webapp/$APP_TYPE
-  jar -xf ../$APP_TYPE.war
-  cd -
-fi
+. ${BASEDIR}/bin/falcon-config.sh 'server' "$APP_TYPE"
 
-FALCONCPPATH="$FALCON_CONF:${BASEDIR}/conf:${BASEDIR}/server/webapp/$APP_TYPE/WEB-INF/classes:"
-for i in "${BASEDIR}/server/webapp/$APP_TYPE/WEB-INF/lib/"*.jar; do
-  FALCONCPPATH="${FALCONCPPATH}:$i"
-done
+# make sure the process is not running
+if [ -f $FALCON_PID_FILE ]; then
+  if kill -0 `cat $FALCON_PID_FILE` > /dev/null 2>&1; then
+    echo $APP_TYPE running as process `cat $FALCON_PID_FILE`.  Stop it first.
+    exit 1
+  fi
+fi
 
-for i in "${BASEDIR}/libext/"*.jar; do
-  FALCONCPPATH="${FALCONCPPATH}:$i"
-done
+mkdir -p $FALCON_LOG_DIR
 
-HADOOPDIR=`which hadoop`
-if [ "$HADOOPDIR" != "" ]; then
-  echo "Hadoop is installed, adding hadoop classpath to falcon classpath"
-  FALCONCPPATH="${FALCONCPPATH}:`hadoop classpath`"
-elif [ "$HADOOP_HOME" != "" ]; then
-  echo "Hadoop home is set, adding ${HADOOP_HOME}/lib/* into falcon classpath"
-  for i in "${HADOOP_HOME}/lib/"*.jar; do
-    FALCONCPPATH="${FALCONCPPATH}:$i"
-  done
-else
-  echo "Could not find installed hadoop and HADOOP_HOME is not set."
-  echo "Using the default jars bundled in ${BASEDIR}/hadooplibs/"
-  for i in "${BASEDIR}/hadooplibs/"*.jar; do
-    FALCONCPPATH="${FALCONCPPATH}:$i"
-  done
-fi
+pushd ${BASEDIR} > /dev/null
 
-if [ -z "$FALCON_CONF" ]; then
-  CONF_PATH=${BASEDIR}/conf
-else
-  CONF_PATH=$FALCON_CONF
-fi
- 
-JAVA_PROPERTIES="$FALCON_OPTS $FALCON_PROPERTIES -Dfalcon.embeddedmq.data=${BASEDIR}/logs/data -Dfalcon.home=${BASEDIR} -Dconfig.location=$CONF_PATH"
+JAVA_PROPERTIES="$FALCON_OPTS $FALCON_PROPERTIES -Dfalcon.log.dir=$FALCON_LOG_DIR -Dfalcon.embeddedmq.data=$FALCON_DATA_DIR -Dfalcon.home=${FALCON_HOME_DIR} -Dconfig.location=$FALCON_CONF -Dfalcon.app.type=$APP_TYPE"
 shift
 
 while [[ ${1} =~ ^\-D ]]; do
@@ -90,9 +52,8 @@ while [[ ${1} =~ ^\-D ]]; do
 done
 TIME=`date +%Y%m%d%H%M%s`
 
-
-nohup ${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.falcon.Main -app ${BASEDIR}/server/webapp/*.war $* 2> ${BASEDIR}/logs/$APP_TYPE.out.$TIME &
-echo $! > ${BASEDIR}/logs/$APP_TYPE.pid
+nohup ${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.falcon.Main -app ${BASEDIR}/server/webapp/${APP_TYPE}.war $* > "${FALCON_LOG_DIR}/$APP_TYPE.out.$TIME" 2>&1 < /dev/null &
+echo $! > $FALCON_PID_FILE
 popd > /dev/null
 
-echo "Falcon started using hadoop version: " `${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.hadoop.util.VersionInfo | head -1`
+echo "$APP_TYPE started using hadoop version: " `${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.hadoop.util.VersionInfo | head -1`

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/bin/service-stop.sh
----------------------------------------------------------------------
diff --git a/src/bin/service-stop.sh b/src/bin/service-stop.sh
index 4dc62a6..5c08c29 100755
--- a/src/bin/service-stop.sh
+++ b/src/bin/service-stop.sh
@@ -30,11 +30,12 @@ BASEDIR=`dirname ${PRG}`
 BASEDIR=`cd ${BASEDIR}/..;pwd`
 
 APP_TYPE=$1
-PID_FILE=${BASEDIR}/logs/$APP_TYPE.pid
-if [ -f $PID_FILE ]
+. ${BASEDIR}/bin/falcon-config.sh 'server' "$APP_TYPE"
+
+if [ -f $FALCON_PID_FILE ]
 then
-   kill -15 `cat $PID_FILE`
+   kill -15 `cat $FALCON_PID_FILE`
 else
-   echo "pid file $PID_FILE not present"
+   echo "pid file $FALCON_PID_FILE not present"
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/conf/falcon-env.sh
----------------------------------------------------------------------
diff --git a/src/conf/falcon-env.sh b/src/conf/falcon-env.sh
new file mode 100644
index 0000000..7d4a55e
--- /dev/null
+++ b/src/conf/falcon-env.sh
@@ -0,0 +1,55 @@
+#
+# 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.
+#
+# The java implementation to use. If JAVA_HOME is not found we expect java and jar to be in path
+#export JAVA_HOME=
+
+# any additional java opts you want to set. This will apply to both client and server operations
+#export FALCON_OPTS=
+
+# any additional java opts that you want to set for client only
+#export FALCON_CLIENT_OPTS=
+
+# java heap size we want to set for the client. Default is 1024MB
+#export FALCON_CLIENT_HEAP=
+
+# any additional opts you want to set for prisim service.
+#export FALCON_PRISM_OPTS=
+
+# java heap size we want to set for the prisim service. Default is 1024MB
+#export FALCON_PRISM_HEAP=
+
+# any additional opts you want to set for falcon service.
+#export FALCON_SERVER_OPTS=
+
+# java heap size we want to set for the falcon server. Default is 1024MB
+#export FALCON_SERVER_HEAP=
+
+# What is is considered as falcon home dir. Default is the base locaion of the installed software
+#export FALCON_HOME_DIR=
+
+# Where log files are stored. Defatult is logs directory under the base install location
+#export FALCON_LOG_DIR=
+
+# Where pid files are stored. Defatult is logs directory under the base install location
+#export FALCON_PID_DIR=
+
+# where the falcon active mq data is stored. Defatult is logs/data directory under the base install location
+#export FALCON_DATA_DIR=
+
+# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.
+#export FALCON_EXPANDED_WEBAPP_DIR=

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/conf/log4j.xml
----------------------------------------------------------------------
diff --git a/src/conf/log4j.xml b/src/conf/log4j.xml
index 53b9a96..0b28ddd 100644
--- a/src/conf/log4j.xml
+++ b/src/conf/log4j.xml
@@ -24,9 +24,8 @@
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
     <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="${user.dir}/logs/application.log"/>
+        <param name="File" value="${falcon.log.dir}/${falcon.app.type}.application.log"/>
         <param name="Append" value="true"/>
         <param name="Threshold" value="debug"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -35,7 +34,7 @@
     </appender>
 
     <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="${user.dir}/logs/audit.log"/>
+        <param name="File" value="${falcon.log.dir}/${falcon.app.type}.audit.log"/>
         <param name="Append" value="true"/>
         <param name="Threshold" value="debug"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -44,7 +43,7 @@
     </appender>
 
     <appender name="TRANSACTIONLOG" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="${user.dir}/logs/tranlog.log"/>
+        <param name="File" value="${falcon.log.dir}/${falcon.app.type}.tranlog.log"/>
         <param name="Append" value="true"/>
         <param name="Threshold" value="debug"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -53,7 +52,7 @@
     </appender>
 
     <appender name="METRIC" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="${user.dir}/logs/metric.log"/>
+        <param name="File" value="${falcon.log.dir}/${falcon.app.type}.metric.log"/>
         <param name="Append" value="true"/>
         <param name="Threshold" value="debug"/>
         <layout class="org.apache.log4j.PatternLayout">

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/conf/runtime.properties
----------------------------------------------------------------------
diff --git a/src/conf/runtime.properties b/src/conf/runtime.properties
index 2192126..677e5e3 100644
--- a/src/conf/runtime.properties
+++ b/src/conf/runtime.properties
@@ -20,7 +20,7 @@
 ####    This is used for falcon packaging only. ####
 ####################################################
 
-*.domain=prism
+*.domain=${falcon.app.type}
 
 *.log.cleanup.frequency.minutes.retention=hours(6)
 *.log.cleanup.frequency.hours.retention=minutes(1)

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/conf/startup.properties
----------------------------------------------------------------------
diff --git a/src/conf/startup.properties b/src/conf/startup.properties
index dca38b4..3d55aee 100644
--- a/src/conf/startup.properties
+++ b/src/conf/startup.properties
@@ -20,7 +20,7 @@
 ####    This is used for falcon packaging only. ####
 ####################################################
 
-*.domain=server
+*.domain=${falcon.app.type}
 
 ######### Implementation classes #########
 ## DONT MODIFY UNLESS SURE ABOUT CHANGE ##
@@ -56,7 +56,7 @@ prism.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\
 *.system.lib.location=${falcon.home}/server/webapp/falcon/WEB-INF/lib
 prism.system.lib.location=${falcon.home}/server/webapp/prism/WEB-INF/lib
 *.broker.url=tcp://localhost:61616
-*.retry.recorder.path=${falcon.home}/logs/retry
+*.retry.recorder.path=${falcon.log.dir}/retry
 
 *.falcon.cleanup.service.frequency=days(1)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/main/assemblies/bin-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/bin-package.xml b/src/main/assemblies/bin-package.xml
deleted file mode 100644
index 061ad19..0000000
--- a/src/main/assemblies/bin-package.xml
+++ /dev/null
@@ -1,106 +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.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <id>bin</id>
-    <baseDirectory>falcon-server-${project.version}</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>src/conf/</directory>
-            <outputDirectory>conf</outputDirectory>
-            <excludes>
-                <exclude>prism-client.properties</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>client/target/dependency</directory>
-            <outputDirectory>client/lib</outputDirectory>
-        </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>
-            <directoryMode>0755</directoryMode>
-            <includes>
-                <include>falcon</include>
-                <include>falcon-start</include>
-                <include>falcon-stop</include>
-                <include>service-start.sh</include>
-                <include>service-stop.sh</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>logs</directory>
-            <outputDirectory>logs</outputDirectory>
-            <directoryMode>0777</directoryMode>
-            <excludes>
-                <exclude>*</exclude>
-                <exclude>**/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>./</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>DISCLAIMER.txt</include>
-                <include>NOTICE.txt</include>
-                <include>LICENSE.txt</include>
-                <include>CHANGES.txt</include>
-                <include>README</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>hadoop-dependencies/target/dependency</directory>
-            <outputDirectory>hadooplibs</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>client/target/falcon-client-${project.version}.jar</source>
-            <outputDirectory>client/lib</outputDirectory>
-        </file>
-
-        <file>
-            <source>webapp/target/falcon-webapp-${project.version}.war</source>
-            <outputDirectory>server/webapp</outputDirectory>
-            <destName>falcon.war</destName>
-        </file>
-    </files>
-</assembly>
-    

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/main/assemblies/client-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/client-package.xml b/src/main/assemblies/client-package.xml
deleted file mode 100644
index e0c75f5..0000000
--- a/src/main/assemblies/client-package.xml
+++ /dev/null
@@ -1,73 +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.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <id>client</id>
-    <baseDirectory>falcon-client-${project.version}</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>client/target/dependency</directory>
-            <outputDirectory>client/lib</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>docs/target/site</directory>
-            <outputDirectory>docs</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>webapp/target/apidocs</directory>
-            <outputDirectory>apidocs</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>./</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>DISCLAIMER.txt</include>
-                <include>NOTICE.txt</include>
-                <include>LICENSE.txt</include>
-                <include>CHANGES.txt</include>
-                <include>README</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>client/target/falcon-client-${project.version}.jar</source>
-            <outputDirectory>client/lib</outputDirectory>
-        </file>
-
-        <file>
-            <source>src/bin/falcon</source>
-            <outputDirectory>bin</outputDirectory>
-            <fileMode>0755</fileMode>
-        </file>
-
-        <file>
-            <source>src/conf/client.properties</source>
-            <outputDirectory>conf</outputDirectory>
-        </file>
-    </files>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/main/assemblies/distributed-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/distributed-package.xml b/src/main/assemblies/distributed-package.xml
new file mode 100644
index 0000000..42704cb
--- /dev/null
+++ b/src/main/assemblies/distributed-package.xml
@@ -0,0 +1,112 @@
+<?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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <id>server</id>
+    <baseDirectory>falcon-distributed-${project.version}</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/conf/</directory>
+            <outputDirectory>conf</outputDirectory>
+            <excludes>
+                <exclude>client.properties</exclude>
+                <exclude>prism-client.properties</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>client/target/dependency</directory>
+            <outputDirectory>client/lib</outputDirectory>
+        </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>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>logs</directory>
+            <outputDirectory>logs</outputDirectory>
+            <directoryMode>0777</directoryMode>
+            <excludes>
+                <exclude>*</exclude>
+                <exclude>**/**</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>DISCLAIMER.txt</include>
+                <include>NOTICE.txt</include>
+                <include>LICENSE.txt</include>
+                <include>CHANGES.txt</include>
+                <include>README</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>hadoop-dependencies/target/dependency</directory>
+            <outputDirectory>hadooplibs</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>src/conf/prism-client.properties</source>
+            <outputDirectory>conf</outputDirectory>
+            <destName>client.properties</destName>
+        </file>
+
+        <file>
+            <source>webapp/target/falcon-webapp-${project.version}.war</source>
+            <outputDirectory>server/webapp</outputDirectory>
+            <destName>falcon.war</destName>
+        </file>
+
+        <file>
+            <source>prism/target/falcon-prism-${project.version}.war</source>
+            <outputDirectory>server/webapp</outputDirectory>
+            <destName>prism.war</destName>
+        </file>
+
+        <file>
+            <source>client/target/falcon-client-${project.version}.jar</source>
+            <outputDirectory>client/lib</outputDirectory>
+        </file>
+    </files>
+</assembly>
+    

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/main/assemblies/prism-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/prism-package.xml b/src/main/assemblies/prism-package.xml
deleted file mode 100644
index 434d8bb..0000000
--- a/src/main/assemblies/prism-package.xml
+++ /dev/null
@@ -1,102 +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.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <id>prism</id>
-    <baseDirectory>falcon-prism-${project.version}</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>src/conf/</directory>
-            <outputDirectory>conf</outputDirectory>
-            <excludes>
-                <exclude>client.properties</exclude>
-                <exclude>prism-client.properties</exclude>
-            </excludes>
-        </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>
-            <directoryMode>0755</directoryMode>
-            <includes>
-                <include>falcon</include>
-                <include>prism-start</include>
-                <include>prism-stop</include>
-                <include>service-start.sh</include>
-                <include>service-stop.sh</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>logs</directory>
-            <outputDirectory>logs</outputDirectory>
-            <directoryMode>0777</directoryMode>
-            <excludes>
-                <exclude>*</exclude>
-                <exclude>**/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>./</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>DISCLAIMER.txt</include>
-                <include>NOTICE.txt</include>
-                <include>LICENSE.txt</include>
-                <include>CHANGES.txt</include>
-                <include>README</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>hadoop-dependencies/target/dependency</directory>
-            <outputDirectory>hadooplibs</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>src/conf/prism-client.properties</source>
-            <outputDirectory>conf</outputDirectory>
-            <destName>client.properties</destName>
-        </file>
-        
-        <file>
-            <source>prism/target/falcon-prism-${project.version}.war</source>
-            <outputDirectory>server/webapp</outputDirectory>
-            <destName>prism.war</destName>
-        </file>
-    </files>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/main/assemblies/server-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/server-package.xml b/src/main/assemblies/server-package.xml
deleted file mode 100644
index c92ad17..0000000
--- a/src/main/assemblies/server-package.xml
+++ /dev/null
@@ -1,96 +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.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <id>server</id>
-    <baseDirectory>falcon-server-${project.version}</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>src/conf/</directory>
-            <outputDirectory>conf</outputDirectory>
-            <excludes>
-                <exclude>prism-client.properties</exclude>
-            </excludes>
-        </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>
-            <directoryMode>0755</directoryMode>
-            <includes>
-                <include>falcon</include>
-                <include>falcon-start</include>
-                <include>falcon-stop</include>
-                <include>service-start.sh</include>
-                <include>service-stop.sh</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>logs</directory>
-            <outputDirectory>logs</outputDirectory>
-            <directoryMode>0777</directoryMode>
-            <excludes>
-                <exclude>*</exclude>
-                <exclude>**/**</exclude>
-            </excludes>
-        </fileSet>
-
-        <fileSet>
-            <directory>./</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>DISCLAIMER.txt</include>
-                <include>NOTICE.txt</include>
-                <include>LICENSE.txt</include>
-                <include>CHANGES.txt</include>
-                <include>README</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>hadoop-dependencies/target/dependency</directory>
-            <outputDirectory>hadooplibs</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>webapp/target/falcon-webapp-${project.version}.war</source>
-            <outputDirectory>server/webapp</outputDirectory>
-            <destName>falcon.war</destName>
-        </file>
-    </files>
-</assembly>
-    

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fc858f5f/src/main/assemblies/standalone-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/standalone-package.xml b/src/main/assemblies/standalone-package.xml
new file mode 100644
index 0000000..1f307e9
--- /dev/null
+++ b/src/main/assemblies/standalone-package.xml
@@ -0,0 +1,106 @@
+<?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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <id>bin</id>
+    <baseDirectory>falcon-${project.version}</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/conf/</directory>
+            <outputDirectory>conf</outputDirectory>
+            <excludes>
+                <exclude>prism-client.properties</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>client/target/dependency</directory>
+            <outputDirectory>client/lib</outputDirectory>
+        </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>
+            <directoryMode>0755</directoryMode>
+            <includes>
+                <include>falcon</include>
+                <include>falcon-config.sh</include>
+                <include>falcon-start</include>
+                <include>falcon-stop</include>
+                <include>service-start.sh</include>
+                <include>service-stop.sh</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>logs</directory>
+            <outputDirectory>logs</outputDirectory>
+            <directoryMode>0777</directoryMode>
+            <excludes>
+                <exclude>*</exclude>
+                <exclude>**/**</exclude>
+            </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>DISCLAIMER.txt</include>
+                <include>NOTICE.txt</include>
+                <include>LICENSE.txt</include>
+                <include>CHANGES.txt</include>
+                <include>README</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>hadoop-dependencies/target/dependency</directory>
+            <outputDirectory>hadooplibs</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>client/target/falcon-client-${project.version}.jar</source>
+            <outputDirectory>client/lib</outputDirectory>
+        </file>
+
+        <file>
+            <source>webapp/target/falcon-webapp-${project.version}.war</source>
+            <outputDirectory>server/webapp</outputDirectory>
+            <destName>falcon.war</destName>
+        </file>
+    </files>
+</assembly>


Mime
View raw message