gec · cverges · May 31, 2012 · Jun 1, 2012 · Jun 1, 2012 · Jun 1, 2012
diff --git a/.gitignore b/.gitignore
@@ -1,51 +1,61 @@
+dnp3test
+!DNP3Test/
+
+testset
+!TestSet/
+
+*.gcda
+*.gcno
 *.iml
-opendnp3.jar
-JavaDNP3.h
-JavaDNP3.cpp
+*.la
+*.lo
+*.o
+*.user
+*~
+.*.swp
+.DS_Store
+.deps
+.dirstamp
 .idea
-/DNP3Java/target
-/DNP3Java/src
-/DNP.ncb
-/DNP.suo
+.libs
 Debug
 Release
 ipch
-*.user
-pc_cygwin
+
+/DNP3Java/.java-built
+/DNP3Java/JavaDNP3.cpp
+/DNP3Java/JavaDNP3.h
+/DNP3Java/src
+/DNP3Java/target
+opendnp3.jar
+
 /*/pc_linux_arm
-/tools/install_scripts/boost/*/temp
-/tools/boostlib
 /CSToCppXMLBinder/bin
 /CSToCppXMLBinder/obj
 /ConfigurationBuilder/*.cs
 /ConfigurationBuilder/*.xsx
-/TestSet/*.xml
-/DNP3Java/jar
+/DNP.ncb
+/DNP.suo
 /DNP3Java/JavaDNP3_wrap.*
+/DNP3Java/jar
+/DNP3Java/src
+/DNP3Java/target
+/TestSet/*.xml
+/coverage-*
+/doc
 /java
+/lcov
+/org
 /src
-*.log
+/tools/boostlib
+/tools/install_scripts/boost/*/temp
+Debug
 Linux_i686
+Release
 TestAPL/TestSingle.tiny.xml
 TestSingle.tiny.xml
-/doc
-/coverage-*
-/lcov
-/org
-*~
-*.o
-*.lo
-.deps
-.dirstamp
-.libs
-*.la
-*.so
-*.gcno
-*.gcda
-.*.swp
-*.map
-*.sdf
-*.opensdf
+ipch
+pc_cygwin
 
 demo-master-cpp
 demo-slave-cpp
@@ -55,27 +65,26 @@ __init__.pyc
 pyopendnp3.py
 pyopendnp3.pyc
 
+/autom4te.cache
+/build-aux
 /config/autotools/m4/libtool.m4
 /config/autotools/m4/ltoptions.m4
 /config/autotools/m4/ltsugar.m4
 /config/autotools/m4/ltversion.m4
 /config/autotools/m4/lt~obsolete.m4
-
-/build-aux
-
 /configure
-configure.in
-configure
-Makefile.in
 Makefile
-config.h
-stamp-h1
+Makefile.in
 aclocal.m4
-/autom4te.cache
+compile.log
+config.h
 config.h.in
+config.log
 config.status
+configure
+configure.in
 libtool
+stamp-h1
 
 *target*
 
-
diff --git a/APL/PhysicalLayerAsyncTCPClient.cpp b/APL/PhysicalLayerAsyncTCPClient.cpp
diff --git a/APL/PhysicalLayerFactory.cpp b/APL/PhysicalLayerFactory.cpp
diff --git a/APLTestTools/AsyncPhysTestObject.h b/APLTestTools/AsyncPhysTestObject.h
@@ -22,9 +22,9 @@
 #include <APLTestTools/AsyncTestObjectASIO.h>
 
 #include <APLTestTools/LogTester.h>
-#include <APL/PhysicalLayerAsyncTCPClient.h>
-#include <APL/PhysicalLayerAsyncTCPServer.h>
-#include <APL/LowerLayerToPhysAdapter.h>
+#include <opendnp3/APL/PhysicalLayerAsyncTCPv4Client.h>
+#include <opendnp3/APL/PhysicalLayerAsyncTCPv4Server.h>
+#include <opendnp3/APL/LowerLayerToPhysAdapter.h>
 #include <APLTestTools/MockUpperLayer.h>
 
 namespace apl
@@ -39,8 +39,8 @@ class AsyncPhysTestObject : public AsyncTestObjectASIO, public LogTester
 	Logger* mpLogger;
 
 public:
-	PhysicalLayerAsyncTCPClient mTCPClient;
-	PhysicalLayerAsyncTCPServer mTCPServer;
+	PhysicalLayerAsyncTCPv4Client mTCPClient;
+	PhysicalLayerAsyncTCPv4Server mTCPServer;
 
 	LowerLayerToPhysAdapter mClientAdapter;
 	LowerLayerToPhysAdapter mServerAdapter;

