azkaban-aplcache

diff --git a/azkaban-exec-server/build.gradle b/azkaban-exec-server/build.gradle
index ef672e1..8c01c99 100644
--- a/azkaban-exec-server/build.gradle
+++ b/azkaban-exec-server/build.gradle
@@ -42,6 +42,13 @@ distributions {
                 into 'bin'
                 fileMode = 0755
             }
+            from('src/main/resources/conf') {
+                into 'conf'
+                fileMode = 0755
+            }
+            from('src/main/resources/commonprivate.properties') {
+                into 'plugins/jobtypes'
+            }
             from('../azkaban-common/src/main/bash') {
                 into 'bin'
                 fileMode = 0755

diff --git a/azkaban-exec-server/src/main/resources/commonprivate.properties b/azkaban-exec-server/src/main/resources/commonprivate.properties
new file mode 100644
index 0000000..92a4a7a
--- /dev/null
+++ b/azkaban-exec-server/src/main/resources/commonprivate.properties
@@ -0,0 +1,2 @@
+# set execute-as-user
+execute.as.user=false

diff --git a/azkaban-exec-server/src/main/resources/conf/azkaban.properties b/azkaban-exec-server/src/main/resources/conf/azkaban.properties
new file mode 100644
index 0000000..8fdbddd
--- /dev/null
+++ b/azkaban-exec-server/src/main/resources/conf/azkaban.properties
@@ -0,0 +1,52 @@
+# Azkaban Personalization Settings
+azkaban.name=Test
+azkaban.label=My Local Azkaban
+azkaban.color=#FF3601
+azkaban.default.servlet.path=/index
+web.resource.dir=web/
+default.timezone.id=America/Los_Angeles
+# Azkaban UserManager class
+user.manager.class=azkaban.user.XmlUserManager
+user.manager.xml.file=conf/azkaban-users.xml
+# Loader for projects
+executor.global.properties=conf/global.properties
+azkaban.project.dir=projects
+# Velocity dev mode
+velocity.dev.mode=false
+# Azkaban Jetty server properties.
+jetty.use.ssl=false
+jetty.maxThreads=25
+jetty.port=8081
+# Where the Azkaban web server is located
+azkaban.webserver.url=http://localhost:8081
+# mail settings
+mail.sender=
+mail.host=
+# User facing web server configurations used to construct the user facing server URLs. They are useful when there is a reverse proxy between Azkaban web servers and users.
+# enduser -> myazkabanhost:443 -> proxy -> localhost:8081
+# when this parameters set then these parameters are used to generate email links.
+# if these parameters are not set then jetty.hostname, and jetty.port(if ssl configured jetty.ssl.port) are used.
+# azkaban.webserver.external_hostname=myazkabanhost.com
+# azkaban.webserver.external_ssl_port=443
+# azkaban.webserver.external_port=8081
+job.failure.email=
+job.success.email=
+lockdown.create.projects=false
+cache.directory=cache
+# JMX stats
+jetty.connector.stats=true
+executor.connector.stats=true
+# Azkaban plugin settings
+azkaban.jobtype.plugin.dir=plugins/jobtypes
+# Azkaban mysql settings by default. Users should configure their own username and password.
+database.type=mysql
+mysql.port=3306
+mysql.host=localhost
+mysql.database=azkaban
+mysql.user=azkaban
+mysql.password=azkaban
+mysql.numconnections=100
+# Azkaban Executor settings
+executor.maxThreads=50
+executor.flow.threads=30
+

diff --git a/azkaban-exec-server/src/main/resources/conf/global.properties b/azkaban-exec-server/src/main/resources/conf/global.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/azkaban-exec-server/src/main/resources/conf/global.properties

diff --git a/azkaban-exec-server/src/main/resources/conf/log4j.properties b/azkaban-exec-server/src/main/resources/conf/log4j.properties
new file mode 100644
index 0000000..dddde85
--- /dev/null
+++ b/azkaban-exec-server/src/main/resources/conf/log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootLogger=INFO, Console
+log4j.logger.azkaban=INFO, server
+log4j.appender.server=org.apache.log4j.RollingFileAppender
+log4j.appender.server.layout=org.apache.log4j.PatternLayout
+log4j.appender.server.File=logs/azkaban-execserver.log
+log4j.appender.server.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SSS Z} %p [%c{1}] [Azkaban] %m%n
+log4j.appender.server.MaxFileSize=102400MB
+log4j.appender.server.MaxBackupIndex=2
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+log4j.appender.Console.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SSS Z} %p [%c{1}] [Azkaban] %m%n

