asterisk-java · piotrooo · Nov 22, 2022 · Nov 24, 2022 · Nov 24, 2022 · Nov 27, 2022
diff --git a/.editorconfig b/.editorconfig
@@ -1,8 +1,12 @@
-[*.{java,html}]
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
 charset = utf-8
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
-[*.{yml, yaml}]
+[*.{yml,yaml}]
 indent_size = 2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
         run: git diff
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4.2.0
+        uses: peter-evans/create-pull-request@v4.2.2
         with:
           commit-message: Update versions to ${{ github.event.release.tag_name }}
           title: Update versions to ${{ github.event.release.tag_name }}

diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
diff --git a/LICENSE.txt → LICENSE b/LICENSE.txt → LICENSE
diff --git a/asterisk-java-all/build.gradle b/asterisk-java-all/build.gradle
@@ -0,0 +1,13 @@
+dependencies {
+    implementation project(':asterisk-java-ami')
+    implementation project(':asterisk-java-core')
+
+    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'org.slf4j:slf4j-api:2.0.4'
+    implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
+    implementation 'org.reflections:reflections:0.10.2'
+
+    testImplementation 'ch.qos.logback:logback-classic:1.3.4'
+}
+
+
diff --git a/src/integrationtest/log4j.properties → ...-all/src/integrationtest/log4j.properties b/src/integrationtest/log4j.properties → ...-all/src/integrationtest/log4j.properties
diff --git a/...g/asteriskjava/fastagi/GetDataScript.java → ...g/asteriskjava/fastagi/GetDataScript.java b/...g/asteriskjava/fastagi/GetDataScript.java → ...g/asteriskjava/fastagi/GetDataScript.java
diff --git a/.../org/asteriskjava/fastagi/HangupTest.java → .../org/asteriskjava/fastagi/HangupTest.java b/.../org/asteriskjava/fastagi/HangupTest.java → .../org/asteriskjava/fastagi/HangupTest.java
diff --git a/.../org/asteriskjava/fastagi/SpeechDemo.java → .../org/asteriskjava/fastagi/SpeechDemo.java b/.../org/asteriskjava/fastagi/SpeechDemo.java → .../org/asteriskjava/fastagi/SpeechDemo.java
diff --git a/...riskjava/live/AsteriskServerTestCase.java → ...riskjava/live/AsteriskServerTestCase.java b/...riskjava/live/AsteriskServerTestCase.java → ...riskjava/live/AsteriskServerTestCase.java
diff --git a/...est/org/asteriskjava/live/MeetMeTest.java → ...est/org/asteriskjava/live/MeetMeTest.java b/...est/org/asteriskjava/live/MeetMeTest.java → ...est/org/asteriskjava/live/MeetMeTest.java
diff --git a/...ntest/org/asteriskjava/live/MiscTest.java → ...ntest/org/asteriskjava/live/MiscTest.java b/...ntest/org/asteriskjava/live/MiscTest.java → ...ntest/org/asteriskjava/live/MiscTest.java
diff --git a/...iskjava/live/OriginateCauseAsyncTest.java → ...iskjava/live/OriginateCauseAsyncTest.java b/...iskjava/live/OriginateCauseAsyncTest.java → ...iskjava/live/OriginateCauseAsyncTest.java
diff --git a/...asteriskjava/live/OriginateCauseTest.java → ...asteriskjava/live/OriginateCauseTest.java b/...asteriskjava/live/OriginateCauseTest.java → ...asteriskjava/live/OriginateCauseTest.java
diff --git a/.../org/asteriskjava/live/OriginateTest.java → .../org/asteriskjava/live/OriginateTest.java b/.../org/asteriskjava/live/OriginateTest.java → .../org/asteriskjava/live/OriginateTest.java
diff --git a/...org/asteriskjava/live/SofthangupTest.java → ...org/asteriskjava/live/SofthangupTest.java b/...org/asteriskjava/live/SofthangupTest.java → ...org/asteriskjava/live/SofthangupTest.java
diff --git a/...kjava/live/TestDefaultAsteriskServer.java → ...kjava/live/TestDefaultAsteriskServer.java b/...kjava/live/TestDefaultAsteriskServer.java → ...kjava/live/TestDefaultAsteriskServer.java
diff --git a/...teriskjava/live/TestExtensionHistory.java → ...teriskjava/live/TestExtensionHistory.java b/...teriskjava/live/TestExtensionHistory.java → ...teriskjava/live/TestExtensionHistory.java
diff --git a/.../asteriskjava/live/TestLiveReconnect.java → .../asteriskjava/live/TestLiveReconnect.java b/.../asteriskjava/live/TestLiveReconnect.java → .../asteriskjava/live/TestLiveReconnect.java
diff --git a/...java/manager/AbstractManagerTestCase.java → ...java/manager/AbstractManagerTestCase.java b/...java/manager/AbstractManagerTestCase.java → ...java/manager/AbstractManagerTestCase.java
diff --git a/...rg/asteriskjava/manager/TestAsyncAgi.java → ...rg/asteriskjava/manager/TestAsyncAgi.java b/...rg/asteriskjava/manager/TestAsyncAgi.java → ...rg/asteriskjava/manager/TestAsyncAgi.java
diff --git a/...currentUseOfDefaultManagerConnection.java → ...currentUseOfDefaultManagerConnection.java b/...currentUseOfDefaultManagerConnection.java → ...currentUseOfDefaultManagerConnection.java
diff --git a/...manager/TestDefaultManagerConnection.java → ...manager/TestDefaultManagerConnection.java b/...manager/TestDefaultManagerConnection.java → ...manager/TestDefaultManagerConnection.java
diff --git a/...manager/TestVoicemailUsersListAction.java → ...manager/TestVoicemailUsersListAction.java b/...manager/TestVoicemailUsersListAction.java → ...manager/TestVoicemailUsersListAction.java
diff --git a/...st/org/asteriskjava/manager/TestVoid.java → ...st/org/asteriskjava/manager/TestVoid.java b/...st/org/asteriskjava/manager/TestVoid.java → ...st/org/asteriskjava/manager/TestVoid.java
diff --git a/src/main/java/META-INF/MANIFEST.MF → ...va-all/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF → ...va-all/src/main/java/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Class-Path: 
-
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/...ava/org/asteriskjava/AsteriskVersion.java → ...ava/org/asteriskjava/AsteriskVersion.java b/...ava/org/asteriskjava/AsteriskVersion.java → ...ava/org/asteriskjava/AsteriskVersion.java
@@ -26,10 +26,11 @@
  * @version $Id$
  * @since 0.2
  */