diff --git a/APLTestTools/AsyncTestObject.cpp b/APLTestTools/AsyncTestObject.cpp
@@ -19,7 +19,7 @@
 
 #include "AsyncTestObject.h"
 
-#include <APL/TimingTools.h>
+#include <opendnp3/APL/TimingTools.h>
 
 #include <boost/bind.hpp>
 

diff --git a/APLTestTools/AsyncTestObjectASIO.cpp b/APLTestTools/AsyncTestObjectASIO.cpp
@@ -20,9 +20,9 @@
 #include "AsyncTestObjectASIO.h"
 #include <boost/asio.hpp>
 
-#include <APL/Configure.h>
-#include <APL/Exception.h>
-#include <APL/Thread.h>
+#include <opendnp3/APL/Configure.h>
+#include <opendnp3/APL/Exception.h>
+#include <opendnp3/APL/Thread.h>
 
 namespace apl
 {

diff --git a/APLTestTools/BufferHelpers.cpp b/APLTestTools/BufferHelpers.cpp
@@ -18,8 +18,8 @@
 //
 #include "BufferHelpers.h"
 
-#include <APL/Configure.h>
-#include <APL/Exception.h>
+#include <opendnp3/APL/Configure.h>
+#include <opendnp3/APL/Exception.h>
 
 #include <memory.h>
 #include <sstream>

diff --git a/APLTestTools/BufferHelpers.h b/APLTestTools/BufferHelpers.h
@@ -19,7 +19,7 @@
 #ifndef __BUFFER_HELPERS_H_
 #define __BUFFER_HELPERS_H_
 
-#include <APL/CopyableBuffer.h>
+#include <opendnp3/APL/CopyableBuffer.h>
 #include <string>
 
 namespace apl

diff --git a/APLTestTools/BufferTestObject.cpp b/APLTestTools/BufferTestObject.cpp
@@ -24,7 +24,7 @@
 #include <boost/foreach.hpp>
 #include <iostream>
 
-#include <APL/Exception.h>
+#include <opendnp3/APL/Exception.h>
 
 namespace apl
 {

diff --git a/APLTestTools/BufferTestObject.h b/APLTestTools/BufferTestObject.h
@@ -19,7 +19,7 @@
 #ifndef __BUFFER_TEST_OBJECT_H_
 #define __BUFFER_TEST_OBJECT_H_
 
-#include <APL/Types.h>
+#include <opendnp3/APL/Types.h>
 #include <string>
 #include <vector>
 

diff --git a/APLTestTools/FanoutDataObserver.h b/APLTestTools/FanoutDataObserver.h
@@ -19,7 +19,7 @@
 #ifndef __FANOUT_DATA_OBSERVER_H_
 #define __FANOUT_DATA_OBSERVER_H_
 
-#include <APL/ChangeBuffer.h>
+#include <opendnp3/APL/ChangeBuffer.h>
 #include <boost/foreach.hpp>
 
 namespace apl

diff --git a/APLTestTools/LogTester.cpp b/APLTestTools/LogTester.cpp
@@ -18,7 +18,7 @@
 //
 #include "LogTester.h"
 
-#include <APL/LogToStdio.h>
+#include <opendnp3/APL/LogToStdio.h>
 
 namespace apl
 {

diff --git a/APLTestTools/LogTester.h b/APLTestTools/LogTester.h
@@ -19,7 +19,7 @@
 #ifndef __LOG_TESTER_H_
 #define __LOG_TESTER_H_
 
-#include <APL/Log.h>
+#include <opendnp3/APL/Log.h>
 
 namespace apl
 {

diff --git a/APLTestTools/LoopbackPhysicalLayerAsync.cpp b/APLTestTools/LoopbackPhysicalLayerAsync.cpp
@@ -21,7 +21,7 @@
 
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
-#include <APL/Logger.h>
+#include <opendnp3/APL/Logger.h>
 
 using namespace boost;
 using namespace boost::system;

diff --git a/APLTestTools/LoopbackPhysicalLayerAsync.h b/APLTestTools/LoopbackPhysicalLayerAsync.h
@@ -19,8 +19,8 @@
 #ifndef __LOOP_BACK_PHYSICAL_LAYER_ASYNC_H_
 #define __LOOP_BACK_PHYSICAL_LAYER_ASYNC_H_
 
-#include <APL/PhysicalLayerAsyncBase.h>
-#include <APL/IHandlerAsync.h>
+#include <opendnp3/APL/PhysicalLayerAsyncBase.h>
+#include <opendnp3/APL/IHandlerAsync.h>
 
 #include <queue>