diff --git a/azkaban-web-server/build.gradle b/azkaban-web-server/build.gradle
index 551264a..fa4d47b 100644
--- a/azkaban-web-server/build.gradle
+++ b/azkaban-web-server/build.gradle
@@ -171,6 +171,9 @@ distributions {
                 into 'bin'
                 fileMode = 0755
             }
+            from('src/main/resources/conf') {
+                into 'conf'
+            }
             from(configurations.runtime) {
                 into 'lib'
             }

diff --git a/azkaban-web-server/src/main/resources/conf/azkaban.properties b/azkaban-web-server/src/main/resources/conf/azkaban.properties
new file mode 100644
index 0000000..a386605
--- /dev/null
+++ b/azkaban-web-server/src/main/resources/conf/azkaban.properties
@@ -0,0 +1,52 @@
+# Azkaban Personalization Settings
+azkaban.name=Test
+azkaban.label=My Local Azkaban
+azkaban.color=#FF3601
+azkaban.default.servlet.path=/index
+web.resource.dir=web/
+default.timezone.id=America/Los_Angeles
+# Azkaban UserManager class
+user.manager.class=azkaban.user.XmlUserManager
+user.manager.xml.file=conf/azkaban-users.xml
+# Loader for projects
+executor.global.properties=conf/global.properties
+azkaban.project.dir=projects
+# Velocity dev mode
+velocity.dev.mode=false
+# Azkaban Jetty server properties.
+jetty.use.ssl=false
+jetty.maxThreads=25
+jetty.port=8081
+# Azkaban Executor settings
+# mail settings
+mail.sender=
+mail.host=
+# User facing web server configurations used to construct the user facing server URLs. They are useful when there is a reverse proxy between Azkaban web servers and users.
+# enduser -> myazkabanhost:443 -> proxy -> localhost:8081
+# when this parameters set then these parameters are used to generate email links.
+# if these parameters are not set then jetty.hostname, and jetty.port(if ssl configured jetty.ssl.port) are used.
+# azkaban.webserver.external_hostname=myazkabanhost.com
+# azkaban.webserver.external_ssl_port=443
+# azkaban.webserver.external_port=8081
+job.failure.email=
+job.success.email=
+lockdown.create.projects=false
+cache.directory=cache
+# JMX stats
+jetty.connector.stats=true
+executor.connector.stats=true
+# Azkaban mysql settings by default. Users should configure their own username and password.
+database.type=mysql
+mysql.port=3306
+mysql.host=localhost
+mysql.database=azkaban
+mysql.user=azkaban
+mysql.password=azkaban
+mysql.numconnections=100
+#Multiple Executor
+azkaban.use.multiple.executors=true
+azkaban.executorselector.filters=StaticRemainingFlowSize,MinimumFreeMemory,CpuStatus
+azkaban.executorselector.comparator.NumberOfAssignedFlowComparator=1
+azkaban.executorselector.comparator.Memory=1
+azkaban.executorselector.comparator.LastDispatched=1
+azkaban.executorselector.comparator.CpuUsage=1

diff --git a/azkaban-web-server/src/main/resources/conf/azkaban-users.xml b/azkaban-web-server/src/main/resources/conf/azkaban-users.xml
new file mode 100644
index 0000000..0df8fd1
--- /dev/null
+++ b/azkaban-web-server/src/main/resources/conf/azkaban-users.xml
@@ -0,0 +1,7 @@
+<azkaban-users>
+  <user groups="azkaban" password="azkaban" roles="admin" username="azkaban"/>
+  <user password="metrics" roles="metrics" username="metrics"/>
+
+  <role name="admin" permissions="ADMIN"/>
+  <role name="metrics" permissions="METRICS"/>
+</azkaban-users>

diff --git a/azkaban-web-server/src/main/resources/conf/global.properties b/azkaban-web-server/src/main/resources/conf/global.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/azkaban-web-server/src/main/resources/conf/global.properties

diff --git a/azkaban-web-server/src/main/resources/conf/log4j.properties b/azkaban-web-server/src/main/resources/conf/log4j.properties
new file mode 100644
index 0000000..63f285a
--- /dev/null
+++ b/azkaban-web-server/src/main/resources/conf/log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootLogger=INFO, Console
+log4j.logger.azkaban=INFO, server
+log4j.appender.server=org.apache.log4j.RollingFileAppender
+log4j.appender.server.layout=org.apache.log4j.PatternLayout
+log4j.appender.server.File=logs/azkaban-webserver.log
+log4j.appender.server.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SSS Z} %p [%c{1}] [Azkaban] %m%n
+log4j.appender.server.MaxFileSize=102400MB
+log4j.appender.server.MaxBackupIndex=2
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+log4j.appender.Console.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SSS Z} %p [%c{1}] [Azkaban] %m%n