diff --git a/README.md b/README.md
index a22271af6f56ca5d6e68fe264d382e0f8ded5a0f..b68b05e1e59acdc28e897b45e8746bdd3ffae2f4 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,10 @@ Follow below steps to create and build the project from IDE.
f. httpcore-4.3.jar
g. httpmime-4.3.1.jar
h. slf4j-api-1.6.1.jar
- i. slf4j-log4j12-1.6.1.jar
- j. log4j-1.2.16.jar
+ i. log4j-slf4j-impl-2.17.1.jar
+ j. log4j-core-2.17.1.jar
+ k. log4j-1.2-api-2.17.1.jar
+ l. log4j-api-2.17.1.jar
Once the properties are configured, use the build option in IDE to create a JAR file. For more information refer build.xml to know/change properties about the JAR file.
2. vtigerwebapp
@@ -59,8 +61,10 @@ Follow below steps to create and build the project from IDE.
d. jetty-all-server-8.1.14.v20131031.jar
e. org.jbundle.util.osgi.wrapped.org.apache.http.client-4.1.2.jar
f. slf4j-api-1.6.1.jar
- g. log4j-1.2.16.jar
- h. slf4j-log4j12-1.6.1.jar
+ g. log4j-slf4j-impl-2.17.1.jar
+ h. log4j-core-2.17.1.jar
+ i. log4j-1.2-api-2.17.1.jar
+ j. log4j-api-2.17.1.jar
* Copy the src folder from existing source to newly created project source
Once the properties are configured, use the build option in IDE to build the WAR file.
diff --git a/package/Version.txt b/package/Version.txt
index e59eabda18d374a2d5ac8a02139aadd798ebfdf1..84d24998eef9e04dcced3be9c79066daead4b0c9 100644
--- a/package/Version.txt
+++ b/package/Version.txt
@@ -7,4 +7,4 @@
* All Rights Reserved.
************************************************************************************/
-version = 1.4
+version = 1.5.3
diff --git a/package/agi/vtigeragi.jar b/package/agi/vtigeragi.jar
index d2300508f3fb64d3722480156bd2c94cbba0ef47..65599414d8982495687fcdb1842a5dfb0582d1c7 100644
Binary files a/package/agi/vtigeragi.jar and b/package/agi/vtigeragi.jar differ
diff --git a/package/lib/log4j-1.2-api-2.17.1.jar b/package/lib/log4j-1.2-api-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..ef4f08dcb077bd13dad185a69b86463c90ba8ed2
Binary files /dev/null and b/package/lib/log4j-1.2-api-2.17.1.jar differ
diff --git a/package/lib/log4j-1.2.16.jar b/package/lib/log4j-1.2.16.jar
deleted file mode 100644
index 5429a903e117a21f19144206555f9608185e5642..0000000000000000000000000000000000000000
Binary files a/package/lib/log4j-1.2.16.jar and /dev/null differ
diff --git a/package/lib/log4j-api-2.17.1.jar b/package/lib/log4j-api-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1aae243be11c54d5d270599dd2ed027a08f3cca4
Binary files /dev/null and b/package/lib/log4j-api-2.17.1.jar differ
diff --git a/package/lib/log4j-core-2.17.1.jar b/package/lib/log4j-core-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..468252782737198c8d338410335e979bd090f9d8
Binary files /dev/null and b/package/lib/log4j-core-2.17.1.jar differ
diff --git a/package/lib/log4j-slf4j-impl-2.17.1.jar b/package/lib/log4j-slf4j-impl-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5be8e5d271d0df780929efb650ae7b985e45f27c
Binary files /dev/null and b/package/lib/log4j-slf4j-impl-2.17.1.jar differ
diff --git a/package/lib/slf4j-log4j12-1.6.1.jar b/package/lib/slf4j-log4j12-1.6.1.jar
deleted file mode 100644
index 873d11983e18b71aeafbc3d805495d6842339812..0000000000000000000000000000000000000000
Binary files a/package/lib/slf4j-log4j12-1.6.1.jar and /dev/null differ
diff --git a/package/webapps/classes/log4j2.properties b/package/webapps/classes/log4j2.properties
new file mode 100644
index 0000000000000000000000000000000000000000..5f3a5e80bf2b00e6fee8f387ac297db825c3d156
--- /dev/null
+++ b/package/webapps/classes/log4j2.properties
@@ -0,0 +1,40 @@
+rootLogger.level = INFO
+property.filename = ../logs/WebappInfo.log
+property.errorfilename = ../logs/WebappError.log
+appenders = WebappInfo, WebappError, console
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} [%t] %-5p %c %x - %m%n
+
+appender.WebappInfo.type = RollingFile
+appender.WebappInfo.name = WebappInfoAppender
+appender.WebappInfo.fileName = ${filename}
+appender.WebappInfo.filePattern = ${filename}.%d{yyyy-MM-dd}
+appender.WebappInfo.layout.type = PatternLayout
+appender.WebappInfo.layout.pattern = [%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n
+appender.WebappInfo.policies.type = Policies
+appender.WebappInfo.policies.size.type = SizeBasedTriggeringPolicy
+appender.WebappInfo.policies.size.size=10MB
+appender.WebappInfo.strategy.type = DefaultRolloverStrategy
+appender.WebappInfo.strategy.max = 7
+
+appender.WebappError.type = RollingFile
+appender.WebappError.name = WebappErrorAppender
+appender.WebappError.fileName = ${errorfilename}
+appender.WebappError.filePattern = ${errorfilename}.%d{yyyy-MM-dd}
+appender.WebappError.layout.type = PatternLayout
+appender.WebappError.layout.pattern = [%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n
+appender.WebappError.policies.type = Policies
+appender.WebappError.policies.size.type = SizeBasedTriggeringPolicy
+appender.WebappError.policies.size.size=5MB
+appender.WebappError.strategy.type = DefaultRolloverStrategy
+appender.WebappError.strategy.max = 7
+appender.WebappError.filter.threshold.type = ThresholdFilter
+appender.WebappError.filter.threshold.level = warn
+
+rootLogger.appenderRefs = WebappInfo, WebappError, console
+rootLogger.appenderRef.WebappInfo.ref = WebappInfoAppender
+rootLogger.appenderRef.WebappError.ref = WebappErrorAppender
+rootLogger.appenderRef.console.ref = STDOUT
\ No newline at end of file
diff --git a/vtigeragi/META-INF/MANIFEST.MF b/vtigeragi/META-INF/MANIFEST.MF
index 68cd7465a85145bbb65b0025d0a71fa121ba761e..ecc8e947f1ebc11321e616c530120998d42c7256 100644
--- a/vtigeragi/META-INF/MANIFEST.MF
+++ b/vtigeragi/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Created-By: 1.7.0_65-b32 (Oracle Corporation)
Class-Path: ../lib/asterisk-java-1.0.0.M3.jar ../lib/commons-codec-1.6.jar ../l
ib/commons-logging-1.1.3.jar ../lib/httpclient-4.3.1.jar ../lib/httpclient-
cache-4.3.1.jar ../lib/httpcore-4.3.jar ../lib/httpmime-4.3.1.jar ../lib/slf4j
- -api-1.6.1.jar ../lib/slf4j-log4j12-1.6.1.jar ../lib/log4j-1.2.16.jar
+ -api-1.6.1.jar ../lib/log4j-slf4j-impl-2.17.1.jar ../lib/log4j-1.2-api-2.17.1.jar ../lib/log4j-core-2.17.1.jar ../lib/log4j-api-2.17.1.jar
X-COMMENT: Main-Class will be added automatically by build
Main-Class: org.asteriskjava.Cli
diff --git a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/actions/Dialer.class b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/actions/Dialer.class
index 61f0df3fb55ecbc6d517ce3709edf63fbea2097a..6f6ad5957806bda26f5c15f49af31bb71ba74a4f 100644
Binary files a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/actions/Dialer.class and b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/actions/Dialer.class differ
diff --git a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/actions/IncomingCall.class b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/actions/IncomingCall.class
index f3f2459b0666bc66a9904135df6040c702401730..5423ad8a274ccee34116ec475e691938ce5307e9 100644
Binary files a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/actions/IncomingCall.class and b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/actions/IncomingCall.class differ
diff --git a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/connectors/AsteriskMGI.class b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/connectors/AsteriskMGI.class
index 09f15c24b71ec2dcdc6e7b94ae41c0340dc64717..1212d7af0368f28207edfc41469a51219ad3b85b 100644
Binary files a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/connectors/AsteriskMGI.class and b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/connectors/AsteriskMGI.class differ
diff --git a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/connectors/VtigerWebAppConnector.class b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/connectors/VtigerWebAppConnector.class
index f457570dcdbc9d9562353aeb671fedf9f549a17e..5ee3f52bdfa420e63e137f7d407e6feedcc78f19 100644
Binary files a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/connectors/VtigerWebAppConnector.class and b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/connectors/VtigerWebAppConnector.class differ
diff --git a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/AppProperties.class b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/AppProperties.class
index 34a5a85b29122a0e086beba804876f9ba5696544..cc06f2025c90fae70d035d28487b610fcd5213ab 100644
Binary files a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/AppProperties.class and b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/AppProperties.class differ
diff --git a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/VtigerAgiScript.class b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/VtigerAgiScript.class
index 304640dc6a3956d45a9a6f10c4a359cb6daeef46..4e8d737ace3b90ccbfcb9df864ee90c9edd6b6a6 100644
Binary files a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/VtigerAgiScript.class and b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/VtigerAgiScript.class differ
diff --git a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/XmlParser.class b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/XmlParser.class
index 52aaa3026dc458ffead33f9b3a2909d988c8794d..a7a4dd699e2b6a8a14fed46cf434e85c329ea0e9 100644
Binary files a/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/XmlParser.class and b/vtigeragi/build/classes/com/vtiger/apps/asterisk/agi/helpers/XmlParser.class differ
diff --git a/vtigeragi/build/classes/log4j2.properties b/vtigeragi/build/classes/log4j2.properties
new file mode 100644
index 0000000000000000000000000000000000000000..6358d2f26c3f8608c5a8c9d38f6ee71a2aa7aef3
--- /dev/null
+++ b/vtigeragi/build/classes/log4j2.properties
@@ -0,0 +1,40 @@
+rootLogger.level = INFO
+property.filename = ../logs/AgiInfo.log
+property.errorfilename = ../logs/AgiError.log
+appenders = AgiInfo, AgiError, console
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} [%t] %-5p %c %x - %m%n
+
+appender.AgiInfo.type = RollingFile
+appender.AgiInfo.name = AgiInfoAppender
+appender.AgiInfo.fileName = ${filename}
+appender.AgiInfo.filePattern = ${filename}.%d{yyyy-MM-dd}
+appender.AgiInfo.layout.type = PatternLayout
+appender.AgiInfo.layout.pattern = [%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n
+appender.AgiInfo.policies.type = Policies
+appender.AgiInfo.policies.size.type = SizeBasedTriggeringPolicy
+appender.AgiInfo.policies.size.size=10MB
+appender.AgiInfo.strategy.type = DefaultRolloverStrategy
+appender.AgiInfo.strategy.max = 7
+
+appender.AgiError.type = RollingFile
+appender.AgiError.name = AgiErrorAppender
+appender.AgiError.fileName = ${errorfilename}
+appender.AgiError.filePattern = ${errorfilename}.%d{yyyy-MM-dd}
+appender.AgiError.layout.type = PatternLayout
+appender.AgiError.layout.pattern = [%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n
+appender.AgiError.policies.type = Policies
+appender.AgiError.policies.size.type = SizeBasedTriggeringPolicy
+appender.AgiError.policies.size.size=5MB
+appender.AgiError.strategy.type = DefaultRolloverStrategy
+appender.AgiError.strategy.max = 7
+appender.AgiError.filter.threshold.type = ThresholdFilter
+appender.AgiError.filter.threshold.level = warn
+
+rootLogger.appenderRefs = AgiInfo, AgiError, console
+rootLogger.appenderRef.AgiInfo.ref = AgiInfoAppender
+rootLogger.appenderRef.AgiError.ref = AgiErrorAppender
+rootLogger.appenderRef.console.ref = STDOUT
\ No newline at end of file
diff --git a/vtigeragi/dist/lib/log4j-1.2-api-2.17.1.jar b/vtigeragi/dist/lib/log4j-1.2-api-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..ef4f08dcb077bd13dad185a69b86463c90ba8ed2
Binary files /dev/null and b/vtigeragi/dist/lib/log4j-1.2-api-2.17.1.jar differ
diff --git a/vtigeragi/dist/lib/log4j-1.2.16.jar b/vtigeragi/dist/lib/log4j-1.2.16.jar
deleted file mode 100644
index 5429a903e117a21f19144206555f9608185e5642..0000000000000000000000000000000000000000
Binary files a/vtigeragi/dist/lib/log4j-1.2.16.jar and /dev/null differ
diff --git a/vtigeragi/dist/lib/log4j-api-2.17.1.jar b/vtigeragi/dist/lib/log4j-api-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1aae243be11c54d5d270599dd2ed027a08f3cca4
Binary files /dev/null and b/vtigeragi/dist/lib/log4j-api-2.17.1.jar differ
diff --git a/vtigeragi/dist/lib/log4j-core-2.17.1.jar b/vtigeragi/dist/lib/log4j-core-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..468252782737198c8d338410335e979bd090f9d8
Binary files /dev/null and b/vtigeragi/dist/lib/log4j-core-2.17.1.jar differ
diff --git a/vtigeragi/dist/lib/log4j-slf4j-impl-2.17.1.jar b/vtigeragi/dist/lib/log4j-slf4j-impl-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5be8e5d271d0df780929efb650ae7b985e45f27c
Binary files /dev/null and b/vtigeragi/dist/lib/log4j-slf4j-impl-2.17.1.jar differ
diff --git a/vtigeragi/dist/lib/slf4j-log4j12-1.6.1.jar b/vtigeragi/dist/lib/slf4j-log4j12-1.6.1.jar
deleted file mode 100644
index 873d11983e18b71aeafbc3d805495d6842339812..0000000000000000000000000000000000000000
Binary files a/vtigeragi/dist/lib/slf4j-log4j12-1.6.1.jar and /dev/null differ
diff --git a/vtigeragi/dist/vtigeragi.jar b/vtigeragi/dist/vtigeragi.jar
index d2300508f3fb64d3722480156bd2c94cbba0ef47..c8de4604b051825ec4a31ee72b64b72ff9f9ec9c 100644
Binary files a/vtigeragi/dist/vtigeragi.jar and b/vtigeragi/dist/vtigeragi.jar differ
diff --git a/vtigeragi/libs/log4j-1.2-api-2.17.1.jar b/vtigeragi/libs/log4j-1.2-api-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..ef4f08dcb077bd13dad185a69b86463c90ba8ed2
Binary files /dev/null and b/vtigeragi/libs/log4j-1.2-api-2.17.1.jar differ
diff --git a/vtigeragi/libs/log4j-1.2.16.jar b/vtigeragi/libs/log4j-1.2.16.jar
deleted file mode 100644
index 5429a903e117a21f19144206555f9608185e5642..0000000000000000000000000000000000000000
Binary files a/vtigeragi/libs/log4j-1.2.16.jar and /dev/null differ
diff --git a/vtigeragi/libs/log4j-api-2.17.1.jar b/vtigeragi/libs/log4j-api-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1aae243be11c54d5d270599dd2ed027a08f3cca4
Binary files /dev/null and b/vtigeragi/libs/log4j-api-2.17.1.jar differ
diff --git a/vtigeragi/libs/log4j-core-2.17.1.jar b/vtigeragi/libs/log4j-core-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..468252782737198c8d338410335e979bd090f9d8
Binary files /dev/null and b/vtigeragi/libs/log4j-core-2.17.1.jar differ
diff --git a/vtigeragi/libs/log4j-slf4j-impl-2.17.1.jar b/vtigeragi/libs/log4j-slf4j-impl-2.17.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5be8e5d271d0df780929efb650ae7b985e45f27c
Binary files /dev/null and b/vtigeragi/libs/log4j-slf4j-impl-2.17.1.jar differ
diff --git a/vtigeragi/libs/slf4j-log4j12-1.6.1.jar b/vtigeragi/libs/slf4j-log4j12-1.6.1.jar
deleted file mode 100644
index 873d11983e18b71aeafbc3d805495d6842339812..0000000000000000000000000000000000000000
Binary files a/vtigeragi/libs/slf4j-log4j12-1.6.1.jar and /dev/null differ
diff --git a/vtigeragi/src/com/vtiger/apps/asterisk/agi/helpers/VtigerAgiScript.java b/vtigeragi/src/com/vtiger/apps/asterisk/agi/helpers/VtigerAgiScript.java
index 153e68e1c0c7364396769031bdbb77bc408d1735..ba750a568c151155844535f2fc64be42a28dd6e6 100644
--- a/vtigeragi/src/com/vtiger/apps/asterisk/agi/helpers/VtigerAgiScript.java
+++ b/vtigeragi/src/com/vtiger/apps/asterisk/agi/helpers/VtigerAgiScript.java
@@ -9,11 +9,8 @@
package com.vtiger.apps.asterisk.agi.helpers;
import java.util.Properties;
-import org.apache.log4j.Appender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.RollingFileAppender;
import org.asteriskjava.fastagi.AgiChannel;
import org.asteriskjava.fastagi.AgiException;
import org.asteriskjava.fastagi.AgiRequest;
@@ -39,55 +36,11 @@ public class VtigerAgiScript extends BaseAgiScript {
}
public void log(String className, Level level, String message) {
- this.initializeLogger();
Logger.getLogger(className).log(level, message);
}
public void log(String className, Level level, String message, Exception exception) {
- this.initializeLogger();
Logger.getLogger(className).log(level, message, exception);
}
- private void initializeLogger() {
- org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getRootLogger();
- Appender errAppender = rootLogger.getAppender("AgiErrorAppender");
- Appender allAppender = rootLogger.getAppender("AgiInfoAppender");
-
- if(errAppender == null || allAppender == null) {
- System.out.println("Creating Logger");
- rootLogger.removeAppender("AgiErrorAppender");
- rootLogger.removeAppender("AgiInfoAppender");
-
- //Default level of root logger
- rootLogger.setLevel(org.apache.log4j.Level.INFO);
-
- //Log pattern "[level] {date} class method message"
- PatternLayout layout = new PatternLayout("[%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n");
-
- //Add Error Appender to root logger
- RollingFileAppender agiErrorAppender = new RollingFileAppender();
- agiErrorAppender.setName("AgiErrorAppender");
- agiErrorAppender.setFile("../logs/AgiError.log");
- agiErrorAppender.setLayout(layout);
- agiErrorAppender.setThreshold(org.apache.log4j.Level.WARN);
- agiErrorAppender.setMaxBackupIndex(7);
- agiErrorAppender.setMaxFileSize("5MB");
- agiErrorAppender.setAppend(true);
- agiErrorAppender.activateOptions();
-
- //Add Info Logger to root logger
- RollingFileAppender agiInfoAppender = new RollingFileAppender();
- agiInfoAppender.setName("AgiInfoAppender");
- agiInfoAppender.setFile("../logs/AgiInfo.log");
- agiInfoAppender.setLayout(layout);
- agiInfoAppender.setMaxBackupIndex(7);
- agiInfoAppender.setMaxFileSize("10MB");
- agiInfoAppender.setAppend(true);
- agiInfoAppender.activateOptions();
-
- rootLogger.addAppender(agiErrorAppender);
- rootLogger.addAppender(agiInfoAppender);
- }
- }
-
}
diff --git a/vtigeragi/src/log4j2.properties b/vtigeragi/src/log4j2.properties
new file mode 100644
index 0000000000000000000000000000000000000000..6358d2f26c3f8608c5a8c9d38f6ee71a2aa7aef3
--- /dev/null
+++ b/vtigeragi/src/log4j2.properties
@@ -0,0 +1,40 @@
+rootLogger.level = INFO
+property.filename = ../logs/AgiInfo.log
+property.errorfilename = ../logs/AgiError.log
+appenders = AgiInfo, AgiError, console
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} [%t] %-5p %c %x - %m%n
+
+appender.AgiInfo.type = RollingFile
+appender.AgiInfo.name = AgiInfoAppender
+appender.AgiInfo.fileName = ${filename}
+appender.AgiInfo.filePattern = ${filename}.%d{yyyy-MM-dd}
+appender.AgiInfo.layout.type = PatternLayout
+appender.AgiInfo.layout.pattern = [%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n
+appender.AgiInfo.policies.type = Policies
+appender.AgiInfo.policies.size.type = SizeBasedTriggeringPolicy
+appender.AgiInfo.policies.size.size=10MB
+appender.AgiInfo.strategy.type = DefaultRolloverStrategy
+appender.AgiInfo.strategy.max = 7
+
+appender.AgiError.type = RollingFile
+appender.AgiError.name = AgiErrorAppender
+appender.AgiError.fileName = ${errorfilename}
+appender.AgiError.filePattern = ${errorfilename}.%d{yyyy-MM-dd}
+appender.AgiError.layout.type = PatternLayout
+appender.AgiError.layout.pattern = [%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n
+appender.AgiError.policies.type = Policies
+appender.AgiError.policies.size.type = SizeBasedTriggeringPolicy
+appender.AgiError.policies.size.size=5MB
+appender.AgiError.strategy.type = DefaultRolloverStrategy
+appender.AgiError.strategy.max = 7
+appender.AgiError.filter.threshold.type = ThresholdFilter
+appender.AgiError.filter.threshold.level = warn
+
+rootLogger.appenderRefs = AgiInfo, AgiError, console
+rootLogger.appenderRef.AgiInfo.ref = AgiInfoAppender
+rootLogger.appenderRef.AgiError.ref = AgiErrorAppender
+rootLogger.appenderRef.console.ref = STDOUT
\ No newline at end of file
diff --git a/vtigerwebapp/pom.xml b/vtigerwebapp/pom.xml
index 3c0e26675ee143457adc9a1e51fcf2ccc1642f6d..94013cec28a6ceb2056c6481ba08abbe76f5f68c 100644
--- a/vtigerwebapp/pom.xml
+++ b/vtigerwebapp/pom.xml
@@ -54,6 +54,28 @@
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>2.17.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>2.17.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.17.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.17.1</version>
+ </dependency>
</dependencies>
<build>
diff --git a/vtigerwebapp/src/main/java/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.java b/vtigerwebapp/src/main/java/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.java
index 977888ee6125f550e8b706129a24a23371c0bf07..65f1684db1231f5dd90e71b57d8bf50c29103c38 100644
--- a/vtigerwebapp/src/main/java/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.java
+++ b/vtigerwebapp/src/main/java/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.java
@@ -69,12 +69,16 @@ public class OutgoingCall extends VtigerWebappScript{
String context = request.getParameter("context");
String secret = request.getParameter("secret");
String vtigerSecretKey = this.getSecretKey();
+ String extensionProtocol = request.getParameter("extensionprotocol");
+ if(extensionProtocol == null || extensionProtocol.isEmpty()) {
+ extensionProtocol = "SIP";
+ }
if(secret.equals(vtigerSecretKey)) {
this.log(this.className, Level.INFO, "Successfully Authenticated Vtiger Secret Key");
originateAction = new OriginateAction();
- originateAction.setChannel("SIP/" + from);
+ originateAction.setChannel(extensionProtocol + "/" + from);
originateAction.setContext(context);
originateAction.setExten(from);
originateAction.setCallerId(to);
@@ -88,7 +92,7 @@ public class OutgoingCall extends VtigerWebappScript{
originateResponse = this.managerConnection.sendAction(originateAction, 30000);
this.log(this.className, Level.INFO, "Context:" + context);
- this.log(this.className, Level.INFO, "From: " + from + " -> " + "To: " + to);
+ this.log(this.className, Level.INFO, "From: " + extensionProtocol + "/" + from + " -> " + "To: " + to);
this.log(this.className, Level.INFO, "Outgoing Call Response: " + originateResponse.getResponse());
this.log(this.className, Level.INFO, "Asterisk Response: " + originateResponse.getMessage());
diff --git a/vtigerwebapp/src/main/java/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.java b/vtigerwebapp/src/main/java/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.java
index 8d28ee2c40ed2b637a29fcd6255e8248a570fc96..cb885049ca7f18546c696304791c02ea7e495a02 100644
--- a/vtigerwebapp/src/main/java/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.java
+++ b/vtigerwebapp/src/main/java/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.java
@@ -9,12 +9,8 @@
package com.vtiger.apps.asterisk.webapp.helpers;
import java.util.Properties;
-import org.apache.log4j.Appender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.RollingFileAppender;
-
/**
*
* @author vtiger
@@ -32,54 +28,11 @@ public class VtigerWebappScript {
}
public void log(String className, Level level, String message) {
- this.initializeLogger();
Logger.getLogger(className).log(level, message);
}
public void log(String className, Level level, String message, Exception exception) {
- this.initializeLogger();
Logger.getLogger(className).log(level, message, exception);
}
- private void initializeLogger() {
- org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getRootLogger();
- Appender errAppender = rootLogger.getAppender("WebappErrorAppender");
- Appender allAppender = rootLogger.getAppender("WebappInfoAppender");
-
- if(errAppender == null || allAppender == null) {
- rootLogger.removeAppender("WebappErrorAppender");
- rootLogger.removeAppender("WebappInfoAppender");
-
- //Default level of root logger
- rootLogger.setLevel(org.apache.log4j.Level.INFO);
-
- //Log pattern "[level] {date} class method message"
- PatternLayout layout = new PatternLayout("[%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n");
-
- //Add Error Appender to root logger
- RollingFileAppender webappErrorAppender = new RollingFileAppender();
- webappErrorAppender.setName("WebappErrorAppender");
- webappErrorAppender.setFile("../logs/WebappError.log");
- webappErrorAppender.setLayout(layout);
- webappErrorAppender.setThreshold(org.apache.log4j.Level.WARN);
- webappErrorAppender.setMaxBackupIndex(7);
- webappErrorAppender.setMaxFileSize("5MB");
- webappErrorAppender.setAppend(true);
- webappErrorAppender.activateOptions();
-
- //Add Info Logger to root logger
- RollingFileAppender webappInfoAppender = new RollingFileAppender();
- webappInfoAppender.setName("WebappInfoAppender");
- webappInfoAppender.setFile("../logs/WebappInfo.log");
- webappInfoAppender.setLayout(layout);
- webappInfoAppender.setMaxBackupIndex(7);
- webappInfoAppender.setMaxFileSize("10MB");
- webappInfoAppender.setAppend(true);
- webappInfoAppender.activateOptions();
-
- rootLogger.addAppender(webappErrorAppender);
- rootLogger.addAppender(webappInfoAppender);
- }
- }
-
}
diff --git a/vtigerwebapp/src/main/java/log4j2.properties b/vtigerwebapp/src/main/java/log4j2.properties
new file mode 100644
index 0000000000000000000000000000000000000000..5f3a5e80bf2b00e6fee8f387ac297db825c3d156
--- /dev/null
+++ b/vtigerwebapp/src/main/java/log4j2.properties
@@ -0,0 +1,40 @@
+rootLogger.level = INFO
+property.filename = ../logs/WebappInfo.log
+property.errorfilename = ../logs/WebappError.log
+appenders = WebappInfo, WebappError, console
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} [%t] %-5p %c %x - %m%n
+
+appender.WebappInfo.type = RollingFile
+appender.WebappInfo.name = WebappInfoAppender
+appender.WebappInfo.fileName = ${filename}
+appender.WebappInfo.filePattern = ${filename}.%d{yyyy-MM-dd}
+appender.WebappInfo.layout.type = PatternLayout
+appender.WebappInfo.layout.pattern = [%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n
+appender.WebappInfo.policies.type = Policies
+appender.WebappInfo.policies.size.type = SizeBasedTriggeringPolicy
+appender.WebappInfo.policies.size.size=10MB
+appender.WebappInfo.strategy.type = DefaultRolloverStrategy
+appender.WebappInfo.strategy.max = 7
+
+appender.WebappError.type = RollingFile
+appender.WebappError.name = WebappErrorAppender
+appender.WebappError.fileName = ${errorfilename}
+appender.WebappError.filePattern = ${errorfilename}.%d{yyyy-MM-dd}
+appender.WebappError.layout.type = PatternLayout
+appender.WebappError.layout.pattern = [%p] %d{yyyy-MM-dd HH:mm:ss} %c %M %m%n
+appender.WebappError.policies.type = Policies
+appender.WebappError.policies.size.type = SizeBasedTriggeringPolicy
+appender.WebappError.policies.size.size=5MB
+appender.WebappError.strategy.type = DefaultRolloverStrategy
+appender.WebappError.strategy.max = 7
+appender.WebappError.filter.threshold.type = ThresholdFilter
+appender.WebappError.filter.threshold.level = warn
+
+rootLogger.appenderRefs = WebappInfo, WebappError, console
+rootLogger.appenderRef.WebappInfo.ref = WebappInfoAppender
+rootLogger.appenderRef.WebappError.ref = WebappErrorAppender
+rootLogger.appenderRef.console.ref = STDOUT
\ No newline at end of file
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.class
index 5996582b79ed46ce4ef00bee03f92375e6d14009..8b1f9f9865f1f178748d37f962ba2e68ac531b48 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.class differ
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/connectors/DBConnector.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/connectors/DBConnector.class
index ae946a2778110c4e884093b0bf1115c403c7db27..47e25851626b427949998f9369a13d9de782fbce 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/connectors/DBConnector.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/connectors/DBConnector.class differ
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/connectors/VtigerConnector.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/connectors/VtigerConnector.class
index d6a9c1c74e6373ce7dc639f64710e3966f289d17..3b33188fbb1497fa4944f7c75b8b069088522683 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/connectors/VtigerConnector.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/connectors/VtigerConnector.class differ
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/AppProperties.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/AppProperties.class
index 0899f30ab823eabad7a066bf7567fb0a14e545f5..ad3a8ed11793b8ffa606a3ecc0ef6ac2ab7367b3 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/AppProperties.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/AppProperties.class differ
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/ServerRunner.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/ServerRunner.class
index ec9e20467836893d2c2e8bef07541ad734b5c239..0183144d94e2f2182229389efcd81c1c2f9d226c 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/ServerRunner.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/ServerRunner.class differ
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.class
index 584ad5f7ca7a1f84efdeb4be29b7a5626fdfe702..add252dc0cacea4e14ba436e66549af672636749 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.class differ
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/AGICallback.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/AGICallback.class
index d3a8ab445bc6e3a0b646d11699aee9077cd51c3f..74678b8337780a54c65d4eb0c96938ae3208e2b4 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/AGICallback.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/AGICallback.class differ
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/MakeCall.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/MakeCall.class
index b0260128ba606c7833d1ed7dbbcd2e6cb9baacb2..24a22d9f5b2e7be3406b3eb712ba86dc2b702887 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/MakeCall.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/MakeCall.class differ
diff --git a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/Recording.class b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/Recording.class
index ad82560e4b4c6bb5637b5776819ba1e2e0c837f1..cd3d55dc05fa6cd11e75fb6541adb293c48fecfe 100644
Binary files a/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/Recording.class and b/vtigerwebapp/target/classes/com/vtiger/apps/asterisk/webapp/servlets/Recording.class differ
diff --git a/vtigerwebapp/target/maven-archiver/pom.properties b/vtigerwebapp/target/maven-archiver/pom.properties
index 18b016b11a84c6bb9d3311a6bec76aa86c2dae37..cef1f6a564f6031186a681151aa9364bc84e3ca4 100644
--- a/vtigerwebapp/target/maven-archiver/pom.properties
+++ b/vtigerwebapp/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Mon Feb 09 20:41:45 IST 2015
+#Fri Dec 31 00:34:31 IST 2021
version=1.0-SNAPSHOT
groupId=com.vtiger.apps
artifactId=vtigerwebapp
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT.war b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT.war
index 346c2a896cc3a056132d7bb2f4fd39a305a464b3..c5196b32c68c2912af1ac92f3c4dec465ac9a92e 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT.war and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT.war differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.class
index 9794c61d1c4820763ffc55f60deae9a3b825de0c..8b1f9f9865f1f178748d37f962ba2e68ac531b48 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/actions/OutgoingCall.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/connectors/DBConnector.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/connectors/DBConnector.class
index ae946a2778110c4e884093b0bf1115c403c7db27..47e25851626b427949998f9369a13d9de782fbce 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/connectors/DBConnector.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/connectors/DBConnector.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/connectors/VtigerConnector.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/connectors/VtigerConnector.class
index d6a9c1c74e6373ce7dc639f64710e3966f289d17..3b33188fbb1497fa4944f7c75b8b069088522683 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/connectors/VtigerConnector.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/connectors/VtigerConnector.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/AppProperties.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/AppProperties.class
index 0899f30ab823eabad7a066bf7567fb0a14e545f5..ad3a8ed11793b8ffa606a3ecc0ef6ac2ab7367b3 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/AppProperties.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/AppProperties.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/ServerRunner.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/ServerRunner.class
index ec9e20467836893d2c2e8bef07541ad734b5c239..0183144d94e2f2182229389efcd81c1c2f9d226c 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/ServerRunner.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/ServerRunner.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.class
index 584ad5f7ca7a1f84efdeb4be29b7a5626fdfe702..add252dc0cacea4e14ba436e66549af672636749 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/helpers/VtigerWebappScript.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/AGICallback.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/AGICallback.class
index d3a8ab445bc6e3a0b646d11699aee9077cd51c3f..74678b8337780a54c65d4eb0c96938ae3208e2b4 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/AGICallback.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/AGICallback.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/MakeCall.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/MakeCall.class
index b0260128ba606c7833d1ed7dbbcd2e6cb9baacb2..24a22d9f5b2e7be3406b3eb712ba86dc2b702887 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/MakeCall.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/MakeCall.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/Recording.class b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/Recording.class
index ad82560e4b4c6bb5637b5776819ba1e2e0c837f1..cd3d55dc05fa6cd11e75fb6541adb293c48fecfe 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/Recording.class and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/classes/com/vtiger/apps/asterisk/webapp/servlets/Recording.class differ
diff --git a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/lib/asterisk-java-1.0.0.M3.jar b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/lib/asterisk-java-1.0.0.M3.jar
index 1e9cf2fb3948b46df0043b5e283945d4a46eebd0..9010b30309dba6328d34a74a8706f43abee8da1f 100644
Binary files a/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/lib/asterisk-java-1.0.0.M3.jar and b/vtigerwebapp/target/vtigerwebapp-1.0-SNAPSHOT/WEB-INF/lib/asterisk-java-1.0.0.M3.jar differ