azkaban-aplcache

Deleted Azkaban config files from repo (#814) Currently,

11/15/2016 4:34:18 PM
3.9.0

Changes

azkaban-exec-server/src/main/resources/conf/azkaban.private.properties 1(+0 -1)

azkaban-exec-server/src/main/resources/conf/azkaban.properties 46(+0 -46)

azkaban-exec-server/src/main/resources/log4j.properties 15(+0 -15)

azkaban-web-server/src/main/resources/log4j.properties 23(+0 -23)

Details

diff --git a/azkaban-exec-server/build.gradle b/azkaban-exec-server/build.gradle
index 1cbbb9b..93ca4f6 100644
--- a/azkaban-exec-server/build.gradle
+++ b/azkaban-exec-server/build.gradle
@@ -15,9 +15,6 @@ distributions {
         into 'bin'
         fileMode = 0755
       }
-      from('src/main/resources/conf') {
-        into 'conf'
-      }
       from(configurations.runtime) {
         into 'lib'
       }
diff --git a/azkaban-solo-server/.gitignore b/azkaban-solo-server/.gitignore
index eb3d928..bd6af3d 100644
--- a/azkaban-solo-server/.gitignore
+++ b/azkaban-solo-server/.gitignore
@@ -1,4 +1,3 @@
-conf/
 data/
 executions/
 plugins/
diff --git a/azkaban-solo-server/build.gradle b/azkaban-solo-server/build.gradle
index 504b220..c0afcf4 100644
--- a/azkaban-solo-server/build.gradle
+++ b/azkaban-solo-server/build.gradle
@@ -4,6 +4,8 @@ dependencies {
   compile(project(':azkaban-common'))
   compile(project(':azkaban-web-server'))
   compile(project(':azkaban-exec-server'))
+
+  runtime('com.h2database:h2:1.4.193')
 }
 
 installDist.dependsOn ':azkaban-web-server:installDist'
diff --git a/azkaban-solo-server/src/main/resources/log4j.properties b/azkaban-solo-server/src/main/resources/log4j.properties
index b69d468..b67828a 100644
--- a/azkaban-solo-server/src/main/resources/log4j.properties
+++ b/azkaban-solo-server/src/main/resources/log4j.properties
@@ -1,13 +1,14 @@
 log4j.rootLogger=INFO, Console
-log4j.logger.azkaban.webapp=INFO, WebServer
-log4j.logger.azkaban.soloserver=INFO, WebServer
+log4j.logger.azkaban.webapp=INFO, server
+log4j.logger.azkaban.execapp=INFO, server
+log4j.logger.azkaban.soloserver=INFO, server
 
-log4j.appender.WebServer=org.apache.log4j.RollingFileAppender
-log4j.appender.WebServer.layout=org.apache.log4j.PatternLayout
-log4j.appender.WebServer.File=azkaban-webserver.log
-log4j.appender.WebServer.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SSS Z} %p [%c{1}] [Azkaban] %m%n
-log4j.appender.WebServer.MaxFileSize=102400MB
-log4j.appender.WebServer.MaxBackupIndex=2
+log4j.appender.server=org.apache.log4j.RollingFileAppender
+log4j.appender.server.layout=org.apache.log4j.PatternLayout
+log4j.appender.server.File=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
diff --git a/azkaban-web-server/build.gradle b/azkaban-web-server/build.gradle
index 6dbc1eb..23e59f0 100644
--- a/azkaban-web-server/build.gradle
+++ b/azkaban-web-server/build.gradle
@@ -11,7 +11,7 @@ buildscript {
   }
 }
 
-// This node plugin enables users to run any NodeJS script.  The plugin will download and 
+// This node plugin enables users to run any NodeJS script.  The plugin will download and
 // manage NodeJS distributions, use them from there.
 // ***npm install*** installs all dependencies in package.json. It will only run when changes are made to package.json
 plugins {
@@ -156,9 +156,6 @@ distributions {
         into 'bin'
         fileMode = 0755
       }
-      from ('src/main/resources/conf') {
-        into 'conf'
-      }
       from(configurations.runtime) {
         into 'lib'
       }