Merge branch '4.0.x' into develop

Author: mikedickey

Diff for: .gitignore

@@ -0,0 +1,31 @@
+.deps
+.libs
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+m4/
+config.log
+config.status
+configure
+libtool
+pion-platform.pc
+platform/config/
+platform/doc/html/
+platform/doc/pion-platform.tag
+platform/server/pion
+platform/tests/Pion*Tests
+platform/tests/config/*.xml
+platform/tests/config/*.bak
+platform/tests/config/*.cache
+platform/tests/config/vocabularies/*.xml
+platform/tests/config/vocabularies/*.bak
+platform/tests/logs/large.*
+platform/tests/logs/new.*
+platform/tests/logs/*.db
+platform/tests/logs/*.cache
+sqlite/piondb
+*.o
+*.lo
+*.la

Diff for: .gitmodules

@@ -0,0 +1,6 @@
+[submodule "common"]
+	path = common
+	url = git://github.com/atomiclabs/pion-common.git
+[submodule "net"]
+	path = net
+	url = git://github.com/atomiclabs/pion-net.git

Diff for: Makefile.am

@@ -4,7 +4,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I common/build -I platform/build
 
-SUBDIRS = sqlite @PION_COMMON_MAKEDIRS@ @PION_NET_MAKEDIRS@ platform
+SUBDIRS = sqlite common net platform
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pion-platform.pc
@@ -14,10 +14,10 @@ EXTRA_DIST = autogen.sh *.sln *.aip.tmpl *.xcodeproj
 include common/build/doxygen.inc
 include platform/build/platform.inc
 
-all-local: docs
+all-local:
 	@./common/build/make_config.pl platform/build/config platform/config
 
-clean-local: clean-docs
+clean-local:
 	@rm -rf platform/config/*
 
 install-data-local:

Diff for: README

@@ -1,8 +1,8 @@
-Pion Platform: a development platform for Complex Event Processing (CEP)
+Pion Core: a development platform for Complex Event Processing (CEP)
 
-Copyright (C) 2007-2010 Atomic Labs, Inc.
+Copyright (C) 2007-2012 Atomic Labs, Inc.
 
-Home page:  http://www.pion.org
+Home page:  https://github.com/atomiclabs/pion
 
 The Pion Platform is published under the GNU Affero General Public License.
 See COPYING for licensing information.  Alternative commercial licenses are
@@ -19,16 +19,11 @@ of the platforms supported by Pion within the "common/doc" subdirectory
 
 Build and installation summary:
 
-# ./autogen.sh  (only required if using subversion checkout)
-# ./configure   (run ./configure --help to see available options)
-# make all      (this will build everything except Pion's unit tests)
-# make check	(this will build and run Pion's unit tests)
-# make install	(this may require superuser/Administrator privileges)
-
-For logging, Pion may be configured to:
-
-a) use std::cout and std::cerr for logging (the default configuration)
-b) use one of the following open source libraries: log4cxx, log4cpp or
-   log4cplus (configure using one of --with-log4cxx, --with-log4cpp or
-   --with-log4cplus, respectively)
-c) disable logging entirely (configure --disable-logging)
+# git submodule init     (only if using a git clone)
+# git submodule update   (only if using a git clone)
+# ./autogen.sh           (only required if using a git clone)
+# ./configure            (run ./configure --help to see available options)
+# make all               (this will build everything except the unit tests)
+# make check	         (this will build and run the unit tests)
+# make docs              (this will build the Doxygen source documentation)
+# make install           (this may require superuser/Administrator privileges)

Diff for: autogen.sh

@@ -7,5 +7,10 @@
 AUTOHEADER=`which true`
 export AUTOHEADER
 
+# Make sure m4 directory exists
+if [ ! -d "m4" ]; then
+  mkdir m4
+fi
+
 # Generate configure script
 autoreconf -ifs

Diff for: common

@@ -38,7 +38,7 @@ CXXFLAGS="-DPION_PLATFORM"
 # Currently only the embedded common library can be used
 PION_COMMON_HOME=`pwd`/common
 PION_COMMON_LIB="$PION_COMMON_HOME/src/libpion-common.la"
-PION_COMMON_MAKEDIRS=common
+PION_COMMON_MAKEDIRS=""
 AC_SUBST(PION_COMMON_HOME)
 AC_SUBST(PION_COMMON_LIB)
 AC_SUBST(PION_COMMON_MAKEDIRS)
@@ -47,10 +47,8 @@ AC_MSG_NOTICE([Using the embedded pion-common library])
 # Currently only the embedded net library can be used
 PION_NET_HOME=`pwd`/net
 PION_NET_LIB="$PION_NET_HOME/src/libpion-net.la"
-PION_NET_MAKEDIRS=net
 AC_SUBST(PION_NET_HOME)
 AC_SUBST(PION_NET_LIB)
-AC_SUBST(PION_NET_MAKEDIRS)
 AC_MSG_NOTICE([Using the embedded pion-net library])
 
 # Include pion-config.inc
@@ -60,7 +58,7 @@ m4_include([common/build/pion-config.inc])
 m4_include([platform/build/pion-config.inc])
 
 # Output Makefiles
-AC_OUTPUT(pion-platform.pc Makefile
+AC_OUTPUT(Makefile pion-platform.pc common/pion-common.pc net/pion-net.pc
 	common/Makefile common/include/Makefile common/include/pion/Makefile
 	common/src/Makefile common/tests/Makefile common/tests/PluginsUsedByUnitTests/Makefile
 	net/Makefile net/include/Makefile net/include/pion/Makefile net/include/pion/net/Makefile