[Ils-source] r1512 - in trunk/webapp: META-INF WEB-INF/classes

[scribe at crosswire.org]

Author: scribe
Date: 2016-12-18 10:44:56 -0700 (Sun, 18 Dec 2016)
New Revision: 1512

Modified:
   trunk/webapp/META-INF/context.xml
   trunk/webapp/WEB-INF/classes/log4j.properties
Log:
reverted config files


Modified: trunk/webapp/META-INF/context.xml
===================================================================
--- trunk/webapp/META-INF/context.xml	2016-12-18 17:43:51 UTC (rev 1511)
+++ trunk/webapp/META-INF/context.xml	2016-12-18 17:44:56 UTC (rev 1512)
@@ -28,7 +28,8 @@
    
 -->
 
-  <Environment name="testSQLPath" type="java.lang.String" value="/home/trunk-devel/sites/trunk-devel/sql" description="" />
+  <Environment name="testSQLPath" type="java.lang.String" value="$WEBAPPBASE/sql" description="" />
+  <Resource    name="testSQLPath" type="java.lang.String" value="$WEBAPPBASE/sql" />
 
   <Resource
     name="storeDB"
@@ -37,9 +38,9 @@
     maxIdle="5"
     maxWait="5000"
     validationQuery="SELECT COMPANYID FROM SYSCONF"
-    username="trunkdevel"
-    password="trunkdevel"
-    url="jdbc:sqlserver://10.134.51.131:1433;"
+    username="$DBUSER"
+    password="$DBPASSWD"
+    url="jdbc:sqlserver://10.134.51.131:1433;user=$DBUSER;password=$DBPASSWD;"
     maxActive="10"/>
 
 

Modified: trunk/webapp/WEB-INF/classes/log4j.properties
===================================================================
--- trunk/webapp/WEB-INF/classes/log4j.properties	2016-12-18 17:43:51 UTC (rev 1511)
+++ trunk/webapp/WEB-INF/classes/log4j.properties	2016-12-18 17:44:56 UTC (rev 1512)
@@ -1,26 +1,26 @@
-#Last updated by admin
-#Thu Apr 07 19:58:58 GMT 2016
-log4j.appender.S.MaxFileSize=500KB
-log4j.appender.E=org.apache.log4j.RollingFileAppender
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.A=org.apache.log4j.RollingFileAppender
-log4j.appender.E.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c{1} - %m%n
-log4j.appender.E.MaxBackupIndex=5
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
-log4j.appender.E.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.MaxBackupIndex=5
-log4j.appender.A.File=/home/trunk-devel/sites/trunk-devel/webapp/log/aicc.log
-log4j.appender.E.MaxFileSize=500KB
-log4j.appender.S.MaxBackupIndex=5
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.logger.AICC=INFO, A
-log4j.appender.S.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c - %m%n
-log4j.appender.S=org.apache.log4j.RollingFileAppender
-log4j.appender.A.layout.ConversionPattern=%c - %d{dd-MMM HH\:mm} %m%n
-log4j.appender.S.File=/home/trunk-devel/sites/trunk-devel/webapp/log/system.log
-log4j.appender.A.MaxFileSize=500KB
-log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.logger.EVENTS=INFO, E
-log4j.appender.S.layout=org.apache.log4j.PatternLayout
-log4j.rootLogger=INFO, stdout, S
-log4j.appender.E.File=/home/trunk-devel/sites/trunk-devel/webapp/log/events.log
+#Last updated by admin
+#Mon Dec 13 15:19:02 GMT-07:00 2010
+log4j.appender.S.MaxFileSize=500KB
+log4j.appender.E=org.apache.log4j.RollingFileAppender
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.A=org.apache.log4j.RollingFileAppender
+log4j.appender.E.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c{1} - %m%n
+log4j.appender.E.MaxBackupIndex=5
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
+log4j.appender.E.layout=org.apache.log4j.PatternLayout
+log4j.appender.A.MaxBackupIndex=5
+log4j.appender.A.File=C\:\\ils\\trunk-devel\\webapp\\log\\aicc.log
+log4j.appender.E.MaxFileSize=500KB
+log4j.appender.S.MaxBackupIndex=5
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.logger.AICC=INFO, A
+log4j.appender.S.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c - %m%n
+log4j.appender.S=org.apache.log4j.RollingFileAppender
+log4j.appender.A.layout.ConversionPattern=%c - %d{dd-MMM HH\:mm} %m%n
+log4j.appender.S.File=C\:\\ils\\trunk-devel\\webapp\\log\\system.log
+log4j.appender.A.MaxFileSize=500KB
+log4j.appender.A.layout=org.apache.log4j.PatternLayout
+log4j.logger.EVENTS=INFO, E
+log4j.appender.S.layout=org.apache.log4j.PatternLayout
+log4j.rootLogger=DEBUG, stdout, S
+log4j.appender.E.File=C\:\\ils\\trunk-devel\\webapp\\log\\events.log