-public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializable
-{
-	private static final String VERSION_PATTERN_18 = "^\\s*Asterisk (GIT-)?18[-. ].*";
-	private static final String VERSION_PATTERN_17 = "^\\s*Asterisk (GIT-)?17[-. ].*";
+public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializable {
+    private static final String VERSION_PATTERN_20 = "^\\s*Asterisk (GIT-)?20[-. ].*";
+    private static final String VERSION_PATTERN_19 = "^\\s*Asterisk (GIT-)?19[-. ].*";
+    private static final String VERSION_PATTERN_18 = "^\\s*Asterisk (GIT-)?18[-. ].*";
+    private static final String VERSION_PATTERN_17 = "^\\s*Asterisk (GIT-)?17[-. ].*";
     private static final String VERSION_PATTERN_16 = "^\\s*Asterisk (GIT-)?16[-. ].*";
     private static final String VERSION_PATTERN_15 = "^\\s*Asterisk (GIT-)?15[-. ].*";
     private static final String VERSION_PATTERN_14 = "^\\s*Asterisk (GIT-)?14[-. ].*";
@@ -121,25 +122,40 @@ public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializabl
      *
      * @since 2.1.0
      */
-    public static final AsteriskVersion ASTERISK_16 = new AsteriskVersion(1600, "Asterisk 16", VERSION_PATTERN_16,
-		VERSION_PATTERN_CERTIFIED_16);
+    public static final AsteriskVersion ASTERISK_16 = new AsteriskVersion(1600, "Asterisk 16", VERSION_PATTERN_16, VERSION_PATTERN_CERTIFIED_16);
 
-	/**
-	 * Represents the Asterisk 17 series.
-	 *
-	 * @since 3.7.0
-	 */
-	public static final AsteriskVersion ASTERISK_17 = new AsteriskVersion(1700, "Asterisk 17", VERSION_PATTERN_17);
+    /**
+     * Represents the Asterisk 17 series.
+     *
+     * @since 3.7.0
+     */
+    public static final AsteriskVersion ASTERISK_17 = new AsteriskVersion(1700, "Asterisk 17", VERSION_PATTERN_17);
+
+    /**
+     * Represents the Asterisk 18 series.
+     *
+     * @since 3.13.0
+     */
+    public static final AsteriskVersion ASTERISK_18 = new AsteriskVersion(1800, "Asterisk 18", VERSION_PATTERN_18);
 
-	/**
-	 * Represents the Asterisk 18 series.
-	 *
-	 * @since 3.13.0
-	 */
-	public static final AsteriskVersion ASTERISK_18 = new AsteriskVersion(1800, "Asterisk 18", VERSION_PATTERN_18);
+    /**
+     * Represents the Asterisk 19 series.
+     *
+     * @since 3.36.2
+     */
+    public static final AsteriskVersion ASTERISK_19 = new AsteriskVersion(1900, "Asterisk 19", VERSION_PATTERN_19);
+
+    /**
+     * Represents the Asterisk 20 series.
+     *
+     * @since 3.36.2
+     */
+    public static final AsteriskVersion ASTERISK_20 = new AsteriskVersion(2000, "Asterisk 20", VERSION_PATTERN_20);
 
-	private static final AsteriskVersion knownVersions[] = new AsteriskVersion[]{ASTERISK_18, ASTERISK_17, ASTERISK_16, ASTERISK_15, ASTERISK_14,
-            ASTERISK_13, ASTERISK_12, ASTERISK_11, ASTERISK_10, ASTERISK_1_8, ASTERISK_1_6};
+    private static final AsteriskVersion knownVersions[] = new AsteriskVersion[]{
+        ASTERISK_20, ASTERISK_19, ASTERISK_18, ASTERISK_17, ASTERISK_16, ASTERISK_15, ASTERISK_14, ASTERISK_13,
+        ASTERISK_12, ASTERISK_11, ASTERISK_10, ASTERISK_1_8, ASTERISK_1_6
+    };
 
     // current debian stable version, as of 09/10/2018
     public static final AsteriskVersion DEFAULT_VERSION = ASTERISK_16;
@@ -149,15 +165,13 @@ public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializabl
      */
     private static final long serialVersionUID = 1L;
 
-    private AsteriskVersion(int version, String versionString, String... patterns)
-    {
+    private AsteriskVersion(int version, String versionString, String... patterns) {
         this.version = version;
         this.versionString = versionString;
 
         this.patterns = new Pattern[patterns.length];
         int i = 0;
-        for (String pattern : patterns)
-        {
+        for (String pattern : patterns) {
             this.patterns[i++] = Pattern.compile(pattern);
         }
     }
@@ -168,27 +182,22 @@ private AsteriskVersion(int version, String versionString, String... patterns)
      *
      * @param o the version to compare to
      * @return <code>true</code> if this version is equal to or higher than the
-     *         given version, <code>false</code> otherwise.
+     * given version, <code>false</code> otherwise.
      */
-    public boolean isAtLeast(AsteriskVersion o)
-    {
+    public boolean isAtLeast(AsteriskVersion o) {
         return version >= o.version;
     }
 
-    public int compareTo(AsteriskVersion o)
-    {
+    public int compareTo(AsteriskVersion o) {
         return Integer.compare(version, o.version);
     }
 
     @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
+    public boolean equals(Object o) {
+        if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass())
-        {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
 
@@ -198,14 +207,12 @@ public boolean equals(Object o)
     }
 
     @Override
-    public int hashCode()
-    {
+    public int hashCode() {
         return version;
     }
 
     @Override
-    public String toString()
-    {
+    public String toString() {
         return versionString;
     }
 
@@ -216,14 +223,10 @@ public String toString()
      * @param coreLine
      * @return the detected version, or null if unknown
      */
-    public static AsteriskVersion getDetermineVersionFromString(String coreLine)
-    {
-        for (AsteriskVersion version : knownVersions)
-        {
-            for (Pattern pattern : version.patterns)
-            {
-                if (pattern.matcher(coreLine).matches())
-                {
+    public static AsteriskVersion getDetermineVersionFromString(String coreLine) {
+        for (AsteriskVersion version : knownVersions) {
+            for (Pattern pattern : version.patterns) {
+                if (pattern.matcher(coreLine).matches()) {
                     return version;
                 }
             }

diff --git a/src/main/java/org/asteriskjava/Cli.java → ...l/src/main/java/org/asteriskjava/Cli.java b/src/main/java/org/asteriskjava/Cli.java → ...l/src/main/java/org/asteriskjava/Cli.java
@@ -1,11 +1,11 @@
 package org.asteriskjava;
 
+import org.asteriskjava.fastagi.DefaultAgiServer;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.asteriskjava.fastagi.DefaultAgiServer;
-
 /**
  * Simple command line interface for Asterisk-Java. This class is run when
  * Asterisk-Java is started with {@code java -jar asterisk-java.jar}. It is
@@ -52,7 +52,7 @@ else if ("-a".equals(arg) || "-agi".equals(arg))
                 Integer port = null;
                 try
                 {
-                    port = new Integer(args[1]);
+                    port = Integer.valueOf(args[1]);
                 }
                 catch (NumberFormatException e)
                 {

diff --git a/...ava/org/asteriskjava/config/Category.java → ...ava/org/asteriskjava/config/Category.java b/...ava/org/asteriskjava/config/Category.java → ...ava/org/asteriskjava/config/Category.java
diff --git a/.../asteriskjava/config/ConfigDirective.java → .../asteriskjava/config/ConfigDirective.java b/.../asteriskjava/config/ConfigDirective.java → .../asteriskjava/config/ConfigDirective.java
diff --git a/...rg/asteriskjava/config/ConfigElement.java → ...rg/asteriskjava/config/ConfigElement.java b/...rg/asteriskjava/config/ConfigElement.java → ...rg/asteriskjava/config/ConfigElement.java
diff --git a/...a/org/asteriskjava/config/ConfigFile.java → ...a/org/asteriskjava/config/ConfigFile.java b/...a/org/asteriskjava/config/ConfigFile.java → ...a/org/asteriskjava/config/ConfigFile.java
diff --git a/...g/asteriskjava/config/ConfigFileImpl.java → ...g/asteriskjava/config/ConfigFileImpl.java b/...g/asteriskjava/config/ConfigFileImpl.java → ...g/asteriskjava/config/ConfigFileImpl.java
diff --git a/...asteriskjava/config/ConfigFileReader.java → ...asteriskjava/config/ConfigFileReader.java b/...asteriskjava/config/ConfigFileReader.java → ...asteriskjava/config/ConfigFileReader.java
diff --git a/...riskjava/config/ConfigParseException.java → ...riskjava/config/ConfigParseException.java b/...riskjava/config/ConfigParseException.java → ...riskjava/config/ConfigParseException.java
diff --git a/...g/asteriskjava/config/ConfigVariable.java → ...g/asteriskjava/config/ConfigVariable.java b/...g/asteriskjava/config/ConfigVariable.java → ...g/asteriskjava/config/ConfigVariable.java
diff --git a/...rg/asteriskjava/config/ExecDirective.java → ...rg/asteriskjava/config/ExecDirective.java b/...rg/asteriskjava/config/ExecDirective.java → ...rg/asteriskjava/config/ExecDirective.java
diff --git a/...asteriskjava/config/IncludeDirective.java → ...asteriskjava/config/IncludeDirective.java b/...asteriskjava/config/IncludeDirective.java → ...asteriskjava/config/IncludeDirective.java
diff --git a/...g/MissingDirectiveParameterException.java → ...g/MissingDirectiveParameterException.java b/...g/MissingDirectiveParameterException.java → ...g/MissingDirectiveParameterException.java
diff --git a/...ava/config/MissingEqualSignException.java → ...ava/config/MissingEqualSignException.java b/...ava/config/MissingEqualSignException.java → ...ava/config/MissingEqualSignException.java
diff --git a/...ava/config/UnknownDirectiveException.java → ...ava/config/UnknownDirectiveException.java b/...ava/config/UnknownDirectiveException.java → ...ava/config/UnknownDirectiveException.java
diff --git a/...java/config/dialplan/ConfigExtension.java → ...java/config/dialplan/ConfigExtension.java b/...java/config/dialplan/ConfigExtension.java → ...java/config/dialplan/ConfigExtension.java
diff --git a/...skjava/config/dialplan/ConfigInclude.java → ...skjava/config/dialplan/ConfigInclude.java b/...skjava/config/dialplan/ConfigInclude.java → ...skjava/config/dialplan/ConfigInclude.java
diff --git a/...config/dialplan/ExtensionsConfigFile.java → ...config/dialplan/ExtensionsConfigFile.java b/...config/dialplan/ExtensionsConfigFile.java → ...config/dialplan/ExtensionsConfigFile.java
diff --git a/.../dialplan/ExtensionsConfigFileReader.java → .../dialplan/ExtensionsConfigFileReader.java b/.../dialplan/ExtensionsConfigFileReader.java → .../dialplan/ExtensionsConfigFileReader.java
diff --git a/...asteriskjava/config/dialplan/package.html → ...asteriskjava/config/dialplan/package.html b/...asteriskjava/config/dialplan/package.html → ...asteriskjava/config/dialplan/package.html
diff --git a/...java/org/asteriskjava/config/package.html → ...java/org/asteriskjava/config/package.html b/...java/org/asteriskjava/config/package.html → ...java/org/asteriskjava/config/package.html
diff --git a/...va/examples/activities/BlindTransfer.java → ...va/examples/activities/BlindTransfer.java b/...va/examples/activities/BlindTransfer.java → ...va/examples/activities/BlindTransfer.java
diff --git a/...steriskjava/examples/activities/Dial.java → ...steriskjava/examples/activities/Dial.java b/...steriskjava/examples/activities/Dial.java → ...steriskjava/examples/activities/Dial.java
diff --git a/.../activities/ExamplesAsteriskSettings.java → .../activities/ExamplesAsteriskSettings.java b/.../activities/ExamplesAsteriskSettings.java → .../activities/ExamplesAsteriskSettings.java
diff --git a/...steriskjava/examples/activities/Hold.java → ...steriskjava/examples/activities/Hold.java b/...steriskjava/examples/activities/Hold.java → ...steriskjava/examples/activities/Hold.java
diff --git a/...kjava/examples/fastagi/ExampleCallIn.java → ...kjava/examples/fastagi/ExampleCallIn.java b/...kjava/examples/fastagi/ExampleCallIn.java → ...kjava/examples/fastagi/ExampleCallIn.java
diff --git a/...kjava/examples/fastagi/fastagi.properties → ...kjava/examples/fastagi/fastagi.properties b/...kjava/examples/fastagi/fastagi.properties → ...kjava/examples/fastagi/fastagi.properties
diff --git a/...teriskjava/fastagi/AbstractAgiServer.java → ...teriskjava/fastagi/AbstractAgiServer.java b/...teriskjava/fastagi/AbstractAgiServer.java → ...teriskjava/fastagi/AbstractAgiServer.java
diff --git a/...java/fastagi/AbstractMappingStrategy.java → ...java/fastagi/AbstractMappingStrategy.java b/...java/fastagi/AbstractMappingStrategy.java → ...java/fastagi/AbstractMappingStrategy.java
diff --git a/.../org/asteriskjava/fastagi/AgiChannel.java → .../org/asteriskjava/fastagi/AgiChannel.java b/.../org/asteriskjava/fastagi/AgiChannel.java → .../org/asteriskjava/fastagi/AgiChannel.java
diff --git a/...teriskjava/fastagi/AgiChannelFactory.java → ...teriskjava/fastagi/AgiChannelFactory.java b/...teriskjava/fastagi/AgiChannelFactory.java → ...teriskjava/fastagi/AgiChannelFactory.java
diff --git a/...rg/asteriskjava/fastagi/AgiException.java → ...rg/asteriskjava/fastagi/AgiException.java b/...rg/asteriskjava/fastagi/AgiException.java → ...rg/asteriskjava/fastagi/AgiException.java
diff --git a/...eriskjava/fastagi/AgiHangupException.java → ...eriskjava/fastagi/AgiHangupException.java b/...eriskjava/fastagi/AgiHangupException.java → ...eriskjava/fastagi/AgiHangupException.java
diff --git a/...riskjava/fastagi/AgiNetworkException.java → ...riskjava/fastagi/AgiNetworkException.java b/...riskjava/fastagi/AgiNetworkException.java → ...riskjava/fastagi/AgiNetworkException.java
diff --git a/...g/asteriskjava/fastagi/AgiOperations.java → ...g/asteriskjava/fastagi/AgiOperations.java b/...g/asteriskjava/fastagi/AgiOperations.java → ...g/asteriskjava/fastagi/AgiOperations.java
diff --git a/...a/org/asteriskjava/fastagi/AgiReader.java → ...a/org/asteriskjava/fastagi/AgiReader.java b/...a/org/asteriskjava/fastagi/AgiReader.java → ...a/org/asteriskjava/fastagi/AgiReader.java
diff --git a/.../org/asteriskjava/fastagi/AgiRequest.java → .../org/asteriskjava/fastagi/AgiRequest.java b/.../org/asteriskjava/fastagi/AgiRequest.java → .../org/asteriskjava/fastagi/AgiRequest.java
diff --git a/...a/org/asteriskjava/fastagi/AgiScript.java → ...a/org/asteriskjava/fastagi/AgiScript.java b/...a/org/asteriskjava/fastagi/AgiScript.java → ...a/org/asteriskjava/fastagi/AgiScript.java
diff --git a/...a/org/asteriskjava/fastagi/AgiServer.java → ...a/org/asteriskjava/fastagi/AgiServer.java b/...a/org/asteriskjava/fastagi/AgiServer.java → ...a/org/asteriskjava/fastagi/AgiServer.java
diff --git a/...asteriskjava/fastagi/AgiServerThread.java → ...asteriskjava/fastagi/AgiServerThread.java b/...asteriskjava/fastagi/AgiServerThread.java → ...asteriskjava/fastagi/AgiServerThread.java
diff --git a/...eriskjava/fastagi/AgiSpeechException.java → ...eriskjava/fastagi/AgiSpeechException.java b/...eriskjava/fastagi/AgiSpeechException.java → ...eriskjava/fastagi/AgiSpeechException.java
diff --git a/...a/org/asteriskjava/fastagi/AgiWriter.java → ...a/org/asteriskjava/fastagi/AgiWriter.java b/...a/org/asteriskjava/fastagi/AgiWriter.java → ...a/org/asteriskjava/fastagi/AgiWriter.java
diff --git a/.../asteriskjava/fastagi/AsyncAgiServer.java → .../asteriskjava/fastagi/AsyncAgiServer.java b/.../asteriskjava/fastagi/AsyncAgiServer.java → .../asteriskjava/fastagi/AsyncAgiServer.java
diff --git a/...g/asteriskjava/fastagi/BaseAgiScript.java → ...g/asteriskjava/fastagi/BaseAgiScript.java b/...g/asteriskjava/fastagi/BaseAgiScript.java → ...g/asteriskjava/fastagi/BaseAgiScript.java
diff --git a/...ava/fastagi/ClassNameMappingStrategy.java → ...ava/fastagi/ClassNameMappingStrategy.java b/...ava/fastagi/ClassNameMappingStrategy.java → ...ava/fastagi/ClassNameMappingStrategy.java
diff --git a/...ava/fastagi/CompositeMappingStrategy.java → ...ava/fastagi/CompositeMappingStrategy.java b/...ava/fastagi/CompositeMappingStrategy.java → ...ava/fastagi/CompositeMappingStrategy.java
diff --git a/...steriskjava/fastagi/DefaultAgiServer.java → ...steriskjava/fastagi/DefaultAgiServer.java b/...steriskjava/fastagi/DefaultAgiServer.java → ...steriskjava/fastagi/DefaultAgiServer.java
@@ -16,12 +16,15 @@
  */
 package org.asteriskjava.fastagi;
 
+import org.asteriskjava.core.socket.SocketConnectionAdapter;
 import org.asteriskjava.fastagi.internal.AgiConnectionHandler;
 import org.asteriskjava.fastagi.internal.DefaultAgiChannelFactory;
 import org.asteriskjava.fastagi.internal.FastAgiConnectionHandler;
-import org.asteriskjava.util.*;
+import org.asteriskjava.util.Log;
+import org.asteriskjava.util.LogFactory;
+import org.asteriskjava.util.ReflectionUtil;
+import org.asteriskjava.util.ServerSocketFacade;
 import org.asteriskjava.util.internal.ServerSocketFacadeImpl;
-import org.asteriskjava.util.internal.SocketConnectionFacadeImpl;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -67,7 +70,7 @@ public class DefaultAgiServer extends AbstractAgiServer implements AgiServer {
      *
      * @see Socket#setSoTimeout(int)
      */
-    private int socketReadTimeout = SocketConnectionFacadeImpl.MAX_SOCKET_READ_TIMEOUT_MILLIS;
+    private int socketReadTimeout = 10800000;
 
     /**
      * Creates a new DefaultAgiServer.
@@ -159,7 +162,7 @@ public DefaultAgiServer(String configResourceBundleName, MappingStrategy mapping
             compositeMappingStrategy.addStrategy(new ClassNameMappingStrategy());
             if (ReflectionUtil.isClassAvailable("javax.script.ScriptEngineManager")) {
                 MappingStrategy scriptEngineMappingStrategy = (MappingStrategy) ReflectionUtil
-                        .newInstance("org.asteriskjava.fastagi.ScriptEngineMappingStrategy");
+                    .newInstance("org.asteriskjava.fastagi.ScriptEngineMappingStrategy");
                 if (scriptEngineMappingStrategy != null) {
                     compositeMappingStrategy.addStrategy(scriptEngineMappingStrategy);
                 }
@@ -301,7 +304,7 @@ public void startup() throws IOException, IllegalStateException {
         // loop will be terminated by accept() throwing an IOException when the
         // ServerSocket is closed.
         while (true) {
-            final SocketConnectionFacade socket;
+            final SocketConnectionAdapter socket;
 
             // accept connection
             try {
@@ -320,7 +323,7 @@ public void startup() throws IOException, IllegalStateException {
 
             // execute connection handler
             final AgiConnectionHandler connectionHandler = new FastAgiConnectionHandler(getMappingStrategy(), socket,
-                    this.getAgiChannelFactory());
+                this.getAgiChannelFactory());
             try {
                 execute(connectionHandler);
             } catch (RejectedExecutionException e) {

diff --git a/...astagi/InvalidCommandSyntaxException.java → ...astagi/InvalidCommandSyntaxException.java b/...astagi/InvalidCommandSyntaxException.java → ...astagi/InvalidCommandSyntaxException.java
diff --git a/...agi/InvalidOrUnknownCommandException.java → ...agi/InvalidOrUnknownCommandException.java b/...agi/InvalidOrUnknownCommandException.java → ...agi/InvalidOrUnknownCommandException.java
diff --git a/...asteriskjava/fastagi/MappingStrategy.java → ...asteriskjava/fastagi/MappingStrategy.java b/...asteriskjava/fastagi/MappingStrategy.java → ...asteriskjava/fastagi/MappingStrategy.java
diff --git a/.../asteriskjava/fastagi/NamedAgiScript.java → .../asteriskjava/fastagi/NamedAgiScript.java b/.../asteriskjava/fastagi/NamedAgiScript.java → .../asteriskjava/fastagi/NamedAgiScript.java
diff --git a/...astagi/ResourceBundleMappingStrategy.java → ...astagi/ResourceBundleMappingStrategy.java b/...astagi/ResourceBundleMappingStrategy.java → ...astagi/ResourceBundleMappingStrategy.java
diff --git a/.../fastagi/ScriptEngineMappingStrategy.java → .../fastagi/ScriptEngineMappingStrategy.java b/.../fastagi/ScriptEngineMappingStrategy.java → .../fastagi/ScriptEngineMappingStrategy.java
diff --git a/...skjava/fastagi/SimpleMappingStrategy.java → ...skjava/fastagi/SimpleMappingStrategy.java b/...skjava/fastagi/SimpleMappingStrategy.java → ...skjava/fastagi/SimpleMappingStrategy.java
diff --git a/...java/fastagi/SpeechRecognitionResult.java → ...java/fastagi/SpeechRecognitionResult.java b/...java/fastagi/SpeechRecognitionResult.java → ...java/fastagi/SpeechRecognitionResult.java
diff --git a/...skjava/fastagi/StaticMappingStrategy.java → ...skjava/fastagi/StaticMappingStrategy.java b/...skjava/fastagi/StaticMappingStrategy.java → ...skjava/fastagi/StaticMappingStrategy.java
diff --git a/...a/fastagi/command/AbstractAgiCommand.java → ...a/fastagi/command/AbstractAgiCommand.java b/...a/fastagi/command/AbstractAgiCommand.java → ...a/fastagi/command/AbstractAgiCommand.java
diff --git a/...eriskjava/fastagi/command/AgiCommand.java → ...eriskjava/fastagi/command/AgiCommand.java b/...eriskjava/fastagi/command/AgiCommand.java → ...eriskjava/fastagi/command/AgiCommand.java
diff --git a/...skjava/fastagi/command/AnswerCommand.java → ...skjava/fastagi/command/AnswerCommand.java b/...skjava/fastagi/command/AnswerCommand.java → ...skjava/fastagi/command/AnswerCommand.java
diff --git a/...fastagi/command/AsyncAgiBreakCommand.java → ...fastagi/command/AsyncAgiBreakCommand.java b/...fastagi/command/AsyncAgiBreakCommand.java → ...fastagi/command/AsyncAgiBreakCommand.java
diff --git a/...skjava/fastagi/command/BridgeCommand.java → ...skjava/fastagi/command/BridgeCommand.java b/...skjava/fastagi/command/BridgeCommand.java → ...skjava/fastagi/command/BridgeCommand.java
diff --git a/...fastagi/command/ChannelStatusCommand.java → ...fastagi/command/ChannelStatusCommand.java b/...fastagi/command/ChannelStatusCommand.java → ...fastagi/command/ChannelStatusCommand.java
diff --git a/...va/fastagi/command/ConfbridgeCommand.java → ...va/fastagi/command/ConfbridgeCommand.java b/...va/fastagi/command/ConfbridgeCommand.java → ...va/fastagi/command/ConfbridgeCommand.java
diff --git a/...agi/command/ControlStreamFileCommand.java → ...agi/command/ControlStreamFileCommand.java b/...agi/command/ControlStreamFileCommand.java → ...agi/command/ControlStreamFileCommand.java
diff --git a/...a/fastagi/command/DatabaseDelCommand.java → ...a/fastagi/command/DatabaseDelCommand.java b/...a/fastagi/command/DatabaseDelCommand.java → ...a/fastagi/command/DatabaseDelCommand.java
diff --git a/...stagi/command/DatabaseDelTreeCommand.java → ...stagi/command/DatabaseDelTreeCommand.java b/...stagi/command/DatabaseDelTreeCommand.java → ...stagi/command/DatabaseDelTreeCommand.java
diff --git a/...a/fastagi/command/DatabaseGetCommand.java → ...a/fastagi/command/DatabaseGetCommand.java b/...a/fastagi/command/DatabaseGetCommand.java → ...a/fastagi/command/DatabaseGetCommand.java
diff --git a/...a/fastagi/command/DatabasePutCommand.java → ...a/fastagi/command/DatabasePutCommand.java b/...a/fastagi/command/DatabasePutCommand.java → ...a/fastagi/command/DatabasePutCommand.java
diff --git a/...riskjava/fastagi/command/DialCommand.java → ...riskjava/fastagi/command/DialCommand.java b/...riskjava/fastagi/command/DialCommand.java → ...riskjava/fastagi/command/DialCommand.java
diff --git a/...riskjava/fastagi/command/ExecCommand.java → ...riskjava/fastagi/command/ExecCommand.java b/...riskjava/fastagi/command/ExecCommand.java → ...riskjava/fastagi/command/ExecCommand.java
diff --git a/...kjava/fastagi/command/GetDataCommand.java → ...kjava/fastagi/command/GetDataCommand.java b/...kjava/fastagi/command/GetDataCommand.java → ...kjava/fastagi/command/GetDataCommand.java
diff --git a/...stagi/command/GetFullVariableCommand.java → ...stagi/command/GetFullVariableCommand.java b/...stagi/command/GetFullVariableCommand.java → ...stagi/command/GetFullVariableCommand.java
diff --git a/...ava/fastagi/command/GetOptionCommand.java → ...ava/fastagi/command/GetOptionCommand.java b/...ava/fastagi/command/GetOptionCommand.java → ...ava/fastagi/command/GetOptionCommand.java
diff --git a/...a/fastagi/command/GetVariableCommand.java → ...a/fastagi/command/GetVariableCommand.java b/...a/fastagi/command/GetVariableCommand.java → ...a/fastagi/command/GetVariableCommand.java
diff --git a/...iskjava/fastagi/command/GosubCommand.java → ...iskjava/fastagi/command/GosubCommand.java b/...iskjava/fastagi/command/GosubCommand.java → ...iskjava/fastagi/command/GosubCommand.java
diff --git a/...skjava/fastagi/command/HangupCommand.java → ...skjava/fastagi/command/HangupCommand.java b/...skjava/fastagi/command/HangupCommand.java → ...skjava/fastagi/command/HangupCommand.java
diff --git a/...skjava/fastagi/command/MeetmeCommand.java → ...skjava/fastagi/command/MeetmeCommand.java b/...skjava/fastagi/command/MeetmeCommand.java → ...skjava/fastagi/command/MeetmeCommand.java
diff --git a/...riskjava/fastagi/command/NoopCommand.java → ...riskjava/fastagi/command/NoopCommand.java b/...riskjava/fastagi/command/NoopCommand.java → ...riskjava/fastagi/command/NoopCommand.java
diff --git a/...iskjava/fastagi/command/QueueCommand.java → ...iskjava/fastagi/command/QueueCommand.java b/...iskjava/fastagi/command/QueueCommand.java → ...iskjava/fastagi/command/QueueCommand.java
diff --git a/...a/fastagi/command/ReceiveCharCommand.java → ...a/fastagi/command/ReceiveCharCommand.java b/...a/fastagi/command/ReceiveCharCommand.java → ...a/fastagi/command/ReceiveCharCommand.java
diff --git a/...a/fastagi/command/ReceiveTextCommand.java → ...a/fastagi/command/ReceiveTextCommand.java b/...a/fastagi/command/ReceiveTextCommand.java → ...a/fastagi/command/ReceiveTextCommand.java
diff --git a/...va/fastagi/command/RecordFileCommand.java → ...va/fastagi/command/RecordFileCommand.java b/...va/fastagi/command/RecordFileCommand.java → ...va/fastagi/command/RecordFileCommand.java
diff --git a/...java/fastagi/command/SayAlphaCommand.java → ...java/fastagi/command/SayAlphaCommand.java b/...java/fastagi/command/SayAlphaCommand.java → ...java/fastagi/command/SayAlphaCommand.java
diff --git a/...a/fastagi/command/SayDateTimeCommand.java → ...a/fastagi/command/SayDateTimeCommand.java b/...a/fastagi/command/SayDateTimeCommand.java → ...a/fastagi/command/SayDateTimeCommand.java
diff --git a/...ava/fastagi/command/SayDigitsCommand.java → ...ava/fastagi/command/SayDigitsCommand.java b/...ava/fastagi/command/SayDigitsCommand.java → ...ava/fastagi/command/SayDigitsCommand.java
diff --git a/...ava/fastagi/command/SayNumberCommand.java → ...ava/fastagi/command/SayNumberCommand.java b/...ava/fastagi/command/SayNumberCommand.java → ...ava/fastagi/command/SayNumberCommand.java
diff --git a/...a/fastagi/command/SayPhoneticCommand.java → ...a/fastagi/command/SayPhoneticCommand.java b/...a/fastagi/command/SayPhoneticCommand.java → ...a/fastagi/command/SayPhoneticCommand.java
diff --git a/...kjava/fastagi/command/SayTimeCommand.java → ...kjava/fastagi/command/SayTimeCommand.java b/...kjava/fastagi/command/SayTimeCommand.java → ...kjava/fastagi/command/SayTimeCommand.java
diff --git a/...ava/fastagi/command/SendImageCommand.java → ...ava/fastagi/command/SendImageCommand.java b/...ava/fastagi/command/SendImageCommand.java → ...ava/fastagi/command/SendImageCommand.java
diff --git a/...java/fastagi/command/SendTextCommand.java → ...java/fastagi/command/SendTextCommand.java b/...java/fastagi/command/SendTextCommand.java → ...java/fastagi/command/SendTextCommand.java
diff --git a/...fastagi/command/SetAutoHangupCommand.java → ...fastagi/command/SetAutoHangupCommand.java b/...fastagi/command/SetAutoHangupCommand.java → ...fastagi/command/SetAutoHangupCommand.java
diff --git a/...a/fastagi/command/SetCallerIdCommand.java → ...a/fastagi/command/SetCallerIdCommand.java b/...a/fastagi/command/SetCallerIdCommand.java → ...a/fastagi/command/SetCallerIdCommand.java
diff --git a/...va/fastagi/command/SetContextCommand.java → ...va/fastagi/command/SetContextCommand.java b/...va/fastagi/command/SetContextCommand.java → ...va/fastagi/command/SetContextCommand.java
diff --git a/.../fastagi/command/SetExtensionCommand.java → .../fastagi/command/SetExtensionCommand.java b/.../fastagi/command/SetExtensionCommand.java → .../fastagi/command/SetExtensionCommand.java
diff --git a/...a/fastagi/command/SetMusicOffCommand.java → ...a/fastagi/command/SetMusicOffCommand.java b/...a/fastagi/command/SetMusicOffCommand.java → ...a/fastagi/command/SetMusicOffCommand.java
diff --git a/...va/fastagi/command/SetMusicOnCommand.java → ...va/fastagi/command/SetMusicOnCommand.java b/...va/fastagi/command/SetMusicOnCommand.java → ...va/fastagi/command/SetMusicOnCommand.java
diff --git a/...a/fastagi/command/SetPriorityCommand.java → ...a/fastagi/command/SetPriorityCommand.java b/...a/fastagi/command/SetPriorityCommand.java → ...a/fastagi/command/SetPriorityCommand.java
diff --git a/...a/fastagi/command/SetVariableCommand.java → ...a/fastagi/command/SetVariableCommand.java b/...a/fastagi/command/SetVariableCommand.java → ...a/fastagi/command/SetVariableCommand.java
diff --git a/...command/SpeechActivateGrammarCommand.java → ...command/SpeechActivateGrammarCommand.java b/...command/SpeechActivateGrammarCommand.java → ...command/SpeechActivateGrammarCommand.java
diff --git a/.../fastagi/command/SpeechCreateCommand.java → .../fastagi/command/SpeechCreateCommand.java b/.../fastagi/command/SpeechCreateCommand.java → .../fastagi/command/SpeechCreateCommand.java
diff --git a/...mmand/SpeechDeactivateGrammarCommand.java → ...mmand/SpeechDeactivateGrammarCommand.java b/...mmand/SpeechDeactivateGrammarCommand.java → ...mmand/SpeechDeactivateGrammarCommand.java
diff --git a/...fastagi/command/SpeechDestroyCommand.java → ...fastagi/command/SpeechDestroyCommand.java b/...fastagi/command/SpeechDestroyCommand.java → ...fastagi/command/SpeechDestroyCommand.java
diff --git a/...agi/command/SpeechLoadGrammarCommand.java → ...agi/command/SpeechLoadGrammarCommand.java b/...agi/command/SpeechLoadGrammarCommand.java → ...agi/command/SpeechLoadGrammarCommand.java
diff --git a/...stagi/command/SpeechRecognizeCommand.java → ...stagi/command/SpeechRecognizeCommand.java b/...stagi/command/SpeechRecognizeCommand.java → ...stagi/command/SpeechRecognizeCommand.java
diff --git a/...ava/fastagi/command/SpeechSetCommand.java → ...ava/fastagi/command/SpeechSetCommand.java b/...ava/fastagi/command/SpeechSetCommand.java → ...ava/fastagi/command/SpeechSetCommand.java
diff --git a/...i/command/SpeechUnloadGrammarCommand.java → ...i/command/SpeechUnloadGrammarCommand.java b/...i/command/SpeechUnloadGrammarCommand.java → ...i/command/SpeechUnloadGrammarCommand.java
diff --git a/...va/fastagi/command/StreamFileCommand.java → ...va/fastagi/command/StreamFileCommand.java b/...va/fastagi/command/StreamFileCommand.java → ...va/fastagi/command/StreamFileCommand.java
diff --git a/...kjava/fastagi/command/TddModeCommand.java → ...kjava/fastagi/command/TddModeCommand.java b/...kjava/fastagi/command/TddModeCommand.java → ...kjava/fastagi/command/TddModeCommand.java
diff --git a/...kjava/fastagi/command/VerboseCommand.java → ...kjava/fastagi/command/VerboseCommand.java b/...kjava/fastagi/command/VerboseCommand.java → ...kjava/fastagi/command/VerboseCommand.java
diff --git a/.../fastagi/command/WaitForDigitCommand.java → .../fastagi/command/WaitForDigitCommand.java b/.../fastagi/command/WaitForDigitCommand.java → .../fastagi/command/WaitForDigitCommand.java
diff --git a/...asteriskjava/fastagi/command/package.html → ...asteriskjava/fastagi/command/package.html b/...asteriskjava/fastagi/command/package.html → ...asteriskjava/fastagi/command/package.html
diff --git a/...java/fastagi/internal/AgiChannelImpl.java → ...java/fastagi/internal/AgiChannelImpl.java b/...java/fastagi/internal/AgiChannelImpl.java → ...java/fastagi/internal/AgiChannelImpl.java
diff --git a/...astagi/internal/AgiConnectionHandler.java → ...astagi/internal/AgiConnectionHandler.java b/...astagi/internal/AgiConnectionHandler.java → ...astagi/internal/AgiConnectionHandler.java
diff --git a/...skjava/fastagi/internal/AgiReplyImpl.java → ...skjava/fastagi/internal/AgiReplyImpl.java b/...skjava/fastagi/internal/AgiReplyImpl.java → ...skjava/fastagi/internal/AgiReplyImpl.java
diff --git a/...java/fastagi/internal/AgiRequestImpl.java → ...java/fastagi/internal/AgiRequestImpl.java b/...java/fastagi/internal/AgiRequestImpl.java → ...java/fastagi/internal/AgiRequestImpl.java
diff --git a/...i/internal/AsyncAgiConnectionHandler.java → ...i/internal/AsyncAgiConnectionHandler.java b/...i/internal/AsyncAgiConnectionHandler.java → ...i/internal/AsyncAgiConnectionHandler.java
diff --git a/...java/fastagi/internal/AsyncAgiReader.java → ...java/fastagi/internal/AsyncAgiReader.java b/...java/fastagi/internal/AsyncAgiReader.java → ...java/fastagi/internal/AsyncAgiReader.java
diff --git a/...java/fastagi/internal/AsyncAgiWriter.java → ...java/fastagi/internal/AsyncAgiWriter.java b/...java/fastagi/internal/AsyncAgiWriter.java → ...java/fastagi/internal/AsyncAgiWriter.java
@@ -1,13 +1,13 @@
 package org.asteriskjava.fastagi.internal;
 
+import org.asteriskjava.ami.action.response.ManagerResponse;
 import org.asteriskjava.fastagi.AgiException;
 import org.asteriskjava.fastagi.AgiWriter;
 import org.asteriskjava.fastagi.command.AgiCommand;
 import org.asteriskjava.manager.ManagerConnection;
 import org.asteriskjava.manager.TimeoutException;
 import org.asteriskjava.manager.action.AgiAction;
 import org.asteriskjava.manager.response.ManagerError;
-import org.asteriskjava.manager.response.ManagerResponse;
 
 import java.io.IOException;
 

diff --git a/...gi/internal/DefaultAgiChannelFactory.java → ...gi/internal/DefaultAgiChannelFactory.java b/...gi/internal/DefaultAgiChannelFactory.java → ...gi/internal/DefaultAgiChannelFactory.java
diff --git a/...gi/internal/FastAgiConnectionHandler.java → ...gi/internal/FastAgiConnectionHandler.java b/...gi/internal/FastAgiConnectionHandler.java → ...gi/internal/FastAgiConnectionHandler.java
@@ -16,13 +16,11 @@
  */
 package org.asteriskjava.fastagi.internal;
 
+import org.asteriskjava.core.socket.SocketConnectionAdapter;
 import org.asteriskjava.fastagi.AgiChannelFactory;
 import org.asteriskjava.fastagi.AgiReader;
 import org.asteriskjava.fastagi.AgiWriter;
 import org.asteriskjava.fastagi.MappingStrategy;
-import org.asteriskjava.util.SocketConnectionFacade;
-
-import java.io.IOException;
 
 /**
  * An AgiConnectionHandler for FastAGI.
@@ -37,7 +35,7 @@ public class FastAgiConnectionHandler extends AgiConnectionHandler {
     /**
      * The socket connection.
      */
-    private final SocketConnectionFacade socket;
+    private final SocketConnectionAdapter socket;
 
     /**
      * Creates a new FastAGIConnectionHandler to handle the given FastAGI socket connection.
@@ -46,7 +44,7 @@ public class FastAgiConnectionHandler extends AgiConnectionHandler {
      * @param socket            the socket connection to handle.
      * @param agiChannelFactory The factory to use for creating new AgiChannel instances.
      */
-    public FastAgiConnectionHandler(MappingStrategy mappingStrategy, SocketConnectionFacade socket, AgiChannelFactory agiChannelFactory) {
+    public FastAgiConnectionHandler(MappingStrategy mappingStrategy, SocketConnectionAdapter socket, AgiChannelFactory agiChannelFactory) {
         super(mappingStrategy, agiChannelFactory);
         this.socket = socket;
     }
@@ -65,7 +63,7 @@ protected AgiWriter createWriter() {
     public void release() {
         try {
             socket.close();
-        } catch (IOException e) // NOPMD
+        } catch (Exception e) // NOPMD
         {
             // swallow
         }